/ - Diff - Application: gvSIG desktop - gvSIG

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/DummyDBFeatureStore.java
539	539	// TODO Auto-generated method stub
540	540	return null;
541	541	}
	542
	543	public String getFullName() {
	544	// TODO Auto-generated method stub
	545	return null;
	546	}
542	547	}

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/DummyFileFeatureStore.java
1224	1224	// TODO Auto-generated method stub
1225	1225	return null;
1226	1226	}
	1227
	1228	public String getFullName() {
	1229	// TODO Auto-generated method stub
	1230	return null;
	1231	}
1227	1232	}

     		return (SHPStoreParameters) getParameters();
+    	}
     	public String getName() {
     	public String getProviderName() {
     		return NAME;
+    	}
-...
     					featureProvider.setDefaultGeometry(this.shpFile.getGeometry(index));
     					hasGeometry = true;
     				} catch (CreateGeometryException e) {
     					throw new ReadException(getName(), e);
     					throw new ReadException(getProviderName(), e);
+    				}
+    			}
     			if (hasDBFAttributes(featureType, hasGeometry)) {
-...
     		try {
     			fType = this.getStoreServices().getDefaultFeatureType();
     		} catch (DataException e) {
     			throw new PerformEditingException(this.getName(), e);
     			throw new PerformEditingException(this.getProviderName(), e);
+    		}
     		// TODO Comprobar el campo de geometria
-...
     					DisposableIterator iter = null;
     					try {
     						set = getFeatureStore().getFeatureSet();
     						writer = new SHPFeatureWriter(getName());
     						writer = new SHPFeatureWriter(getProviderName());
     						SHPStoreParameters shpParams = getShpParameters();
     						SHPStoreParameters tmpParams =
-...
     						resourceCloseRequest();
     						if (!shpParams.getDBFFile().delete()) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getDBFFileName()));
+    						}
     						if (!shpParams.getSHPFile().delete()) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getSHPFileName()));
+    						}
     						if (!shpParams.getSHXFile().delete()) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getSHXFileName()));
+    						}
     						if (!tmpParams.getDBFFile().renameTo(
     								shpParams.getDBFFile())) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getSHPFileName()));
+    						}
     						if (!tmpParams.getSHPFile().renameTo(
     								shpParams.getSHPFile())) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getSHPFileName()));
+    						}
     						if (!tmpParams.getSHXFile().renameTo(
     								shpParams.getSHXFile())) {
     							throw new PerformEditingException(getName(),
     							throw new PerformEditingException(getProviderName(),
     									new IOException(shpParams.getSHXFileName()));
+    						}
-...
     			});
     		} catch (Exception e) {
     			throw new PerformEditingException(this.getName(), e);
     			throw new PerformEditingException(this.getProviderName(), e);
     			// } finally {
     			// this.resourcesEnd();
+    		}
-...
     				removeGeometryColumn(dbfFtype);
     				FeatureSet set = store.getFeatureSet();
     				writer = new SHPFeatureWriter(getName());
     				writer = new SHPFeatureWriter(getProviderName());
     				writer.begin(getShpParameters(), fType, dbfFtype, set.getSize());
     				return null;

     public class DBFStoreProvider extends AbstractFeatureStoreProvider implements
     		ResourceConsumer {
     	private static final Logger LOG = LoggerFactory.getLogger(DBFStoreProvider.class);
     //	private static final Logger LOG = LoggerFactory.getLogger(DBFStoreProvider.class);
     	public static String NAME = "DBF";
     	public static String DESCRIPTION = "DBF file";
     	//	private DBFResource dbf = null;
     	private static final Locale ukLocale = new Locale("en", "UK");
     	public static final String METADATA_DEFINITION_NAME = NAME;
     	private static final String METADATA_ENCODING = "Encoding";
     	private static final String METADATA_CODEPAGE = "CodePage";
     //	public static final String DYNFIELD_CURRENT_ENCODING = "CurrentEncoding";
     //	public static final String DYNFIELD_ORIGINAL_ENCODING = "OriginalEncoding";
     	private DbaseFile dbfFile = null;
     	private ResourceProvider dbfResource;
     	private long counterNewsOIDs = -1;
-...
     		Charset charset = params.getEncoding();
     		this.dbfFile = new DbaseFile(theFile, charset);
     		writer = new DBFFeatureWriter(this.getName());
     		writer = new DBFFeatureWriter(this.getProviderName());
     		this.initFeatureType();
-...
     		dbfResource.addConsumer(this);
+    	}
     	public String getName() {
     	public String getProviderName() {
     		return NAME;
+    	}
-...
     			params.setRoot(this.getDBFParameters().getDBFFile().getParent());
     			return manager.openServerExplorer(FilesystemServerExplorer.NAME,params);
     		} catch (DataException e) {
     			throw new ReadException(this.getName(), e);
     			throw new ReadException(this.getProviderName(), e);
     		} catch (ValidateDataParametersException e) {
     			// TODO Auto-generated catch block
     			throw new ReadException(this.getName(), e);
     			throw new ReadException(this.getProviderName(), e);
+    		}
+    	}
-...
     						try {
     							close();
     						} catch (CloseException e1) {
     							throw new PerformEditingException(getName(), e1);
     							throw new PerformEditingException(getProviderName(), e1);
+    						}
     						getDBFParameters().getDBFFile().delete();
     						tmpParams.getDBFFile().renameTo(
-...
+    				}
     			});
     		} catch (ResourceExecuteException e) {
     			throw new PerformEditingException(this.getName(), e);
     			throw new PerformEditingException(this.getProviderName(), e);
+    		}
     		this.counterNewsOIDs = -1;
