/ - Diff - gvSIG 3D - gvSIG

      */
     public interface GeneralProperties3D {
         public final static String DEFAULT_VIEW_HEIGHT_PROPERTY_NAME =
             "defaultViewHeight";
         public final static String DEFAULT_VIEW_WIDTH_PROPERTY_NAME =
             "defaultViewWidth";
         public final static String ATMOSPHERE_VISIBILITY_PROPERTY_NAME =
             "atmosphereVisibility";
         public final static String MINIMAP_VISIBILITY_PROPERTY_NAME =
             "minimapVisibility";
         public final static String NORTH_INDICATOR_VISIBILITY_PROPERTY_NAME =
             "northIndicatorVisibility";
         public final static String STARS_BACKGROUND_VISIBILITY_PROPERTY_NAME =
             "starsBackgroundVisibility";
         public final static String SCALE_VISIBILITY_PROPERTY_NAME =
             "scaleVisibility";
         public final static String VIEWPORT_ANIMATION_PROPERTY_NAME =
             "viewPortAnimation";
         public final static String CACHE_PATH_PROPERTY_NAME = "cachePath";
         /**
          * Adds {@link PropertyChangeListener} that will listen properties changes.
+         *

                   value="www.nasa.gov, worldwind.arc.nasa.gov, google.com, microsoft.com, yahoo.com"/>
         <Property name="gov.nasa.worldwind.avkey.TaskServiceClassName" value="gov.nasa.worldwind.util.ThreadedTaskService"/>
         <Property name="gov.nasa.worldwind.avkey.DataFileStoreClassName"
                   value="gov.nasa.worldwind.cache.BasicDataFileStore"/>
                   value="org.gvsig.view3d.swing.impl.data.DefaultConfigurableDataFileStore"/>
         <Property name="gov.nasa.worldwind.avkey.DataRasterReaderFactoryClassName"
                   value="org.gvsig.view3d.swing.impl.data.DefaultDataRasterReaderFactory"/>
         <Property name="gov.nasa.worldwind.avkey.DataFileStoreConfigurationFileName" value="config/DataFileStore.xml"/>

     public class DefaultGeneralProperties3D implements GeneralProperties3D {
         private String DEFAULT_VIEW_HEIGHT_PROPERTY_NAME = "defaultViewHeight";
         private String DEFAULT_VIEW_WIDTH_PROPERTY_NAME = "defaultViewWidth";
         private int defaultViewHeight;
         private int defaultViewWidth;
         private String ATMOSPHERE_VISIBILITY_PROPERTY_NAME = "atmosphereVisibility";
         private String MINIMAP_VISIBILITY_PROPERTY_NAME = "minimapVisibility";
         private String NORTH_INDICATOR_VISIBILITY_PROPERTY_NAME =
             "northIndicatorVisibility";
         private String STARS_BACKGROUND_VISIBILITY_PROPERTY_NAME =
             "starsBackgroundVisibility";
         private String SCALE_VISIBILITY_PROPERTY_NAME = "scaleVisibility";
         private boolean atmosphereVisibility;
         private boolean northIndicatorVisibility;
         private boolean minimapVisibility;
         private boolean starsBackgroundVisibility;
         private boolean scaleVisibility;
         private String VIEWPORT_ANIMATION_PROPERTY_NAME = "viewPortAnimation";
         private boolean viewPortAnimation;
         private String CACHE_PATH_PROPERTY_NAME = "cachePath";
         private File cachePath;
         private int defaultViewHeight = 600;
         private int defaultViewWidth = 800;
         private boolean atmosphereVisibility = true;
         private boolean northIndicatorVisibility = true;
         private boolean minimapVisibility = true;
         private boolean starsBackgroundVisibility = true;
         private boolean scaleVisibility = true;
         private boolean viewPortAnimation = true;
         private File cachePath = new File(System.getProperty("user.home") + File.separator + "gvSIG" + File.separator + "WorldWind");
         private PropertyChangeSupport support;
         public DefaultGeneralProperties3D() {
             support = new PropertyChangeSupport(this);
             setDefaultValues();
+        }
         private void setDefaultValues() {
             setDefaultViewHeight(600);
             setDefaultViewWidth(800);
             setAtmosphereVisibility(true);
             setNorthIndicatorVisibility(true);
             setMinimapVisibility(true);
             setStarsBackgroundVisibility(true);
             setScaleVisibility(true);
             setViewPortAnimation(true);
             setCachePath(new File(System.getProperty("user.home") + File.separator
                 + "gvSIG" + File.separator + "WorldWind"));
+        }
         public boolean getAtmosphereVisibility() {
             return atmosphereVisibility;
+        }
-...
         public void setDefaultViewWidth(int width) {
             support.firePropertyChange(DEFAULT_VIEW_WIDTH_PROPERTY_NAME,
                 defaultViewHeight, width);
                 defaultViewWidth, width);
             this.defaultViewWidth = width;
+        }

     package org.gvsig.view3d.swing.impl;
     import gov.nasa.worldwind.WorldWind;
     import gov.nasa.worldwind.cache.FileStore;
     import java.beans.PropertyChangeEvent;
     import java.beans.PropertyChangeListener;
     import java.io.File;
     import java.util.ArrayList;
     import java.util.List;
-...
     import org.gvsig.view3d.swing.api.properties.LayerProperties3DPanel;
     import org.gvsig.view3d.swing.api.properties.MapControlProperties3D;
     import org.gvsig.view3d.swing.api.properties.ViewProperties3DPanel;
     import org.gvsig.view3d.swing.impl.data.ConfigurableFileStore;
     import org.gvsig.view3d.swing.impl.properties.DefaultGeneralProperties3D;
     import org.gvsig.view3d.swing.impl.properties.DefaultGeneralProperties3DPanel;
     import org.gvsig.view3d.swing.impl.properties.DefaultLayerProperties3DPanel;
-...
         public GeneralProperties3D getGeneral3DProperties() {
             if(generalProperties == null){
                 generalProperties = new DefaultGeneralProperties3D();
                 generalProperties.addPropertyChangeListener(getCachePathPropertyListener());
+            }
             return generalProperties;
+        }
-...
         public void setGeneral3DProperties(GeneralProperties3D properties) {
             if(properties != null){
                 this.generalProperties = properties;
                 this.generalProperties
                     .addPropertyChangeListener(getCachePathPropertyListener());
+            }
+        }
         private PropertyChangeListener getCachePathPropertyListener(){
             return new PropertyChangeListener() {
                 public void propertyChange(PropertyChangeEvent evt) {
                     if (evt.getPropertyName().equals(
                         GeneralProperties3D.CACHE_PATH_PROPERTY_NAME)) {
                         FileStore dataFileStore = WorldWind.getDataFileStore();
                         if(dataFileStore instanceof ConfigurableFileStore){
                             ConfigurableFileStore confDataStore =
                                 (ConfigurableFileStore) dataFileStore;
                             confDataStore.setWriteLocation((File) evt.getNewValue());
                             LOG.info("Changed cache path to {}", evt.getNewValue());
+                        }
+                    }
+                }
             };
+        }
+    }

     package org.gvsig.view3d.swing.impl.data;
     import gov.nasa.worldwind.cache.BasicDataFileStore;
     import java.io.File;
     import org.gvsig.view3d.swing.api.View3DSwingLocator;
     import org.gvsig.view3d.swing.api.View3DSwingManager;
     import org.gvsig.view3d.swing.api.properties.GeneralProperties3D;
     public class DefaultConfigurableDataFileStore extends BasicDataFileStore
         implements ConfigurableFileStore {
         public DefaultConfigurableDataFileStore() {
             super();
             setDefaultCachePath();
+        }
         public DefaultConfigurableDataFileStore(File directoryPath ){
             super(directoryPath);
             setDefaultCachePath();
+        }
         private void setDefaultCachePath() {
             View3DSwingManager swingManager = View3DSwingLocator.getManager();
             GeneralProperties3D general3dProperties = swingManager.getGeneral3DProperties();
             setWriteLocation(general3dProperties.getCachePath());
+        }
         public void setWriteLocation(File writeLocation) {
             if(!writeLocation.exists()){
                 writeLocation.mkdirs();
+            }
             if (writeLocation.isDirectory() && writeLocation.canWrite()
                 && writeLocation.canRead()) {
                 // Remove the writable location from search path if it already
                 // exists.
                 StoreLocation oldLocation =
                     this.storeLocationFor(this.writeLocation.getFile().getAbsolutePath());
                 if (oldLocation != null)
                     this.readLocations.remove(oldLocation);
                 this.writeLocation = new StoreLocation(writeLocation);
                 // Writable location is always first in search path.
                 this.readLocations.add(0, this.writeLocation);
+            }
+        }
+    }

     package org.gvsig.view3d.swing.impl.data;
     import gov.nasa.worldwind.WorldWind;
     import gov.nasa.worldwind.avlist.AVKey;
     import gov.nasa.worldwind.avlist.AVList;
     import gov.nasa.worldwind.cache.FileStore;
-...
+            }
             if (params.getValue(AVKey.FILE_STORE) == null) {
                 LOG.error("Can not create raster server, file store is null");
                 throw new IllegalArgumentException();
                 setDataFileStore(WorldWind.getDataFileStore());
+            }
             setDataFileStore((FileStore) params.getValue(AVKey.FILE_STORE));
             String datasetName = params.getStringValue(AVKey.DATASET_NAME);
             if (WWUtil.isEmpty(datasetName)) {
                 LOG.error(

     package org.gvsig.view3d.swing.impl.data;
     import gov.nasa.worldwind.cache.FileStore;
     import java.io.File;
     /**
      * This class represents the configurable {@link FileStore}
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public interface ConfigurableFileStore extends FileStore{
         /**
          * Set new write location to file store
+         *
          * @param writeLocation
          */
         public void setWriteLocation(File writeLocation);
+    }

     package org.gvsig.view3d.swing.impl.data;
     import gov.nasa.worldwind.WorldWind;
     import gov.nasa.worldwind.avlist.AVKey;
     import gov.nasa.worldwind.avlist.AVList;
     import gov.nasa.worldwind.cache.FileStore;
