Changeset 4380 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-08-29T09:46:27+02:00 (13 years ago)

Author:

simon04

Message:

fix #4609 - copy node coordinate to clipboard

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (3 diffs)
• download/BoundingBoxSelection.java (modified) (5 diffs)
• download/DownloadDialog.java (modified) (4 diffs)
• widgets/BoundingBoxSelectionPanel.java (modified) (4 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.actions.CopyCoordinatesAction;
 import org.openstreetmap.josm.actions.CreateCircleAction;
 import org.openstreetmap.josm.actions.CreateMultipolygonAction;
@@ -125 +126 @@
     public final RedoAction redo = new RedoAction();
     public final JosmAction copy = new CopyAction();
+    public final JosmAction copyCoordinates = new CopyCoordinatesAction();
     public final PasteAction paste = new PasteAction();
     public final JosmAction pasteTags = new PasteTagsAction();
@@ -257 +259 @@
         editMenu.addSeparator();
         add(editMenu, copy);
+        add(editMenu, copyCoordinates);
         add(editMenu, paste);
         add(editMenu, pasteTags);

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -8 +8 @@
 import java.awt.GridBagLayout;
 import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.FlavorEvent;
 import java.awt.datatransfer.FlavorListener;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -19 +16 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
 
 import javax.swing.AbstractAction;
@@ -40 +36 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -306 +303 @@
         }
 
-        protected String getClipboardContent() {
-            Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
-            try {
-                if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-                    String text = (String)t.getTransferData(DataFlavor.stringFlavor);
-                    return text;
-                }
-            } catch (UnsupportedFlavorException ex) {
-                ex.printStackTrace();
-                return null;
-            } catch (IOException ex) {
-                ex.printStackTrace();
-                return null;
-            }
-            return null;
-        }
-
         public void actionPerformed(ActionEvent e) {
-            String content = getClipboardContent();
+            String content = Utils.getClipboardContent();
             if (content != null) {
                 tfOsmUrl.setText(content);
@@ -331 +311 @@
 
         protected void updateEnabledState() {
-            setEnabled(getClipboardContent() != null);
+            setEnabled(Utils.getClipboardContent() != null);
         }
 

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -13 +13 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
@@ -44 +41 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -183 +181 @@
         getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                checkClipboardContents();
+                String clip = Utils.getClipboardContent();
+                if (clip == null) {
+                    return;
+                }
+                Bounds b = OsmUrlToBounds.parse(clip);
+                if (b != null) {
+                    boundingBoxChanged(new Bounds(b), null);
+                }
             }
         });
@@ -189 +194 @@
         addWindowListener(new WindowEventHandler());
         restoreSettings();
-    }
-
-    private void checkClipboardContents() {
-        String result = "";
-        Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
-
-        if(contents == null || !contents.isDataFlavorSupported(DataFlavor.stringFlavor))
-            return;
-
-        try {
-            result = (String)contents.getTransferData(DataFlavor.stringFlavor);
-        }
-        catch(Exception ex) {
-            return;
-        }
-
-        Bounds b = OsmUrlToBounds.parse(result);
-        if (b != null) {
-            boundingBoxChanged(new Bounds(b),null);
-        }
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

@@ -9 +9 @@
 import java.awt.Insets;
 import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.FlavorEvent;
 import java.awt.datatransfer.FlavorListener;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
 
 import javax.swing.AbstractAction;
@@ -35 +31 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -237 +234 @@
         }
 
-        protected String getClipboardContent() {
-            Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
-            try {
-                if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-                    String text = (String)t.getTransferData(DataFlavor.stringFlavor);
-                    return text;
-                }
-            } catch (UnsupportedFlavorException ex) {
-                ex.printStackTrace();
-                return null;
-            } catch (IOException ex) {
-                ex.printStackTrace();
-                return null;
-            }
-            return null;
-        }
-
         public void actionPerformed(ActionEvent e) {
-            String content = getClipboardContent();
+            String content = Utils.getClipboardContent();
             if (content != null) {
                 tfOsmUrl.setText(content);
@@ -262 +242 @@
 
         protected void updateEnabledState() {
-            setEnabled(getClipboardContent() != null);
+            setEnabled(Utils.getClipboardContent() != null);
         }