Changeset 10881 in josm for trunk/src

Timestamp:

2016-08-23T22:54:08+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13430 - Allow paste of OSM links (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• GettingStarted.java (modified) (2 diffs)
• datatransfer/AbstractStackTransferHandler.java (added)
• datatransfer/FileTransferHandler.java (deleted)
• datatransfer/OpenTransferHandler.java (added)
• datatransfer/OsmTransferHandler.java (modified) (3 diffs)
• datatransfer/importers/AbstractOsmDataPaster.java (modified) (1 diff)
• datatransfer/importers/OsmLinkPaster.java (added)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.gui.datatransfer.FileTransferHandler;
+import org.openstreetmap.josm.gui.datatransfer.OpenTransferHandler;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
@@ -133 +133 @@
         getMOTD();
 
-        setTransferHandler(new FileTransferHandler());
+        setTransferHandler(new OpenTransferHandler());
     }
 

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

@@ -9 +9 @@
 import java.util.Collection;
 
-import javax.swing.TransferHandler;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -16 +14 @@
 import org.openstreetmap.josm.gui.datatransfer.importers.AbstractOsmDataPaster;
 import org.openstreetmap.josm.gui.datatransfer.importers.FilePaster;
+import org.openstreetmap.josm.gui.datatransfer.importers.OsmLinkPaster;
 import org.openstreetmap.josm.gui.datatransfer.importers.PrimitiveDataPaster;
 import org.openstreetmap.josm.gui.datatransfer.importers.PrimitiveTagTransferPaster;
@@ -27 +26 @@
  * @since 10604
  */
-public class OsmTransferHandler extends TransferHandler {
+public class OsmTransferHandler extends AbstractStackTransferHandler {
 
     private static final Collection<AbstractOsmDataPaster> SUPPORTED = Arrays.asList(
             new FilePaster(), new PrimitiveDataPaster(),
             new PrimitiveTagTransferPaster(),
-            new TagTransferPaster(), new TextTagPaster());
+            new TagTransferPaster(), new OsmLinkPaster(), new TextTagPaster());
 
     @Override
-    public boolean canImport(TransferSupport support) {
-        // import everything for now, only support copy.
-        for (AbstractOsmDataPaster df : SUPPORTED) {
-            if (df.supports(support)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean importData(TransferSupport support) {
-        return importData(support, Main.getLayerManager().getEditLayer(), null);
-    }
-
-    private boolean importData(TransferSupport support, OsmDataLayer layer, EastNorth center) {
-        for (AbstractOsmDataPaster df : SUPPORTED) {
-            if (df.supports(support)) {
-                try {
-                    if (df.importData(support, layer, center)) {
-                        return true;
-                    }
-                } catch (UnsupportedFlavorException | IOException e) {
-                    Main.warn(e);
-                }
-            }
-        }
-        return super.importData(support);
+    protected Collection<AbstractOsmDataPaster> getSupportedPasters() {
+        return SUPPORTED;
     }
 

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractOsmDataPaster.java

@@ -57 +57 @@
      * Attempts to import the given transfer data.
      * @param support The transfer support to import from.
-     * @param layer The layer to paste at.
+     * @param layer The layer to paste at. May be null.
      * @param pasteAt The position to paste at.
      * @return <code>true</code> if the import was successful.