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

Timestamp:

2016-06-24T00:30:42+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (2 diffs)
• AddPrimitivesCommand.java (modified) (4 diffs)
• Command.java (modified) (2 diffs)
• conflict/WayNodesConflictResolverCommand.java (modified) (1 diff)

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

@@ -59 +59 @@
     @Override
     public boolean executeCommand() {
-        getLayer().data.addPrimitive(osm);
+        getAffectedDataSet().addPrimitive(osm);
         osm.setModified(true);
         checkNodeStyles(osm);
@@ -67 +67 @@
     @Override
     public void undoCommand() {
-        getLayer().data.removePrimitive(osm);
+        getAffectedDataSet().removePrimitive(osm);
         checkNodeStyles(osm);
     }

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

@@ -78 +78 @@
 
             for (PrimitiveData pd : data) {
-                OsmPrimitive primitive = getLayer().data.getPrimitiveById(pd);
+                OsmPrimitive primitive = getAffectedDataSet().getPrimitiveById(pd);
                 boolean created = primitive == null;
                 if (created) {
@@ -87 +87 @@
                 }
                 if (created) {
-                    getLayer().data.addPrimitive(primitive);
+                    getAffectedDataSet().addPrimitive(primitive);
                 }
                 newPrimitives.add(primitive);
@@ -115 +115 @@
 
     @Override public void undoCommand() {
-        DataSet ds = getLayer().data;
+        DataSet ds = getAffectedDataSet();
 
         if (createdPrimitives == null) {
@@ -167 +167 @@
         Collection<OsmPrimitive> prims = new HashSet<>();
         for (PrimitiveData d : data) {
-            OsmPrimitive osm = getLayer().data.getPrimitiveById(d);
+            OsmPrimitive osm = getAffectedDataSet().getPrimitiveById(d);
             if (osm == null)
                 throw new RuntimeException();

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -210 +211 @@
     protected OsmDataLayer getLayer() {
         return layer;
+    }
+
+    /**
+     * Gets the data set this command affects.
+     * @return The data set. May be <code>null</code> if no layer was set and no edit layer was found.
+     * @since 10467
+     */
+    public DataSet getAffectedDataSet() {
+        return layer == null ? null : layer.data;
     }
 

trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java

@@ -59 +59 @@
         //
         for (Node n:mergedNodeList) {
-            if (!getLayer().data.getNodes().contains(n)) {
+            if (!getAffectedDataSet().getNodes().contains(n)) {
                 Main.warn(tr("Main dataset does not include node {0}", n.toString()));
             }