Changeset 9576 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2016-01-23T04:49:01+01:00 (8 years ago)

Author:

Don-vip

Message:

code refactoring for unit tests / headless mode

File:

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

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

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.Transferable;
@@ -26 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.Utils;
@@ -133 +132 @@
             final JTextComponent editorComponent = comboBox.getEditorComponent();
             // save unix system selection (middle mouse paste)
-            Clipboard sysSel = GraphicsEnvironment.isHeadless() ? null : Toolkit.getDefaultToolkit().getSystemSelection();
+            Clipboard sysSel = GuiHelper.getSystemSelection();
             if (sysSel != null) {
                 Transferable old = Utils.getTransferableContent(sysSel);
@@ -198 +197 @@
                         }
                         // save unix system selection (middle mouse paste)
-                        Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
+                        Clipboard sysSel = GuiHelper.getSystemSelection();
                         if (sysSel != null) {
                             Transferable old = Utils.getTransferableContent(sysSel);