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

Timestamp:

2015-05-26T21:30:33+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11485 - robustness to JDK-6322854 when dealing with system selection

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletingComboBox.java (modified) (3 diffs)
• tools/Utils.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -468 +468 @@
             // select combobox with saving unix system selection (middle mouse paste)
             Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
-            if(sysSel != null) {
-                Transferable old = sysSel.getContents(null);
+            if (sysSel != null) {
+                Transferable old = Utils.getTransferableContent(sysSel);
                 cb.requestFocusInWindow();
                 cb.getEditor().selectAll();

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -26 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -134 +135 @@
             // save unix system selection (middle mouse paste)
             Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
-            if(sysSel != null) {
-                Transferable old = sysSel.getContents(null);
+            if (sysSel != null) {
+                Transferable old = Utils.getTransferableContent(sysSel);
                 editorComponent.select(start, end);
                 sysSel.setContents(old, null);
@@ -198 +199 @@
                         // save unix system selection (middle mouse paste)
                         Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
-                        if(sysSel != null) {
-                            Transferable old = sysSel.getContents(null);
+                        if (sysSel != null) {
+                            Transferable old = Utils.getTransferableContent(sysSel);
                             editorComponent.selectAll();
                             sysSel.setContents(old, null);

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

@@ -499 +499 @@
         try {
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(s), new ClipboardOwner() {
-
                 @Override
                 public void lostOwnership(Clipboard clpbrd, Transferable t) {
+                    // Do nothing
                 }
             });
@@ -512 +512 @@
 
     /**
-     * Extracts clipboard content as string.
-     * @return string clipboard contents if available, {@code null} otherwise.
-     */
-    public static String getClipboardContent() {
-        Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+     * Extracts clipboard content as {@code Transferable} object.
+     * @param clipboard clipboard from which contents are retrieved
+     * @return clipboard contents if available, {@code null} otherwise.
+     * @since 8429
+     */
+    public static Transferable getTransferableContent(Clipboard clipboard) {
         Transferable t = null;
         for (int tries = 0; t == null && tries < 10; tries++) {
@@ -522 +523 @@
                 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.
+                // Clipboard currently unavailable.
+                // On some platforms, the system clipboard is unavailable while it is accessed by another application.
                 try {
                     Thread.sleep(1);
@@ -528 +530 @@
                     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;
+    }
+
+    /**
+     * Extracts clipboard content as string.
+     * @return string clipboard contents if available, {@code null} otherwise.
+     */
+    public static String getClipboardContent() {
+        Transferable t = getTransferableContent(Toolkit.getDefaultToolkit().getSystemClipboard());
         try {
             if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
@@ -547 +561 @@
      */
     public static String md5Hex(String data) {
-        byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
         MessageDigest md = null;
         try {
@@ -554 +567 @@
             throw new RuntimeException(e);
         }
+        byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
         byte[] byteDigest = md.digest(byteData);
         return toHexString(byteDigest);