Changeset 10604 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-23T14:54:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12478, fix #12565, fix #11114 - Use ​Swing Copy/Paste instead of CopyAction/PasteAction with custom buffer (patch by michael2402, modified) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• TextTagParser.java (modified) (3 diffs)
• Utils.java (modified) (5 diffs)
• bugreport/DebugTextDisplay.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
@@ -291 +292 @@
         if (r == 0) r = 2;
         // clean clipboard if user asked
-        if (r == 3) Utils.copyToClipboard("");
+        if (r == 3) ClipboardUtils.copyString("");
         return r;
     }
@@ -326 +327 @@
         int r = ed.getValue();
         // clean clipboard if user asked
-        if (r == 2) Utils.copyToClipboard("");
+        if (r == 2) ClipboardUtils.copyString("");
     }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -8 +8 @@
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.HeadlessException;
-import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
@@ -73 +67 @@
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -645 +640 @@
      * @param s string to be copied to clipboard.
      * @return true if succeeded, false otherwise.
-     */
+     * @deprecated Use {@link ClipboardUtils#copyString(String)}. To be removed end of 2016.
+     */
+    @Deprecated
     public static boolean copyToClipboard(String s) {
-        try {
-            Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(s), new ClipboardOwner() {
-                @Override
-                public void lostOwnership(Clipboard clpbrd, Transferable t) {
-                    // Do nothing
-                }
-            });
-            return true;
-        } catch (IllegalStateException | HeadlessException ex) {
-            Main.error(ex);
-            return false;
-        }
+        return ClipboardUtils.copyString(s);
     }
 
@@ -666 +652 @@
      * @return clipboard contents if available, {@code null} otherwise.
      * @since 8429
-     */
+     * @deprecated Use {@link ClipboardUtils#getClipboardContent(Clipboard)} instead. To be removed end of 2016.
+     */
+    @Deprecated
     public static Transferable getTransferableContent(Clipboard clipboard) {
-        Transferable t = null;
-        for (int tries = 0; t == null && tries < 10; tries++) {
-            try {
-                t = clipboard.getContents(null);
-            } catch (IllegalStateException e) {
-                // Clipboard currently unavailable.
-                // On some platforms, the system clipboard is unavailable while it is accessed by another application.
-                try {
-                    Thread.sleep(1);
-                } catch (InterruptedException ex) {
-                    Main.warn("InterruptedException in "+Utils.class.getSimpleName()+" while getting clipboard content");
-                }
-            } catch (NullPointerException e) {
-                // JDK-6322854: On Linux/X11, NPE can happen for unknown reasons, on all versions of Java
-                Main.error(e);
-            }
-        }
-        return t;
+        return ClipboardUtils.getClipboardContent(clipboard);
     }
 
@@ -691 +662 @@
      * Extracts clipboard content as string.
      * @return string clipboard contents if available, {@code null} otherwise.
-     */
+     * @deprecated Use {@link ClipboardUtils#getClipboardStringContent()}. To be removed end of 2016
+     */
+    @Deprecated
     public static String getClipboardContent() {
-        try {
-            Transferable t = getTransferableContent(Toolkit.getDefaultToolkit().getSystemClipboard());
-            if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-                return (String) t.getTransferData(DataFlavor.stringFlavor);
-            }
-        } catch (UnsupportedFlavorException | IOException | HeadlessException ex) {
-            Main.error(ex);
-            return null;
-        }
-        return null;
+        return ClipboardUtils.getClipboardStringContent();
     }
 

trunk/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java

@@ -6 +6 @@
 import javax.swing.JScrollPane;
 
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.Utils;
@@ -61 +62 @@
 
     /**
-     * Copies the debug text to the clippboard. This includes the code tags for trac.
+     * Copies the debug text to the clipboard. This includes the code tags for trac.
      * @return <code>true</code> if copy was successful
      */
     public boolean copyToClippboard() {
-        return Utils.copyToClipboard(String.format(CODE_PATTERN, text));
+        return ClipboardUtils.copyString(String.format(CODE_PATTERN, text));
     }