/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 14907

     package com.iver.ai2.gvsig3d.map3d.layers;
     import java.awt.Point;
     import java.io.File;
     import javax.swing.JOptionPane;
     import com.iver.ai2.cache.CacheServiceException;
     import com.iver.ai2.cache.TileNum;
     import com.iver.ai2.gvsig3d.cacheservices.FLayerCacheService;
     import com.iver.ai2.gvsig3d.map3d.MapContext3D;
     import com.iver.cit.gvsig.fmap.DriverException;
     import com.iver.cit.gvsig.fmap.MapContext;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import com.iver.cit.gvsig.fmap.layers.FLayers;
     import com.iver.cit.gvsig.fmap.layers.FLyrDefault;
     import com.iver.cit.gvsig.fmap.layers.FLayers;
     import com.iver.cit.gvsig.fmap.layers.LayerCollectionEvent;
     import com.iver.cit.gvsig.fmap.layers.LegendListener;
     import com.iver.cit.gvsig.fmap.layers.XMLException;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.Classifiable;
     import com.iver.cit.gvsig.fmap.rendering.LegendChangedEvent;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.project.Project;
     import com.iver.utiles.XMLEntity;
     import com.iver.ai2.cache.TileNum;
     import com.iver.ai2.cache.CacheServiceException;
     import com.iver.ai2.gvsig3d.cacheservices.FLayerCacheService;
     import com.iver.ai2.gvsig3d.map3d.MapContext3D;
     import es.upv.ai2.libjosg.planets.Planet;
     import es.upv.ai2.libjosg.planets.TileEvent;
     import es.upv.ai2.libjosg.planets.TileListener;
     import es.upv.ai2.libjosg.planets.Planet;
     import es.upv.ai2.libjosg.viewer.Viewer;
     public class FLayers3D extends FLayers implements TileListener, LegendListener {
-...
     	// JOSG library objects
     	private Planet m_planet;
     	private Viewer m_canvas3d;
     	private String m_cacheDir = "c:/data/cache/"; // TEST
     	private boolean m_bSettingLayers = false;
     	/**
     	 * Constructor that can be used to create a MapContext containing the FLayers3D
-...
     	public void setPlanet(Planet planet) {
     		m_planet = planet;
     		refreshLayersInPlanet();
+    	}
         public void setViewer(Viewer viewer) {
-...
         protected void callLayerAdded(LayerCollectionEvent event)
+        {
         	layerAddedEvent(event);
         	if (!m_bSettingLayers)
+        	{
         	    FLayer layer = event.getAffectedLayer();
         	    layerAddedEvent(layer);
+        	}
         	super.callLayerAdded(event);
+        }
         protected void callLayerRemoved(LayerCollectionEvent event)
+        {
         	layerRemovedEvent(event);
         	FLayer layer = event.getAffectedLayer();
         	layerRemovedEvent(layer);
         	super.callLayerRemoved(event);
+        }
         protected void layerAddedEvent(LayerCollectionEvent e) {
         protected void layerAddedEvent(FLayer layer) {
         	FLayer layer = e.getAffectedLayer();
         	if (layer instanceof Classifiable) {
         		Classifiable legendLyr = (Classifiable)layer;
         		legendLyr.addLegendListener((LegendListener)this);
+        	}
         	if (layer instanceof FLyrDefault) {
         		FLyrDefault baseLayer = (FLyrDefault)layer;
         	    if (baseLayer.getProperty("3DLayerExtension") == null) {
                	    Layer3DProps props3D = new Layer3DProps();
                	    props3D.setLayer(layer);
             	    baseLayer.setProperty("3DLayerExtension", props3D);
             	    refreshPlanet(props3D);
+        	    }
+        	}
         	Refresh3DProps(layer);
+        }
         protected void layerRemovedEvent(LayerCollectionEvent e) {
         protected void layerRemovedEvent(FLayer layer) {
         	FLayer layer = e.getAffectedLayer();
         	if (layer instanceof Classifiable) {
         		Classifiable legendLyr = (Classifiable)layer;
         		legendLyr.removeLegendListener((LegendListener)this);
-...
          * @param e DOCUMENT ME!
          */
         public void legendChanged(LegendChangedEvent e) {
             FLayer lyr = (FLayer)e.getLayer();
             //Layer3DProps props3D = (Layer3DProps)m_layerProps.get(lyr);
             refreshPlanet(null /*props3D*/);
             FLyrDefault lyr = (FLyrDefault)e.getLayer();
             Layer3DProps props3D = (Layer3DProps)lyr.getProperty("3DLayerExtension");
             props3D.setCacheDirty(true);
             props3D.setDirty(true);
             refreshLayerInPlanet(props3D);
+        }
         protected void refreshPlanet(Layer3DProps props)
         protected void cleanLayersInPlanet(){
           // TODO
+        }
         protected void refreshLayersInPlanet() {
     		cleanLayersInPlanet();
     		//calculateStages();
     		// TODO: adapt to new layer iterator, when ready
     		for (int iLayer=0; iLayer<layers.size(); iLayer++)
+    		{
     			FLayer lyr = (FLayer)layers.get(iLayer);
     			Refresh3DProps(lyr);
+    		}
+        }
         protected void Refresh3DProps(FLayer layer) {
     		if (layer instanceof FLyrDefault) {
     			Layer3DProps props3D = getLayer3DProps(layer);
     		    refreshLayerInPlanet(props3D);
+    		}
+        }
         protected Layer3DProps getLayer3DProps(FLayer layer)
+        {
     		FLyrDefault baseLayer = (FLyrDefault)layer;
     		Object propsObj = baseLayer.getProperty("3DLayerExtension");
     		Layer3DProps props3D=null;
     		if (propsObj != null)
+    		{
     			try {
     			    props3D = (Layer3DProps)propsObj;
     			} catch (Exception e) {
     			    props3D = null;
+    			}
+    		}
     		if (props3D == null) {
     	   	    props3D = new Layer3DProps();
     	   	    props3D.setLayer(layer);
     		    baseLayer.setProperty("3DLayerExtension", props3D);
+    	    }
     		else {
     			props3D.setDirty(true); // to be refreshed in planet
+    		}
     		return props3D;
+        }
         protected void refreshLayerInPlanet(Layer3DProps props)
+        {
         	if (props==null)
         		return;
         	if (m_planet == null)
         		return; // view not opened yet
         	boolean isTexture = true;
     		if (isTexture)
         	// clear cache
         	if (props.getCacheDirty()) {
         		String layerCacheDir = m_cacheDir + props.getCacheName();
         		removeCache(layerCacheDir);
         		props.setCacheDirty(false);
+        	}
         	// refresh layer in planet
         	if (!props.getDirty())
         		return;
         	int type = props.getType();
         	if (type==Layer3DProps.layer3DImage)
+    		{
     	    	int stage = 0;
     	    	int stage = props.getStage();
     		    m_planet.refreshTextureInfo(stage);
+    		}
     		else
     		else if (type==Layer3DProps.layer3DElevation)
     			m_planet.refreshMDTInfo();
         	props.setDirty(false);
+        }
         private static boolean removeCache(String folder) {
         	File dir = new File(folder);
             if (dir.isDirectory()) {
                 String[] children = dir.list();
                 for (int i=0; i<children.length; i++) {
                     boolean success = removeCache(folder + "/" + children[i]);
                     if (!success) {
                         return false;
+                    }
+                }
+            }
             // The directory is now empty so delete it
             return dir.delete();
+        }
     	/**
     	 * Method of TileListener interface to respond to tile requests
+    	 *
-...
     				new CMSFileRasterService(m_planet.getPlanetName(), rasterFileName);*/
     			FLayerCacheService layerCacheServ =
     				new FLayerCacheService(m_planet.getPlanetName(), "test", lyr);
     				new FLayerCacheService(m_planet.getPlanetName(),
     						               getLayer3DProps(lyr).getCacheName(),
     						               lyr);
     			layerCacheServ.setCacheRootDir(m_cacheDir);
     			Point tileIndices = new Point(evt.getX(), evt.getY());
     			TileNum tileNum = new TileNum(evt.getLevel(), tileIndices);
-...
     	 * @throws DriverIOException
     	 */
     	public void setXMLEntity(XMLEntity xml) throws XMLException {
     		m_bSettingLayers = true;
     		super.setXMLEntity(xml);
     		m_bSettingLayers = false;
     		// A?adir cosas de 3D aqu?
     		refreshLayersInPlanet();
+    	}
     	/**
-...
     	 * @throws DriverIOException
     	 */
     	public void setXMLEntity03(XMLEntity xml) throws XMLException {
     	/*public void setXMLEntity03(XMLEntity xml) throws XMLException {
     		super.setXMLEntity03(xml);
     		// A?adir cosas de 3D aqu?
+    	}
     	}*/
+    }

     	protected int m_stage; // index of texture layer inside tile (?)
     	protected int m_type;  // see type enumeration above
     	protected String m_cacheName="default";
     	protected boolean m_bDirty=true;
     	protected boolean m_bCacheDirty=false;
     	public Layer3DProps() {
+    	}
-...
     		// TODO intialize properties from layer
     		m_stage = 0;
     		m_type = layer3DImage;
     		// find unique name for cache
     		// TODO: use full path of source or service
             m_cacheName = layer.getName();
+    	}
         public void setType(int type) {
-...
         	return m_stage;
+        }
         public String getCacheName() {
         	return m_cacheName;
+        }
     	public boolean getDirty() {
     		return m_bDirty;
+    	}
     	public void setDirty(boolean dirty) {
     		m_bDirty = dirty;
+    	}
     	public boolean getCacheDirty() {
     		return m_bCacheDirty;
+    	}
     	public void setCacheDirty(boolean dirty) {
     		m_bCacheDirty = dirty;
+    	}
         // IPersistance
         public String getClassName()
-...
     		xml.putProperty("type", m_type);
     		xml.putProperty("stage", m_stage);
     		xml.putProperty("cacheName", m_cacheName);
     		return xml;
+        }
-...
     			m_type = xml.getIntProperty("type");
     		if (xml.contains("stage"))
     			m_stage = xml.getIntProperty("stage");
     		if (xml.contains("cacheName"))
     			m_cacheName = xml.getStringProperty("cacheName");
+        }
+    }

Also available in: Unified diff