/ - Diff - Application: gvSIG desktop - gvSIG

              */
             String ret = super.toString();
             return "layer" + ret.substring(ret.indexOf('@') + 1);
             return ret ; //"layer" + ret.substring(ret.indexOf('@') + 1);
+        }
         public boolean isEditing() {

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/FLyrDefault.java
1038	1038	}
1039	1039
1040	1040	public String toString() {
1041		return super.toString() + ": " + getName();
	1041	return this.getName();
1042	1042	}
1043	1043
1044	1044	public boolean hidesThisArea(Envelope area) {

                 if (layer instanceof FLayers) {
                     FLayers layers = (FLayers) layer;
                     fmap.addAsCollectionListener(layers);
                     if( fmap != null ) {
                         fmap.addAsCollectionListener(layers);
+                    }
+                }
                 callLayerAdding(LayerCollectionEvent.createLayerAddingEvent(layer));
-...
                 } catch (Exception e) {
                     String mesg = Messages.getString("error_printing_layer") + " " + lyr.getName() + ": " + e.getMessage();
                     fmap.addLayerError(mesg);
                     if( fmap!=null ) {
                         fmap.addLayerError(mesg);
+                    }
                     logger.error(mesg, e);
+                }
-...
         @Override
         public void beginDraw(Graphics2D g, ViewPort viewPort) {
             if( fmap == null ) {
                 return;
+            }
             LayerDrawEvent beforeEvent = new LayerDrawEvent(this, g, viewPort, LayerDrawEvent.LAYER_BEFORE_DRAW);
             fmap.fireLayerDrawingEvent(beforeEvent);
+        }
         @Override
         public void endDraw(Graphics2D g, ViewPort viewPort) {
             if( fmap == null ) {
                 return;
+            }
             LayerDrawEvent afterEvent = new LayerDrawEvent(this, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW);
             fmap.fireLayerDrawingEvent(afterEvent);
+        }

     import java.awt.Component;
     import java.io.File;
     import java.lang.reflect.InvocationTargetException;
     import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.List;
     import java.util.logging.Level;
     import javax.swing.JComponent;
     import javax.swing.JFileChooser;
     import javax.swing.SwingUtilities;
     import javax.swing.event.HyperlinkListener;
     import javax.swing.filechooser.FileFilter;
     import javax.swing.tree.TreeModel;
     import org.cresques.cts.IProjection;
     import org.gvsig.about.AboutLocator;
-...
     import org.gvsig.app.project.documents.Document;
     import org.gvsig.app.project.documents.gui.IDocumentWindow;
     import org.gvsig.app.project.documents.view.ViewDocument;
     import org.gvsig.app.project.documents.view.ViewManager;
     import org.gvsig.fmap.crs.CRSFactory;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
-...
     import org.gvsig.fmap.mapcontext.MapContextLocator;
     import org.gvsig.fmap.mapcontext.MapContextManager;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontrol.CompoundLayersTreeModel;
     import org.gvsig.fmap.mapcontrol.MapControlLocator;
     import org.gvsig.gui.ColorTablesFactory;
     import org.gvsig.symbology.swing.SymbologySwingLocator;
     import org.gvsig.tools.ToolsLocator;
-...
                 InfoPanel.showPanel(title, mode, htmlText,hyperlinkListener);
+            }
             @Override
             public TreeModel createProjectLayersTreeModel() {
                 CompoundLayersTreeModel model = (CompoundLayersTreeModel) MapControlLocator.getMapControlManager().createCompoundLayersTreeModel();
                 Project project = this.getCurrentProject();
                 List<Document> views = project.getDocuments(ViewManager.TYPENAME);
                 for (Document view : views) {
                     model.addLayers( ((ViewDocument)view).getMapContext().getLayers() );
+                }
                 return model;
+            }
+    }

             return mapContext;
