Changeset 14662 in josm for trunk/src/org

Timestamp:

2019-01-07T19:46:32+01:00 (6 years ago)

Author:

simon04

Message:

see #16874 fix #17180 - NPE in UnGlueAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UnGlueAction.java (modified) (4 diffs)
• gui/dialogs/PropertiesMembershipChoiceDialog.java (modified) (2 diffs)

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

@@ -178 +178 @@
 
     static void update(PropertiesMembershipChoiceDialog dialog, Node existingNode, List<Node> newNodes, Collection<Command> cmds) {
-        updateMemberships(dialog.getMemberships(), existingNode, newNodes, cmds);
-        updateProperties(dialog.getTags(), existingNode, newNodes, cmds);
+        updateMemberships(dialog.getMemberships().orElse(null), existingNode, newNodes, cmds);
+        updateProperties(dialog.getTags().orElse(null), existingNode, newNodes, cmds);
     }
 
@@ -213 +213 @@
         List<Command> cmds = new LinkedList<>();
         cmds.add(new AddCommand(selectedNode.getDataSet(), unglued));
-        if (dialog != null && ExistingBothNew.NEW.equals(dialog.getTags())) {
+        if (dialog != null && ExistingBothNew.NEW.equals(dialog.getTags().orElse(null))) {
             // unglued node gets the ID and history, thus replace way node with a fresh one
             final Way way = selectedNode.getParentWays().get(0);
@@ -219 +219 @@
             newWayNodes.replaceAll(n -> selectedNode.equals(n) ? unglued : n);
             cmds.add(new ChangeNodesCommand(way, newWayNodes));
-            updateMemberships(dialog.getMemberships().opposite(), selectedNode, Collections.singletonList(unglued), cmds);
-            updateProperties(dialog.getTags().opposite(), selectedNode, Collections.singletonList(unglued), cmds);
+            updateMemberships(dialog.getMemberships().map(ExistingBothNew::opposite).orElse(null),
+                    selectedNode, Collections.singletonList(unglued), cmds);
+            updateProperties(dialog.getTags().map(ExistingBothNew::opposite).orElse(null),
+                    selectedNode, Collections.singletonList(unglued), cmds);
             moveSelectedNode = true;
         } else if (dialog != null) {
@@ -386 +388 @@
      */
     private static void updateMemberships(ExistingBothNew memberships, Node originalNode, List<Node> newNodes, Collection<Command> cmds) {
-        if (ExistingBothNew.OLD.equals(memberships)) {
+        if (memberships == null || ExistingBothNew.OLD.equals(memberships)) {
             return;
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesMembershipChoiceDialog.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.swing.AbstractButton;
@@ -113 +114 @@
     /**
      * Returns the tags choice.
-     * @return the tags choice (can be null)
+     * @return the tags choice
      */
-    public ExistingBothNew getTags() {
-        return tags.getSelected();
+    public Optional<ExistingBothNew> getTags() {
+        return Optional.ofNullable(tags).map(ExistingBothNewChoice::getSelected);
     }
 
     /**
      * Returns the memberships choice.
-     * @return the memberships choice (can be null)
+     * @return the memberships choice
      */
-    public ExistingBothNew getMemberships() {
-        return memberships.getSelected();
+    public Optional<ExistingBothNew> getMemberships() {
+        return Optional.ofNullable(memberships).map(ExistingBothNewChoice::getSelected);
     }