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

Timestamp:

2016-07-24T12:09:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13196 - remove FileDrop class (patch my michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• FileDrop.java (deleted)
• GettingStarted.java (modified) (4 diffs)
• datatransfer/FileTransferHandler.java (added)

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

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
-import java.awt.GraphicsEnvironment;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -25 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.datatransfer.FileTransferHandler;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
@@ -125 +125 @@
         // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM
         lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none");
+        lg.setTransferHandler(null);
 
         JScrollPane scroller = new JScrollPane(lg);
@@ -132 +133 @@
         getMOTD();
 
-        if (!GraphicsEnvironment.isHeadless()) {
-            new FileDrop(scroller);
-        }
+        setTransferHandler(new FileTransferHandler());
     }