Changeset 14662 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesMembershipChoiceDialog.java

Timestamp:

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

Author:

simon04

Message:

see #16874 fix #17180 - NPE in UnGlueAction

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesMembershipChoiceDialog.java (modified) (2 diffs)

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);
     }