Changeset 15013 in josm

Timestamp:

2019-04-22T15:00:55+02:00 (6 years ago)

Author:

Don-vip

Message:

remove duplicated code

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/command/AbstractNodesCommand.java (added)
• src/org/openstreetmap/josm/command/ChangeNodesCommand.java (modified) (5 diffs)
• src/org/openstreetmap/josm/command/RemoveNodesCommand.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

@@ -10 +10 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -89 +90 @@
 
         // I'm sure there's a better way to handle this
-        UndoRedoHandler.getInstance().add(new RemoveNodesCommand(selectedWay, selectedNodes));
+        UndoRedoHandler.getInstance().add(
+                new RemoveNodesCommand(selectedWay, new HashSet<>(selectedNodes)));
     }
 

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
-
-import javax.swing.Icon;
 
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -22 +15 @@
  * The same can be done with ChangeCommand, but this is more
  * efficient. (Needed for the duplicate node fixing
- * tool of the validator plugin, when processing large data sets.)
+ * tool of the validator, when processing large data sets.)
  *
  * @author Imi
  */
-public class ChangeNodesCommand extends Command {
-
-    private final Way way;
-    private final List<Node> newNodes;
+public class ChangeNodesCommand extends AbstractNodesCommand<List<Node>> {
 
     /**
@@ -37 +27 @@
      */
     public ChangeNodesCommand(Way way, List<Node> newNodes) {
-        this(way.getDataSet(), way, newNodes);
+        super(way.getDataSet(), way, newNodes);
     }
 
@@ -48 +38 @@
      */
     public ChangeNodesCommand(DataSet ds, Way way, List<Node> newNodes) {
-        super(ds);
-        this.way = way;
-        this.newNodes = newNodes;
-        if (newNodes.isEmpty()) {
-            throw new IllegalArgumentException("Cannot set nodes to be an empty list.");
-        }
+        super(ds, way, newNodes);
     }
 
     @Override
-    public boolean executeCommand() {
-        super.executeCommand();
-        way.setNodes(newNodes);
-        way.setModified(true);
-        return true;
-    }
-
-    @Override
-    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        modified.add(way);
+    public void modifyWay() {
+        way.setNodes(cmdNodes);
     }
 
@@ -73 +50 @@
         return tr("Change nodes of {0}", way.getDisplayName(DefaultNameFormatter.getInstance()));
     }
-
-    @Override
-    public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.WAY);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), way, newNodes);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        if (!super.equals(obj)) return false;
-        ChangeNodesCommand that = (ChangeNodesCommand) obj;
-        return Objects.equals(way, that.way) &&
-                Objects.equals(newNodes, that.newNodes);
-    }
 }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
-import javax.swing.Icon;
-
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -26 +20 @@
  * @author Giuseppe Bilotta
  */
-public class RemoveNodesCommand extends Command {
-
-    private final Way way;
-    private final Set<Node> rmNodes;
+public class RemoveNodesCommand extends AbstractNodesCommand<Set<Node>> {
 
     /**
@@ -35 +26 @@
      * @param way The way to modify. Must not be null, and belong to a data set
      * @param rmNodes The list of nodes to remove
+     * @deprecated Use {@link #RemoveNodesCommand(Way, Set)}
      */
+    @Deprecated
     public RemoveNodesCommand(Way way, List<Node> rmNodes) {
-        super(way.getDataSet());
-        this.way = way;
-        this.rmNodes = new HashSet<>(rmNodes);
+        super(way.getDataSet(), way, new HashSet<>(rmNodes));
+    }
+
+    /**
+     * Constructs a new {@code RemoveNodesCommand}.
+     * @param way The way to modify. Must not be null, and belong to a data set
+     * @param rmNodes The set of nodes to remove
+     * @since xxx
+     */
+    public RemoveNodesCommand(Way way, Set<Node> rmNodes) {
+        super(way.getDataSet(), way, rmNodes);
+    }
+
+    /**
+     * Constructs a new {@code RemoveNodesCommand}.
+     * @param ds The target data set. Must not be {@code null}
+     * @param way The way to modify. Must not be null, and belong to a data set
+     * @param rmNodes The list of nodes to remove
+     * @since 15013
+     */
+    public RemoveNodesCommand(DataSet ds, Way way, Set<Node> rmNodes) {
+        super(ds, way, rmNodes);
     }
 
     @Override
-    public boolean executeCommand() {
-        super.executeCommand();
-        way.removeNodes(rmNodes);
-        way.setModified(true);
-        return true;
-    }
-
-    @Override
-    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        modified.add(way);
+    protected void modifyWay() {
+        way.removeNodes(cmdNodes);
     }
 
@@ -59 +63 @@
         return tr("Removed nodes from {0}", way.getDisplayName(DefaultNameFormatter.getInstance()));
     }
-
-    @Override
-    public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.WAY);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), way, rmNodes);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        if (!super.equals(obj)) return false;
-        RemoveNodesCommand that = (RemoveNodesCommand) obj;
-        return Objects.equals(way, that.way) &&
-                Objects.equals(rmNodes, that.rmNodes);
-    }
 }

trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java

@@ -52 +52 @@
     public void testExecute() {
         RemoveNodesCommand command = new RemoveNodesCommand(testData.existingWay,
-                Collections.singletonList(testData.existingNode));
+                Collections.singleton(testData.existingNode));
 
         command.executeCommand();
@@ -67 +67 @@
     public void testUndo() {
         RemoveNodesCommand command = new RemoveNodesCommand(testData.existingWay,
-                Collections.singletonList(testData.existingNode));
+                Collections.singleton(testData.existingNode));
 
         command.executeCommand();
@@ -92 +92 @@
         ArrayList<OsmPrimitive> added = new ArrayList<>();
         RemoveNodesCommand command = new RemoveNodesCommand(testData.existingWay,
-                Collections.singletonList(testData.existingNode));
+                Collections.singleton(testData.existingNode));
         command.fillModifiedData(modified, deleted, added);
         assertArrayEquals(new Object[] {testData.existingWay }, modified.toArray());
@@ -105 +105 @@
     public void testGetParticipatingPrimitives() {
         RemoveNodesCommand command = new RemoveNodesCommand(testData.existingWay,
-                Collections.singletonList(testData.existingNode));
+                Collections.singleton(testData.existingNode));
         command.executeCommand();
         assertArrayEquals(new Object[] {testData.existingWay }, command.getParticipatingPrimitives().toArray());
@@ -115 +115 @@
     @Test
     public void testDescription() {
-        assertTrue(new RemoveNodesCommand(testData.existingWay, Collections.singletonList(testData.existingNode))
+        assertTrue(new RemoveNodesCommand(testData.existingWay, Collections.singleton(testData.existingNode))
                 .getDescriptionText().matches("Removed nodes from .*"));
     }

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

@@ -280 +280 @@
      */
     @Test
-    public void testvalidateUploadTag() {
+    public void testValidateUploadTag() {
         doTestValidateUploadTag("upload.comment");
         doTestValidateUploadTag("upload.source");