Changeset 3152 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2010-03-23T13:02:14+01:00 (13 years ago)

Author:

Gubaer

Message:

SplitWayAction slightly refactored, going to need this somewhere else

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangeCommand.java (modified) (3 diffs)
• DeleteCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -27 +28 @@
     private final OsmPrimitive newOsm;
 
+
     public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) {
         super();
+        this.osm = osm;
+        this.newOsm = newOsm;
+    }
+
+    public ChangeCommand(OsmDataLayer layer, OsmPrimitive osm, OsmPrimitive newOsm) {
+        super(layer);
         this.osm = osm;
         this.newOsm = newOsm;
@@ -47 +55 @@
         String msg = "";
         switch(OsmPrimitiveType.from(osm)) {
-            case NODE: msg = marktr("Change node {0}"); break;
-            case WAY: msg = marktr("Change way {0}"); break;
-            case RELATION: msg = marktr("Change relation {0}"); break;
+        case NODE: msg = marktr("Change node {0}"); break;
+        case WAY: msg = marktr("Change way {0}"); break;
+        case RELATION: msg = marktr("Change relation {0}"); break;
         }
         return new DefaultMutableTreeNode(

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -407 +407 @@
             chunks.add(n1);
             chunks.add(n2);
-            return SplitWayAction.splitWay(ws.way, chunks).getCommand();
+            return SplitWayAction.splitWay(layer,ws.way, chunks).getCommand();
         }
     }