Changeset 9376 in josm for trunk/src/org

Timestamp:

2016-01-10T00:44:47+01:00 (9 years ago)

Author:

simon04

Message:

see #12300 - Fix headless unit tests

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• SelectionListDialog.java (modified) (2 diffs)
• relation/MemberTable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -6 +6 @@
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.datatransfer.Transferable;
@@ -113 +114 @@
         lstPrimitives.setCellRenderer(new OsmPrimitivRenderer());
         lstPrimitives.setTransferHandler(new SelectionTransferHandler());
-        lstPrimitives.setDragEnabled(true);
+        if (!GraphicsEnvironment.isHeadless()) {
+            lstPrimitives.setDragEnabled(true);
+        }
 
         lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -6 +6 @@
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
@@ -85 +86 @@
         getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
 
-        setTransferHandler(new MemberTransferHandler());
-        setFillsViewportHeight(true); // allow drop on empty table
-        setDragEnabled(true);
-        setDropMode(DropMode.INSERT_ROWS);
+        if (!GraphicsEnvironment.isHeadless()) {
+            setTransferHandler(new MemberTransferHandler());
+            setFillsViewportHeight(true); // allow drop on empty table
+            setDragEnabled(true);
+            setDropMode(DropMode.INSERT_ROWS);
+        }
     }