Changeset 16549 in josm for trunk/src/org

Timestamp:

2020-06-07T12:37:32+02:00 (4 years ago)

Author:

simon04

Message:

fix #16255 - Possibility to edit relation roles from the membership dialog

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Files:

• PropertiesDialog.java (modified) (5 diffs)
• RelationRoleEditor.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -17 +17 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -23 +24 @@
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
@@ -673 +673 @@
                 if (ref instanceof IRelation && !ref.isIncomplete() && !ref.isDeleted()) {
                     IRelation<?> r = (IRelation<?>) ref;
-                    MemberInfo mi = Optional.ofNullable(roles.get(r)).orElseGet(() -> new MemberInfo(newSel));
-                    roles.put(r, mi);
+                    MemberInfo mi = roles.computeIfAbsent(r, ignore -> new MemberInfo(newSel));
                     int i = 1;
                     for (IRelationMember<?> m : r.getMembers()) {
@@ -975 +974 @@
             } else if (e.getSource() == membershipTable) {
                 int row = membershipTable.rowAtPoint(e.getPoint());
-                if (row > -1) {
+                int col = membershipTable.columnAtPoint(e.getPoint());
+                if (row > -1 && col == 1) {
+                    final Relation relation = (Relation) membershipData.getValueAt(row, 0);
+                    final MemberInfo memberInfo = (MemberInfo) membershipData.getValueAt(row, 1);
+                    RelationRoleEditor.editRole(relation, memberInfo);
+                } else if (row > -1) {
                     editMembership(row);
                 }
@@ -1024 +1028 @@
             }
             return Utils.shortenString(positionString, 20);
+        }
+
+        List<IRelationMember<?>> getRole() {
+            return Collections.unmodifiableList(role);
         }