-...
+            }
             if (params.getValue(AVKey.FILE_STORE) == null) {
                 LOG.error("Can not create raster server, file store is null");
                 throw new IllegalArgumentException();
                 setDataFileStore(WorldWind.getDataFileStore());
+            }
             setDataFileStore((FileStore) params.getValue(AVKey.FILE_STORE));
             String datasetName = params.getStringValue(AVKey.DATASET_NAME);
             if (WWUtil.isEmpty(datasetName)) {

     import gov.nasa.worldwind.avlist.AVKey;
     import gov.nasa.worldwind.avlist.AVList;
     import gov.nasa.worldwind.avlist.AVListImpl;
     import gov.nasa.worldwind.cache.BasicDataFileStore;
     import gov.nasa.worldwind.geom.Angle;
     import gov.nasa.worldwind.geom.LatLon;
     import gov.nasa.worldwind.geom.Sector;
-...
     import gov.nasa.worldwind.util.WWMath;
     import java.awt.geom.Point2D;
     import java.io.File;
     import java.security.MessageDigest;
     import java.security.NoSuchAlgorithmException;
-...
     import org.gvsig.view3d.lib.api.View3DManager;
     import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
     import org.gvsig.view3d.swing.api.MapControl3D;
     import org.gvsig.view3d.swing.api.View3DSwingLocator;
     import org.gvsig.view3d.swing.impl.DefaultMapControl3D;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
             params.setValue(AVKey.DATASET_NAME, layer.getName());
             params.setValue(AVKey.DATA_CACHE_NAME, getUniqueCacheId(layer));
             params.setValue(AVKey.DISPLAY_NAME, layer.getName());
             params.setValue(AVKey.SERVICE_NAME, "Offline");
             File cachePath =
                 View3DSwingLocator.getManager().getGeneral3DProperties().getCachePath();
             params.setValue(AVKey.FILE_STORE, new BasicDataFileStore(cachePath));
             params.setValue(AVKey.SERVICE_NAME, "Offline");
+        }
         private Sector getSector(FLayer layer, IProjection projection)

Application: gvSIG desktop » gvSIG 3D

Revision 541