Changeset 9368 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-01-09T22:20:46+01:00 (8 years ago)

Author:

simon04

Message:

see #12300 - Drag and Drop support for relation member list reordering

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• datatransfer (added)
• datatransfer/RelationMemberTransferable.java (added)
• dialogs/relation/MemberTable.java (modified) (2 diffs)
• dialogs/relation/MemberTableModel.java (modified) (1 diff)
• dialogs/relation/MemberTransferHandler.java (added)

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

@@ -15 +15 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.DropMode;
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -83 +84 @@
         getActionMap().put("selectNextColumnCell", new SelectNextColumnCellAction());
         getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
+
+        setTransferHandler(new MemberTransferHandler());
+        setFillsViewportHeight(true); // allow drop on empty table
+        setDragEnabled(true);
+        setDropMode(DropMode.INSERT_ROWS);
     }
 

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

@@ -447 +447 @@
     }
 
+    void addMembersAtIndex(final Iterable<RelationMember> newMembers, final int index) {
+        int idx = index;
+        for (RelationMember member : newMembers) {
+            members.add(idx++, member);
+        }
+        fireTableRowsInserted(index, idx - 1);
+    }
+
     public void addMembersAtBeginning(List<? extends OsmPrimitive> primitives) {
         addMembersAtIndex(primitives, 0);