+        }
         @Override
         public void setName(String name) {
             super.setName(name);
             this.mapContext.getLayers().setName(name);
+        }
         /**
          * Gets the MapContext from the locator, which is the small map in the
          * left-bottom corner of the View.

     import java.util.List;
     import javax.swing.JComponent;
     import javax.swing.event.HyperlinkListener;
     import javax.swing.tree.TreeModel;
     import org.cresques.cts.IProjection;
     import org.gvsig.about.AboutManager;
-...
         public void showTextDialog(final WindowManager.MODE mode, final String title, final String htmlText);
         public void showTextDialog(final WindowManager.MODE mode, final String title, final String htmlText, HyperlinkListener hyperlinkListener);
         public TreeModel createProjectLayersTreeModel();
+    }

             <jython.artifactId>jython-standalone</jython.artifactId>
             <!-- External project versions -->
             <gvsig.tools.version>3.0.78</gvsig.tools.version>
             <gvsig.tools.version>3.0.79</gvsig.tools.version>
             <gvsig.proj.version>1.0.2</gvsig.proj.version>
             <gvsig.projection.api.version>2.0.21</gvsig.projection.api.version>

     package org.gvsig.fmap.mapcontrol;
     import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.List;
     import javax.swing.event.TreeModelEvent;
     import javax.swing.event.TreeModelListener;
     import javax.swing.tree.TreeModel;
     import javax.swing.tree.TreePath;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontext.layers.FLayers;
     public class LayersTreeModel implements TreeModel {
             protected final FLayers layers;
             protected final List<TreeModelListener> listeners = new ArrayList();
             public LayersTreeModel(FLayers layers) {
                 this.layers = layers;
+            }
             @Override
             public Object getRoot() {
                 return layers;
+            }
             @Override
             public Object getChild(Object parent, int index) {
                 if (!(parent instanceof FLayers)) {
                     return null;
+                }
                 return ((FLayers) parent).getLayer(index);
+            }
             @Override
             public int getChildCount(Object parent) {
                 if (!(parent instanceof FLayers)) {
                     return 0;
+                }
                 return ((FLayers) parent).getLayersCount();
+            }
             @Override
             public boolean isLeaf(Object node) {
                 return !(node instanceof FLayers);
+            }
             @Override
             public int getIndexOfChild(Object parent, Object child) {
                 for( int i=0; i<((FLayers)parent).getLayersCount() ; i++ ) {
                     FLayer layer = ((FLayers)parent).getLayer(i);
                     if( child == layer ) {
                         return i;
+                    }
+                }
                 return -1;
+            }
             @Override
             public void valueForPathChanged(TreePath path, Object value) {
+            }
             @Override
             public void addTreeModelListener(TreeModelListener listener) {
                 listeners.add(listener);
+            }
             @Override
             public void removeTreeModelListener(TreeModelListener listener) {
                 listeners.remove(listener);
+            }
             public void reload() {
                 TreeModelEvent event = new TreeModelEvent(this, new TreePath(this.layers));
                 Iterator<TreeModelListener> iterator = listeners.iterator();
                 TreeModelListener listener;
                 while (iterator.hasNext()) {
                     listener = iterator.next();
                     listener.treeStructureChanged(event);
+                }
+            }
+    }

     import java.awt.Color;
     import java.util.ArrayList;
     import java.util.HashSet;
     import java.util.Iterator;
     import java.util.LinkedHashSet;
     import java.util.List;
     import java.util.Map;
     import java.util.Set;
     import java.util.prefs.Preferences;
     import javax.swing.tree.TreeModel;
     import org.gvsig.fmap.mapcontrol.LayersTreeModel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.fmap.mapcontext.MapContextLocator;
     import org.gvsig.fmap.mapcontext.MapContextManager;
     import org.gvsig.fmap.mapcontext.layers.FLayers;
     import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
     import org.gvsig.fmap.mapcontrol.CompoundLayersTreeModel;
     import org.gvsig.fmap.mapcontrol.MapControl;
     import org.gvsig.fmap.mapcontrol.MapControlCreationException;
     import org.gvsig.fmap.mapcontrol.MapControlCreationListener;
-...
             return new DefaultLayersDynObjectSetComponent(layerName2InfoByPoint,
                 writable);
+        }
         public TreeModel createLayersTreeModel(MapContext mapContext) {
             return new LayersTreeModel(mapContext.getLayers());
+        }
         public TreeModel createLayersTreeModel(FLayers layers) {
             return new LayersTreeModel(layers);
+        }
         public TreeModel createCompoundLayersTreeModel() {
             return new CompoundLayersTreeModel();
+        }
+    }

     package org.gvsig.fmap.mapcontrol;
     import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.List;
     import javax.swing.event.TreeModelEvent;
     import javax.swing.event.TreeModelListener;
     import javax.swing.tree.TreeModel;
     import javax.swing.tree.TreePath;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontext.layers.FLayers;
     public class CompoundLayersTreeModel implements TreeModel {
             protected final FLayers layers;
             protected final List<TreeModelListener> listeners = new ArrayList();
             public CompoundLayersTreeModel() {
                 this.layers = new FLayers();
+            }
             public void addLayers(FLayers layers) {
                 this.layers.add(layers);
+            }
             @Override
             public Object getRoot() {
                 return layers;
+            }
             @Override
             public Object getChild(Object parent, int index) {
                 if (!(parent instanceof FLayers)) {
                     return null;
+                }
                 return ((FLayers) parent).getLayer(index);
+            }
             @Override
             public int getChildCount(Object parent) {
                 if (!(parent instanceof FLayers)) {
                     return 0;
+                }
                 return ((FLayers) parent).getLayersCount();
+            }
             @Override
             public boolean isLeaf(Object node) {
                 return !(node instanceof FLayers);
+            }
             @Override
             public int getIndexOfChild(Object parent, Object child) {
                 for( int i=0; i<((FLayers)parent).getLayersCount() ; i++ ) {
                     FLayer layer = ((FLayers)parent).getLayer(i);
                     if( child == layer ) {
                         return i;
+                    }
+                }
                 return -1;
+            }
             @Override
             public void valueForPathChanged(TreePath path, Object value) {
+            }
             @Override
             public void addTreeModelListener(TreeModelListener listener) {
                 listeners.add(listener);
+            }
             @Override
             public void removeTreeModelListener(TreeModelListener listener) {
                 listeners.remove(listener);
+            }
             public void reload() {
                 TreeModelEvent event = new TreeModelEvent(this, new TreePath(this.layers));
                 Iterator<TreeModelListener> iterator = listeners.iterator();
                 TreeModelListener listener;
                 while (iterator.hasNext()) {
                     listener = iterator.next();
                     listener.treeStructureChanged(event);
+                }
+            }
+    }

     import java.util.Map;
     import java.util.prefs.Preferences;
     import javax.swing.tree.TreeModel;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.fmap.mapcontext.layers.FLayers;
     import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
     import org.gvsig.fmap.mapcontrol.swing.dynobject.LayersDynObjectSetComponent;
     import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapper;
-...
          */
         public LayersDynObjectSetComponent createLayersDynObjectSetComponent(
             Map<String, DynObjectSet> layerName2InfoByPoint, boolean writable);
         /**
          * Create a TreeModel based in the MapControl's layers.
+         *
          * @param mapContext
          * @return the TreeModel
          */
         public TreeModel createLayersTreeModel(MapContext mapContext);
         /**
          * Create a TreeModel based in the layers collection.
          * @param layers the layers collection to use for create the TreeModel
          * @return the TreeModel
          */
         public TreeModel createLayersTreeModel(FLayers layers);
         /**
          * Create a TreeModel based in the layers collection of all project's views.
          * @return the TreeModel
          */
         public TreeModel createCompoundLayersTreeModel();
+    }

Application: gvSIG desktop

Revision 42651