-...
     		try {
     			this.open();
     		} catch (DataException e) {
     			throw new InitializeException(this.getName(), e);
     			throw new InitializeException(this.getProviderName(), e);
+    		}
     		return (EditableFeatureType) getResource().execute(
     				new ResourceAction() {
-...
     								attr.setDefaultValue(null);
     								attr.setAllowNull(true);
     							} else {
     								throw new InitializeException(getName(),
     								throw new InitializeException(getProviderName(),
     										new UnknownDataTypeException(
     												dbfFile.getFieldName(i), ""
     														+ fieldType, getName()));
     														+ fieldType, getProviderName()));
+    							}
+    						}
     						return fType;
-...
     		try {
     			value = this.dbfFile.getStringFieldValue(rowIndex, dbfIndex);
     		} catch (DataException e) {
     			throw new ReadException(this.getName(), e);
     			throw new ReadException(this.getProviderName(), e);
+    		}
     		value = value.trim();
     		int fieldType = descriptor.getType();
-...
     			try {
     				dat = df.parse(strAux);
     			} catch (ParseException e) {
     				throw new ReadException(this.getName(), e);
     				throw new ReadException(this.getProviderName(), e);
+    			}
     			featureProvider.set(descriptor.getIndex(), dat);
     			break;
-...
     			});
     		} catch (ResourceExecuteException e) {
     			throw new OpenException(this.getName(), e);
     			throw new OpenException(this.getProviderName(), e);
+    		}
+    	}
-...
+    				}
     			});
     		} catch (ResourceExecuteException e) {
     			throw new CloseException(this.getName(), e);
     			throw new CloseException(this.getProviderName(), e);
+    		}
+    	}
-...
     		try {
     			this.close();
     		} catch (CloseException e) {
     			throw new OpenException(this.getName(), e);
     			throw new OpenException(this.getProviderName(), e);
+    		}
     		this.open();
     		try {
     			this.initFeatureType();
     		} catch (InitializeException e) {
     			throw new OpenException(this.getName(), e);
     			throw new OpenException(this.getProviderName(), e);
+    		}
+    	}
-...
     	public Object getSourceId() {
     		return this.getDBFParameters().getFile();
+    	}
     	public String getName() {
     		String name = this.getDBFParameters().getFile().getName();
     		int n = name.lastIndexOf(".");
     		if( n<1 ) {
     			return name;
+    		}
     		return name.substring(0, n);
+    	}
     	public String getFullName() {
     		return this.getDBFParameters().getFile().getAbsolutePath();
+    	}
     	protected void resourceCloseRequest() throws ResourceException {
     		this.dbfResource.closeRequest();

branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dbf/DBFSetProvider.java
91	91	index++;
92	92	return ret;
93	93	} catch (DataException e) {
94		throw new ReadRuntimeException(getDBFStoreProvider().getName(),
	94	throw new ReadRuntimeException(getDBFStoreProvider().getProviderName(),
95	95	e);
96	96	}
97	97	}

branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dxf/DXFStoreProvider.java
164	164	return (DXFStoreParameters) this.getParameters();
165	165	}
166	166
167		public String getName() {
	167	public String getProviderName() {
168	168	return NAME;
169	169	}
170	170
...	...
287	287	try {
288	288	throw new OpenException(resource.getName(), e);
289	289	} catch (AccessResourceException e1) {
290		throw new OpenException(getName(), e);
	290	throw new OpenException(getProviderName(), e);
291	291	}
292	292	}
293	293	}
...	...
302	302	params.setRoot(this.getDXFParameters().getFile().getParent());
303	303	return manager.openServerExplorer(FilesystemServerExplorer.NAME,params);
304	304	} catch (DataException e) {
305		throw new ReadException(this.getName(), e);
	305	throw new ReadException(this.getProviderName(), e);
306	306	} catch (ValidateDataParametersException e) {
307		throw new ReadException(this.getName(), e);
	307	throw new ReadException(this.getProviderName(), e);
308	308	}
309	309
310	310	}
...	...
1497	1497	try {
1498	1498	this.open();
1499	1499	} catch (OpenException e) {
1500		throw new InitializeException(this.getName(), e);
	1500	throw new InitializeException(this.getProviderName(), e);
1501	1501	}
1502	1502	}
1503	1503
...	...
1536	1536	return this.getDXFParameters().getFile();
1537	1537	}
1538	1538
	1539	public String getName() {
	1540	String name = this.getDXFParameters().getFile().getName();
	1541	int n = name.lastIndexOf(".");
	1542	if( n<1 ) {
	1543	return name;
	1544	}
	1545	return name.substring(0, n);
	1546	}
	1547
	1548	public String getFullName() {
	1549	return this.getDXFParameters().getFile().getAbsolutePath();
	1550	}
	1551
1539	1552	public ResourceProvider getResource() {
1540	1553	return resource;
1541	1554	}

branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dgn/DGNStoreProvider.java
135	135	}
136	136
137	137
138		public String getName() {
	138	public String getProviderName() {
139	139	return NAME;
140	140	}
141	141
...	...
258	258	try {
259	259	throw new OpenException(resource.getName(), e);
260	260	} catch (AccessResourceException e1) {
261		throw new OpenException(getName(), e);
	261	throw new OpenException(getProviderName(), e);
262	262	}
263	263	}
264	264	}
...	...
273	273	params.setRoot(this.getDGNParameters().getFile().getParent());
274	274	return manager.openServerExplorer(FilesystemServerExplorer.NAME, params);
275	275	} catch (DataException e) {
276		throw new ReadException(this.getName(), e);
	276	throw new ReadException(this.getProviderName(), e);
277	277	} catch (ValidateDataParametersException e) {
278		throw new ReadException(this.getName(), e);
	278	throw new ReadException(this.getProviderName(), e);
279	279	}
280	280
281	281	}
...	...
947	947	try {
948	948	this.open();
949	949	} catch (OpenException e) {
950		throw new InitializeException(this.getName(), e);
	950	throw new InitializeException(this.getProviderName(), e);
951	951	}
952	952	}
953	953
...	...
973	973	public Object getSourceId() {
974	974	return this.getDGNParameters().getFile();
975	975	}
976
	976
	977	public String getName() {
	978	String name = this.getDGNParameters().getFile().getName();
	979	int n = name.lastIndexOf(".");
	980	if( n<1 ) {
	981	return name;
	982	}
	983	return name.substring(0, n);
	984	}
	985
	986	public String getFullName() {
	987	return this.getDGNParameters().getFile().getAbsolutePath();
	988	}
	989
977	990	public ResourceProvider getResource() {
978	991	return resource;
979	992	}

branches/v2_0_0_prep/extensions/org.gvsig.symbology/src/test/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/TestAbstractIntervalLegend.java
626	626	public String getProviderName() {
627	627	return null;
628	628	}
	629
	630	public String getFullName() {
	631	// TODO Auto-generated method stub
	632	return null;
	633	}
629	634	}
630	635
631	636	private static final FInterval interval0=new FInterval(0,2);

branches/v2_0_0_prep/extensions/org.gvsig.symbology/src/test/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/TestIClassifiedLegend.java
629	629	return null;
630	630	}
631	631
	632	public String getFullName() {
	633	// TODO Auto-generated method stub
	634	return null;
	635	}
	636
632	637	}
633	638
634	639	//private static final FInterval interval0=new FInterval(0,2);

Application: gvSIG desktop

Revision 33718