Changeset 14650 in josm for trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

Timestamp:

2019-01-06T12:11:10+01:00 (5 years ago)

Author:

simon04

Message:

Extract PropertiesMembershipChoiceDialog.ExistingBothNew enum

File:

• trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (4 diffs)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.PropertiesMembershipChoiceDialog;
-import org.openstreetmap.josm.gui.dialogs.PropertiesMembershipChoiceDialog.ExistingBothNewChoice;
+import org.openstreetmap.josm.gui.dialogs.PropertiesMembershipChoiceDialog.ExistingBothNew;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -180 +180 @@
     }
 
-    private static void updateProperties(ExistingBothNewChoice tags, Node existingNode, Iterable<Node> newNodes, Collection<Command> cmds) {
-        if (tags != null && tags.newNode.isSelected()) {
+    private static void updateProperties(ExistingBothNew tags, Node existingNode, Iterable<Node> newNodes, Collection<Command> cmds) {
+        if (ExistingBothNew.NEW.equals(tags)) {
             final Node newSelectedNode = new Node(existingNode);
             newSelectedNode.removeAll();
             cmds.add(new ChangeCommand(existingNode, newSelectedNode));
-        } else if (tags != null && tags.oldNode.isSelected()) {
+        } else if (ExistingBothNew.OLD.equals(tags)) {
             for (Node newNode : newNodes) {
                 newNode.removeAll();
@@ -192 +192 @@
     }
 
-    private static void updateMemberships(ExistingBothNewChoice memberships, Node existingNode, List<Node> newNodes, Collection<Command> cmds) {
-        if (memberships != null && memberships.bothNodes.isSelected()) {
+    private static void updateMemberships(ExistingBothNew memberships, Node existingNode, List<Node> newNodes, Collection<Command> cmds) {
+        if (ExistingBothNew.BOTH.equals(memberships)) {
             fixRelations(existingNode, cmds, newNodes, false);
-        } else if (memberships != null && memberships.newNode.isSelected()) {
+        } else if (ExistingBothNew.NEW.equals(memberships)) {
             fixRelations(existingNode, cmds, newNodes, true);
         }
@@ -203 +203 @@
      * Assumes there is one tagged Node stored in selectedNode that it will try to unglue.
      * (i.e. copy node and remove all tags from the old one. Relations will not be removed)
-     * @param e event that trigerred the action
+     * @param e event that triggered the action
      */
     private void unglueOneNodeAtMostOneWay(ActionEvent e) {