Changeset 10605 in josm for trunk/src

Timestamp:

2016-07-23T15:15:14+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12478 - Use ​Swing Copy/Paste instead of CopyAction/PasteAction with custom buffer (layer part: patch by michael2402, modified) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/CopyAction.java (modified) (3 diffs)
• gui/datatransfer/LayerTransferable.java (added)
• gui/datatransfer/PrimitiveTransferable.java (modified) (5 diffs)
• gui/datatransfer/SingleLayerTransferable.java (added)
• gui/datatransfer/data/LayerTransferData.java (added)
• gui/datatransfer/data/OsmLayerTransferData.java (added)
• gui/dialogs/LayerListDialog.java (modified) (5 diffs)
• gui/dialogs/layer/DuplicateAction.java (modified) (3 diffs)
• gui/dialogs/layer/LayerListTransferHandler.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -85 +85 @@
 import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
+import org.openstreetmap.josm.gui.datatransfer.data.OsmLayerTransferData;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;

trunk/src/org/openstreetmap/josm/actions/CopyAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -48 +49 @@
         }
 
-        copy(selection);
+        copy(getLayerManager().getEditLayer(), selection);
     }
 
@@ -54 +55 @@
      * Copies the given primitive ids to the clipboard. The output by this function
      * looks similar to: node 1089302677,node 1089303458,way 93793372
+     * @param source The OSM data layer source
      * @param primitives The OSM primitives to copy
      */
-    public static void copy(Collection<OsmPrimitive> primitives) {
+    public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
         // copy ids to the clipboard
-        ClipboardUtils.copy(new PrimitiveTransferable(PrimitiveTransferData.getDataWithReferences(primitives)));
+        ClipboardUtils.copy(new PrimitiveTransferable(PrimitiveTransferData.getDataWithReferences(primitives), source));
     }
 

trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.gui.datatransfer.data.OsmLayerTransferData;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.datatransfer.data.TagTransferData;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -27 +29 @@
             TagTransferData.FLAVOR, DataFlavor.stringFlavor);
     private final PrimitiveTransferData primitives;
+    private OsmDataLayer sourceLayer;
 
     /**
@@ -33 +36 @@
      */
     public PrimitiveTransferable(PrimitiveTransferData primitives) {
+        this(primitives, null);
+    }
+
+    /**
+     * Constructs a new {@code PrimitiveTransferable}.
+     * @param primitives collection of OSM primitives
+     * @param sourceLayer The layer the primitives are copied from
+     */
+    public PrimitiveTransferable(PrimitiveTransferData primitives, OsmDataLayer sourceLayer) {
         this.primitives = primitives;
+        this.sourceLayer = sourceLayer;
     }
 
@@ -39 +52 @@
     public DataFlavor[] getTransferDataFlavors() {
         ArrayList<DataFlavor> flavors = new ArrayList<>(PRIMITIVE_FLAVORS);
+        if (sourceLayer != null) {
+            flavors.addAll(OsmLayerTransferData.FLAVORS);
+        }
         return flavors.toArray(new DataFlavor[flavors.size()]);
     }
@@ -61 +77 @@
         } else if (TagTransferData.FLAVOR.equals(flavor)) {
             return new TagTransferData(primitives.getDirectlyAdded());
+        } else if (sourceLayer != null && OsmLayerTransferData.FLAVORS.contains(flavor)) {
+            return new OsmLayerTransferData(null, sourceLayer);
         } else {
             throw new UnsupportedFlavorException(flavor);

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

@@ -25 +25 @@
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultListSelectionModel;
+import javax.swing.DropMode;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
@@ -52 +53 @@
 import org.openstreetmap.josm.gui.dialogs.layer.DeleteLayerAction;
 import org.openstreetmap.josm.gui.dialogs.layer.DuplicateAction;
+import org.openstreetmap.josm.gui.dialogs.layer.LayerListTransferHandler;
 import org.openstreetmap.josm.gui.dialogs.layer.LayerVisibilityAction;
 import org.openstreetmap.josm.gui.dialogs.layer.MergeAction;
@@ -1104 +1106 @@
         @Override
         public void layerOrderChanged(LayerOrderChangeEvent e) {
-            // ignored for now, since only we change layer order.
+            fireTableDataChanged();
         }
 
@@ -1130 +1132 @@
             super(dataModel);
             dataModel.setLayerList(this);
+            setDragEnabled(true);
+            setDropMode(DropMode.INSERT_ROWS);
+            setTransferHandler(new LayerListTransferHandler());
         }
 
@@ -1141 +1146 @@
             viewport.scrollRectToVisible(rect);
         }
+
+        @Override
+        public LayerListModel getModel() {
+            return (LayerListModel) super.getModel();
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.swing.AbstractAction;
@@ -21 +19 @@
 
 /**
- * The action to merge the currently selected layer into another layer.
+ * The action to dupplicate the given selected layer into another layer.
  */
 public final class DuplicateAction extends AbstractAction implements IEnabledStateUpdating {
@@ -53 +51 @@
     }
 
-    private void duplicate(Layer layer) {
-        if (!Main.isDisplayingMapView())
-            return;
-
-        List<String> layerNames = new ArrayList<>();
-        for (Layer l: Main.getLayerManager().getLayers()) {
-            layerNames.add(l.getName());
-        }
+    private static void duplicate(Layer layer) {
         if (layer instanceof OsmDataLayer) {
+            String newName = LayerListTransferHandler.suggestNewLayerName(layer.getName(), Main.getLayerManager().getLayers());
             OsmDataLayer oldLayer = (OsmDataLayer) layer;
-            // Translators: "Copy of {layer name}"
-            String newName = tr("Copy of {0}", oldLayer.getName());
-            int i = 2;
-            while (layerNames.contains(newName)) {
-                // Translators: "Copy {number} of {layer name}"
-                newName = tr("Copy {1} of {0}", oldLayer.getName(), i);
-                i++;
-            }
             Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(oldLayer.data), newName, null));
         }