Changeset 304 in josm for src/org/openstreetmap/josm/command

Timestamp:

2007-08-10T21:12:53+02:00 (18 years ago)

Author:

imi

Message:

• fixed a bug that nodes were not created when no data layer was loaded
• deprecated Main.map.mapView.addLayerChangeListener.

Location:

src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (3 diffs)
• Command.java (modified) (4 diffs)

src/org/openstreetmap/josm/command/AddCommand.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -37 +39 @@
         public AddCommand(OsmPrimitive osm) {
                 this.osm = osm;
-                this.ds = Main.ds;
+                this.ds = Main.main.editLayer().data;
         }
 
@@ -52 +54 @@
         }
 
+        // faster implementation
+        @Override public boolean invalidBecauselayerRemoved(Layer oldLayer) {
+            return oldLayer instanceof OsmDataLayer && ((OsmDataLayer)oldLayer).data == ds;
+    }
+
         @Override public MutableTreeNode description() {
                 NameVisitor v = new NameVisitor();

src/org/openstreetmap/josm/command/Command.java

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.command;
 
@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 
@@ -31 +33 @@
         private static final class CloneVisitor implements Visitor {
                 public Map<OsmPrimitive, OsmPrimitive> orig = new HashMap<OsmPrimitive, OsmPrimitive>();
-                
+
                 public void visit(Node n) {
                         orig.put(n, new Node(n));
-            }
+                }
                 public void visit(Segment s) {
                         orig.put(s, new Segment(s));
-            }
+                }
                 public void visit(Way w) {
                         orig.put(w, new Way(w));
-            }
+                }
         }
-        
+
         private CloneVisitor orig; 
-        
+
         /**
          * Executes the command on the dataset. This implementation will remember all
@@ -69 +71 @@
         }
 
+
+        /**
+         * Called, when a layer has been removed to have the command remove itself from
+         * any buffer if it is not longer applicable to the dataset (e.g. it was part of
+         * the removed layer)
+         */
+        public boolean invalidBecauselayerRemoved(Layer oldLayer) {
+                if (!(oldLayer instanceof OsmDataLayer))
+                        return false;
+                HashSet<OsmPrimitive> modified = new HashSet<OsmPrimitive>();
+                fillModifiedData(modified, modified, modified);
+                if (modified.isEmpty())
+                        return false;
+
+                HashSet<OsmPrimitive> all = new HashSet<OsmPrimitive>(((OsmDataLayer)oldLayer).data.allPrimitives());
+                for (OsmPrimitive osm : all)
+                        if (all.contains(osm))
+                                return true;
+
+                return false;
+        }
+
         /**
          * Fill in the changed data this command operates on.