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

Timestamp:

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

Author:

simon04

Message:

see #12300 - Allow to drag from select list to relation members

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• datatransfer/PrimitiveTransferable.java (added)
• dialogs/SelectionListDialog.java (modified) (5 diffs)
• dialogs/relation/MemberTableModel.java (modified) (2 diffs)
• dialogs/relation/MemberTransferHandler.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.Rectangle;
+import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -24 +25 @@
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListSelectionModel;
+import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.ListSelectionModel;
+import javax.swing.TransferHandler;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
@@ -66 +69 @@
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -108 +112 @@
         lstPrimitives.setSelectionModel(selectionModel);
         lstPrimitives.setCellRenderer(new OsmPrimitivRenderer());
-        // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
-        lstPrimitives.setTransferHandler(null);
+        lstPrimitives.setTransferHandler(new SelectionTransferHandler());
+        lstPrimitives.setDragEnabled(true);
 
         lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
@@ -855 +859 @@
         }
     }
+
+    /**
+     * A transfer handler class for drag-and-drop support.
+     */
+    protected class SelectionTransferHandler extends TransferHandler {
+
+        @Override
+        public int getSourceActions(JComponent c) {
+            return COPY;
+        }
+
+        @Override
+        protected Transferable createTransferable(JComponent c) {
+            return new PrimitiveTransferable(getSelectedPrimitives());
+        }
+    }
 }

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

@@ -423 +423 @@
 
     private void addMembersAtIndex(List<? extends OsmPrimitive> primitives, int index) {
-        final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(EnumSet.of(TaggingPresetType.RELATION),
-                presetHandler.getSelection().iterator().next().getKeys(), false);
         if (primitives == null)
             return;
         int idx = index;
         for (OsmPrimitive primitive : primitives) {
-            Set<String> potentialRoles = new TreeSet<>();
-            for (TaggingPreset tp : presets) {
-                String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive);
-                if (suggestedRole != null) {
-                    potentialRoles.add(suggestedRole);
-                }
-            }
-            // TODO: propose user to choose role among potential ones instead of picking first one
-            final String role = potentialRoles.isEmpty() ? null : potentialRoles.iterator().next();
-            RelationMember member = new RelationMember(role == null ? "" : role, primitive);
+            final RelationMember member = getRelationMemberForPrimitive(primitive);
             members.add(idx++, member);
         }
@@ -445 +434 @@
         getSelectionModel().addSelectionInterval(index, index + primitives.size() - 1);
         fireMakeMemberVisible(index);
+    }
+
+    RelationMember getRelationMemberForPrimitive(final OsmPrimitive primitive) {
+        final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(EnumSet.of(TaggingPresetType.RELATION),
+                presetHandler.getSelection().iterator().next().getKeys(), false);
+        Collection<String> potentialRoles = new TreeSet<>();
+        for (TaggingPreset tp : presets) {
+            String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive);
+            if (suggestedRole != null) {
+                potentialRoles.add(suggestedRole);
+            }
+        }
+        // TODO: propose user to choose role among potential ones instead of picking first one
+        final String role = potentialRoles.isEmpty() ? "" : potentialRoles.iterator().next();
+        return new RelationMember(role == null ? "" : role, primitive);
     }
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
+import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.datatransfer.RelationMemberTransferable;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 class MemberTransferHandler extends TransferHandler {
@@ -36 +39 @@
     public boolean canImport(TransferSupport support) {
         support.setShowDropLocation(true);
-        return support.isDataFlavorSupported(RelationMemberTransferable.RELATION_MEMBER_DATA);
+        return support.isDataFlavorSupported(RelationMemberTransferable.RELATION_MEMBER_DATA)
+                || support.isDataFlavorSupported(PrimitiveTransferable.PRIMITIVE_DATA);
     }
 
     @Override
     public boolean importData(TransferSupport support) {
+        final MemberTable destination = (MemberTable) support.getComponent();
         final int insertRow = ((JTable.DropLocation) support.getDropLocation()).getRow();
-        final Collection<RelationMemberData> memberData;
+
         try {
-            //noinspection unchecked
-            memberData = (Collection<RelationMemberData>) support.getTransferable().getTransferData(RelationMemberTransferable.RELATION_MEMBER_DATA);
-        } catch (UnsupportedFlavorException | IOException e) {
+            if (support.isDataFlavorSupported(RelationMemberTransferable.RELATION_MEMBER_DATA)) {
+                importRelationMemberData(support, destination, insertRow);
+            } else if (support.isDataFlavorSupported(PrimitiveTransferable.PRIMITIVE_DATA)) {
+                importPrimitiveData(support, destination, insertRow);
+            }
+        } catch (Exception e) {
             Main.warn(e);
             return false;
         }
-        final MemberTable destination = (MemberTable) support.getComponent();
 
-        try {
-            importRelationMemberData(memberData, destination, insertRow);
-        } catch (Exception e) {
-            Main.warn(e);
-            throw e;
-        }
         return true;
     }
 
-    protected void importRelationMemberData(Collection<RelationMemberData> memberData, MemberTable destination, int insertRow) {
+    protected void importRelationMemberData(TransferSupport support, final MemberTable destination, int insertRow)
+            throws UnsupportedFlavorException, IOException {
+        //noinspection unchecked
+        final Collection<RelationMemberData> memberData = (Collection<RelationMemberData>)
+                support.getTransferable().getTransferData(RelationMemberTransferable.RELATION_MEMBER_DATA);
+        importData(destination, insertRow, memberData, new Function<RelationMemberData, RelationMember>() {
+            @Override
+            public RelationMember apply(RelationMemberData member) {
+                final OsmPrimitive p = destination.getLayer().data.getPrimitiveById(member.getUniqueId(), member.getType());
+                if (p == null) {
+                    Main.warn(tr("Cannot add {0} since it is not part of dataset", member));
+                    return null;
+                } else {
+                    return new RelationMember(member.getRole(), p);
+                }
+            }
+        });
+    }
+
+    protected void importPrimitiveData(TransferSupport support, final MemberTable destination, int insertRow)
+            throws UnsupportedFlavorException, IOException {
+        //noinspection unchecked
+        final Collection<PrimitiveData> data = (Collection<PrimitiveData>)
+                support.getTransferable().getTransferData(PrimitiveTransferable.PRIMITIVE_DATA);
+        importData(destination, insertRow, data, new Function<PrimitiveData, RelationMember>() {
+            @Override
+            public RelationMember apply(PrimitiveData data) {
+                final OsmPrimitive p = destination.getLayer().data.getPrimitiveById(data);
+                if (p == null) {
+                    Main.warn(tr("Cannot add {0} since it is not part of dataset", data));
+                    return null;
+                } else {
+                    return destination.getMemberTableModel().getRelationMemberForPrimitive(p);
+                }
+            }
+        });
+    }
+
+    protected <T> void importData(MemberTable destination, int insertRow, Collection<T> memberData, Function<T, RelationMember> toMemberFunction) {
         final Collection<RelationMember> membersToAdd = new ArrayList<>(memberData.size());
-        for (RelationMemberData member : memberData) {
-            final OsmPrimitive p = destination.getLayer().data.getPrimitiveById(member.getUniqueId(), member.getType());
-            if (p != null) {
-                membersToAdd.add(new RelationMember(member.getRole(), p));
-            } else {
-                Main.warn(tr("Cannot add {0} since it is not part of dataset", member));
+        for (T i : memberData) {
+            final RelationMember member = toMemberFunction.apply(i);
+            if (member != null) {
+                membersToAdd.add(member);
             }
         }