/ - Diff - gvSIG educa bugs - gvSIG

      * </p>
      * This class' instances contains information about a installed <i>Thematic
      * Map</i>
+     *
+     *
      * @author <a href="http://www.disid.com">DiSiD Technologies S.L.</a>
      * @version $Rev$
      * @since {version}
-...
         /**
          * Gets information about this <i>Thematic Map</i>
+         *
+         *
          * @return
          */
         ThematicMapInformation getInformation();
-...
          * </p>
          * unzip folder is defined in {@link ThematicMapManager#getTemporalFolder()}
          * </p>
+         *
+         *
          * @throws InvalidThematicMapFormatException
          * @throws CantLoadContextException
          * @throws IOException
-...
         /**
          * Informs if <i>Thematic Map</i> it's already opened or not
+         *
+         *
          * @return if it's opened
          */
         boolean isOpen();
         /**
          * Unloads all data loaded in memory and cleans its temporal folder
+         *
+         *
          * @throws IOException
          *             if any problem is found cleaning temporal folder
+         *
+         *
          */
         void close() throws IOException;
         /**
          * Gets MapContext with <i>Thematic Map</i> representation
+         *
+         *
          * @return MapContext instance
          * @throws IllegalStateException
          *             if {@link #isOpen()} == false
-...
         MapContext getMapContext();
         /**
+         *
          * Gets the file which ThematicMap data
+         *
          * @return
          */
         String getSourceFilePath();

     import java.io.IOException;
     import java.util.zip.ZipException;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * Thematic Map Utilities related to files
+     *
+     *
      * @author gvSIG Team
      * @version $Id$
+     *
      */
     /**
      * @author gvSIG Team
      * @version $Id$
+     *
      */
     public interface ThematicMapFileServices {
-...
          */
         File getRelativeTo(File path, File basePath);
         /**
          * <p>
          * Load a mapContext from a file adjusting file paths which are supposed
          * relatives to a folder
          * </p>
+         *
          * @param mapContext
          *            persistence file
          * @param relativaPathFolder
          *            for files refered in mapContext
          * @return
          * @throws IOException
          * @throws PersistenceException
          */
         MapContext loadMapContext(File mapContext, File relativaPathFolder)
             throws IOException, PersistenceException;
+    }

     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.educa.thematicmap.ThematicMapFileServices;
     import org.gvsig.educa.thematicmap.ThematicMapLocator;
     import org.gvsig.educa.thematicmap.impl.util.FileUtils;
     import org.gvsig.educa.thematicmap.impl.util.IOUtils;
     import org.gvsig.educa.thematicmap.impl.util.PersistenceUtils;
     import org.gvsig.educa.thematicmap.map.CantLoadContextException;
     import org.gvsig.educa.thematicmap.map.InvalidInstalledThematicMapException;
     import org.gvsig.educa.thematicmap.map.InvalidThematicMapFormatException;
-...
         private final PackageInfoReader packageInfoReader;
         private final ThematicMapFileServices fileServices;
         /**
+         *
          */
         public ThematicMapLoader() {
             installerManager = InstallerLocator.getInstallerManager();
             packageInfoReader = installerManager.getDefaultPackageInfoReader();
             fileServices = ThematicMapLocator.getFileServices();
+        }
         /**
-...
                         .concat(mapContextFile.getAbsolutePath()));
+            }
             InputStream is = null;
             // Load map context
             MapContext mapContext;
             try {
                 try {
                     // open file
                     is = FileUtils.openInputStream(mapContextFile);
                     // load Persistence status from file
                     PersistentState persistenceStatus =
                         persistenceManager.loadState(is);
                 mapContext =
                     fileServices.loadMapContext(mapContextFile, deployFolder);
                     // Adjust all path in persistence status to deploy folder
                     PersistenceUtils.fixMapContextFilePaths(persistenceStatus,
                         deployFolder);
                     // Create a new mapContext Instance and load it form persistence
                     // status
                     MapContext mapContext =
                         (MapContext) persistenceManager.create(persistenceStatus);
                     if (mapContext == null) {
                         throw new CantLoadContextException(mapFile, mapContextFile,
                             "mapContext not loaded", null);
+                    }
                     return mapContext;
                 } catch (Exception e) {
                     throw new CantLoadContextException(mapFile, mapContextFile, e);
                 if (mapContext == null) {
                     throw new CantLoadContextException(mapFile, mapContextFile,
                         "mapContext not loaded", null);
+                }
             } finally {
                 IOUtils.closeQuietly(is);
                 return mapContext;
             } catch (Exception e) {
                 throw new CantLoadContextException(mapFile, mapContextFile, e);
+            }
+        }

     import java.io.File;
     import java.io.IOException;
     import java.io.InputStream;
     import java.util.zip.ZipException;
     import org.gvsig.educa.thematicmap.ThematicMapFileServices;
     import org.gvsig.educa.thematicmap.impl.util.FileUtils;
     import org.gvsig.educa.thematicmap.impl.util.IOUtils;
     import org.gvsig.educa.thematicmap.impl.util.PersistenceUtils;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * @author gvSIG Team
-...
      */
     public class DefaultThematicMapFileServices implements ThematicMapFileServices {
         private final PersistenceManager persistenceManager;
         /**
+         *
          */
         public DefaultThematicMapFileServices() {
             persistenceManager = ToolsLocator.getPersistenceManager();
+        }
         public void unzipFile(File zipFile, File outputFloder) throws ZipException,
             IOException {
             FileUtils.unzipFile(zipFile, outputFloder);
-...
             return FileUtils.getRelativeTo(path, basePath);
+        }
         public MapContext loadMapContext(File mapContext, File relativaPathFolder)
             throws IOException, PersistenceException {
             InputStream is = null;
             try {
                 // open file
                 is = FileUtils.openInputStream(mapContext);
                 // load Persistence status from file
                 PersistentState persistenceStatus =
                     persistenceManager.loadState(is);
                 // Adjust all path in persistence status to deploy folder
                 PersistenceUtils.fixMapContextFilePaths(persistenceStatus,
                     relativaPathFolder);
                 // Create a new mapContext Instance and load it form persistence
                 // status
                 return (MapContext) persistenceManager.create(persistenceStatus);
             } finally {
                 IOUtils.closeQuietly(is);
+            }
+        }
+    }

Aplicación gvSIG con fines educativos » gvSIG educa bugs

Revision 56