/ - Diff - Application: gvSIG desktop - gvSIG

     import org.slf4j.LoggerFactory;
     public class DefaultCPGFile implements CPGFile {
     public class DefaultCPGFile extends AbstractFormatFile implements CPGFile {
         private static final Logger logger = LoggerFactory.getLogger(DefaultPRJFile.class);

     import org.slf4j.LoggerFactory;
     public class DefaultPRJFile implements PRJFile {
     public class DefaultPRJFile extends AbstractFormatFile implements PRJFile {
         private static final Logger logger = LoggerFactory.getLogger(DefaultPRJFile.class);

     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DefaultHDRFile implements HDRFile {
     public class DefaultHDRFile extends AbstractFormatFile implements HDRFile {
         // http://resources.esri.com/help/9.3/arcgisdesktop/com/gp_toolref/spatial_analyst_tools/esri_ascii_raster_format.htm
         private static final Logger logger = LoggerFactory.getLogger(DefaultHDRFile.class);

     import org.slf4j.LoggerFactory;
     public class DefaultSTXFile implements STXFile {
     public class DefaultSTXFile extends AbstractFormatFile implements STXFile {
         private static final Logger logger = LoggerFactory.getLogger(DefaultSTXFile.class);

     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DefaultCLRFile implements CLRFile {
     public class DefaultCLRFile extends AbstractFormatFile implements CLRFile {
         private static final Logger logger = LoggerFactory.getLogger(DefaultCLRFile.class);

     import org.slf4j.LoggerFactory;
     public class DefaultWLDFile implements WLDFile {
     public class DefaultWLDFile extends AbstractFormatFile implements WLDFile {
         private static final Logger logger = LoggerFactory.getLogger(DefaultWLDFile.class);

     /*
      * To change this license header, choose License Headers in Project Properties.
      * To change this template file, choose Tools | Templates
      * and open the template in the editor.
      */
     package org.gvsig.basicformats.impl;
     import java.io.File;
     import java.io.IOException;
     import org.gvsig.basicformats.FormatFile;
     /**
+     *
      * @author fdiaz
      */
     public abstract class AbstractFormatFile implements FormatFile {
         @Override
         public void writeQuietly(File file) throws IOException {
             try {
                 write(file);
             } catch (Exception e) {
+            }
+        }
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.basicformats/src/main/java/org/gvsig/basicformats/FormatFile.java
14	14	public void read(File file) throws IOException ;
15	15
16	16	public void write(File file) throws IOException ;
	17
	18	public void writeQuietly(File file) throws IOException ;
17	19	}

     import java.io.File;
     import java.io.IOException;
     import org.gvsig.basicformats.FormatsFile;
     import org.gvsig.basicformats.PRJFile;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataServerExplorer;
-...
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.exception.RemoveException;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.resource.ResourceAction;
     import org.gvsig.fmap.dal.resource.exception.ResourceNotifyChangesException;
-...
     import org.gvsig.fmap.dal.resource.spi.ResourceProvider;
     import org.gvsig.fmap.dal.serverexplorer.filesystem.AbsolutePathRequiredException;
     import org.gvsig.fmap.dal.store.dbf.DBFFilesystemServerProvider;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * @author jmvivo
+     *
      */
     public class SHPFilesystemServerProvider extends DBFFilesystemServerProvider {
             protected static final Logger LOGGER = LoggerFactory.getLogger(SHPFilesystemServerProvider.class);
             @Override
     	public boolean accept(File pathname) {
     		return pathname.getName().toLowerCase().endsWith(".shp");
+    	}
             @Override
     	public int getMode() {
     		return DataServerExplorer.MODE_GEOMETRY|DataServerExplorer.MODE_FEATURE;
+    	}
             @Override
     	public boolean canCreate() {
     		return true;
+    	}
     	// private FileResource[] createResources(File[] files)
     	// throws InitializeException {
     	// FileResource[] result = new FileResource[files.length];
     	// for (int i = 0; i < files.length; i++) {
     	// result[i] = this.createResource(files[i]);
     	// }
     	//
     	// return result;
     	// }
     	private ResourceProvider createResource(File shpFile, File[] otherFiles)
     			throws InitializeException {
-...
     	// return resource;
     	// }
             @Override
     	public boolean canCreate(NewDataStoreParameters parameters) {
     		if (!super.canCreate(parameters)) {
     			return false;
-...
     		return true;
+    	}
             @Override
     	public boolean closeResourceRequested(ResourceProvider resource) {
     		// while it is using a resource anyone can't close it
     		return false;
+    	}
             @Override
     	public void create(NewDataStoreParameters parameters, boolean overwrite)
     			throws CreateException {
-...
     //			beginResources(resources);
     			resource.execute(new ResourceAction() {
                                     @Override
     				public Object run() throws Exception {
     					SHPFeatureWriter writer =
     							new SHPFeatureWriter(getDataStoreProviderName());
     					writer.begin(params, fType, 0);
                                             PRJFile prjFile = FormatsFile.createPRJFile();
                                             prjFile.setCRS(params.getCRS());
                                             prjFile.writeQuietly(params.getFile());
     					writer.end();
     					return null;
-...
     			// removeConsumer(resources);
     			resource.removeConsumer(this);
+    		}
+    	}
+            }
     	// private boolean closeResources(FileResource[] resources)
     	// throws ResourceException {
     	// for (int i = 0; i < resources.length; i++) {
     	// // TODO
     	// // if (!resources[i].closeRequest()){
     	// // return false;
     	// // }
     	// resources[i].closeRequest();
     	// }
     	// return true;
     	//
     	// }
     	private void removeConsumer(FileResource[] resources) {
     		for (int i = 0; i < resources.length; i++) {
     			resources[i].removeConsumer(this);
+    		}
                 for (FileResource resource : resources) {
                     resource.removeConsumer(this);
+                }
+    	}
     	// private void endResources(FileResource[] resources) {
-...
     	private void notifyChangesResources(FileResource[] resources)
     			throws ResourceNotifyChangesException {
     		for (int i = 0; i < resources.length; i++) {
     			resources[i].notifyChanges();
+    		}
                 for (FileResource resource : resources) {
                     resource.notifyChanges();
+                }
+    	}
     	// private void beginResources(FileResource[] resources)
     	// throws ResourceExecuteException {
     	// for (int i = 0; i < resources.length; i++) {
     	// resources[i].begin();
     	// }
     	//
     	// }
             @Override
     	public NewDataStoreParameters getCreateParameters() {
     		SHPNewStoreParameters params =
     				(SHPNewStoreParameters) super.getCreateParameters();
-...
     		return params;
+    	}
             @Override
     	protected NewDataStoreParameters createInstanceNewDataStoreParameters() {
     		return new SHPNewStoreParameters();
+    	}
             @Override
     	public String getDataStoreProviderName() {
     		return SHPStoreProvider.NAME;
+    	}
             @Override
     	public String getDescription() {
     		return SHPStoreProvider.DESCRIPTION;
+    	}
             @Override
     	public DataStoreParameters getParameters(File file) throws DataException {
     		DataManager manager = DALLocator.getDataManager();
     		SHPStoreParameters params =
-...
+    	}
             @Override
     	public void remove(DataStoreParameters parameters) throws RemoveException {
     		SHPStoreParameters params = (SHPStoreParameters) parameters;
-...
     		File[] otherFiles = new File[] { shxFile, dbfFile };
     		final ResourceProvider resource;
     		try {
     			// resources = this.createResources(files);
     			resource = createResource(shpFile, otherFiles);
     			resource.closeRequest();
     			resource.closeRequest();
     			// closeResources(resources);
     		} catch (DataException e1) {
     			throw new RemoveException(shpFile.getPath(), e1);
+    		}
     		try {
     //			beginResources(resources);
     			resource.execute(new ResourceAction() {
                                     @Override
     				public Object run() throws Exception {
     					deleteFile(shpFile);
     					deleteFile(dbfFile);
-...
     					return null;
+    				}
     			});
     			// for (int i = 0; i < files.length; i++) {
     			// if (!files[i].exists()) {
     			// continue;
     			// }
     			// if (!files[i].delete()) {
     			// throw new RemoveException(this.getDataStoreProviderName(),
     			// new IOException()); // FIXME Exception
     			// }
     			// }
     			// notifyChangesResources(resources);
     		} catch (Exception e) {
     			throw new RemoveException(this.getDataStoreProviderName(), e);
     		} finally {
     //			endResources(resources);
     //			removeConsumer(resources);
     			resource.removeConsumer(this);
+    		}
+    	}
-...
+    		}
+    	}
             @Override
     	public String getResourceRootPathName(DataStore dataStore) {
     		SHPStoreParameters shpParams = (SHPStoreParameters) dataStore.getParameters();
     		return removeFileExtension(shpParams.getSHPFile());

             <artifactId>org.gvsig.expressionevaluator.geometry.lib.impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.gvsig</groupId>
           <artifactId>org.gvsig.basicformats</artifactId>
           <scope>compile</scope>
         </dependency>
       </dependencies>

                 <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.basicformats</artifactId>
                 <scope>runtime</scope>
             </dependency>
             <!-- Dependencias de los test -->

             <include>org.jpedal:jpedal_lgpl</include>
             <include>zql:zql</include>
             <include>org.gvsig:org.gvsig.basicformats</include>
           </includes>
         </dependencySet>
       </dependencySets>

Application: gvSIG desktop

Revision 45318