Changeset 8429 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (modified) (3 diffs)

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);