Changeset 9993 in josm for trunk/src

Timestamp:

2016-03-14T20:28:28+01:00 (8 years ago)

Author:

simon04

Message:

fix #12617 - Unexpected deletion of members by drag-n-drop in relation editor

Location:

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

Files:

• MemberTableModel.java (modified) (2 diffs)
• MemberTransferHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -460 +460 @@
     }
 
-    void addMembersAtIndex(final Iterable<RelationMember> newMembers, final int index) {
+    void addMembersAtIndexKeepingOldSelection(final Iterable<RelationMember> newMembers, final int index) {
         int idx = index;
         for (RelationMember member : newMembers) {
@@ -466 +466 @@
         }
         invalidateConnectionType();
+        final List<Integer> selection = getSelectedIndices();
         fireTableRowsInserted(index, idx - 1);
+        setSelectedMembersIdx(selection);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java

@@ -107 +107 @@
             }
         }
-        destination.getMemberTableModel().addMembersAtIndex(membersToAdd, insertRow);
+        destination.getMemberTableModel().addMembersAtIndexKeepingOldSelection(membersToAdd, insertRow);
     }