Changeset 10613 in josm for trunk

Timestamp:

2016-07-23T18:56:48+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12478 - do not try to enable dragging in headless mode

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (2 diffs)
• dialogs/relation/MemberTable.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -1115 +1116 @@
             super(dataModel);
             dataModel.setLayerList(this);
-            setDragEnabled(true);
+            if (!GraphicsEnvironment.isHeadless()) {
+                setDragEnabled(true);
+            }
             setDropMode(DropMode.INSERT_ROWS);
             setTransferHandler(new LayerListTransferHandler());

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

@@ -71 +71 @@
             setTransferHandler(new MemberTransferHandler());
             setFillsViewportHeight(true); // allow drop on empty table
-            setDragEnabled(true);
+            if (!GraphicsEnvironment.isHeadless()) {
+                setDragEnabled(true);
+            }
             setDropMode(DropMode.INSERT_ROWS);
         }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -7 +7 @@
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -765 +766 @@
             });
 
-            selectedList.setDragEnabled(true);
+            if (!GraphicsEnvironment.isHeadless()) {
+                selectedList.setDragEnabled(true);
+            }
             selectedList.setTransferHandler(new SelectedListTransferHandler());
 
@@ -792 +795 @@
                 }
             });
-            actionsTree.setDragEnabled(true);
+            if (!GraphicsEnvironment.isHeadless()) {
+                actionsTree.setDragEnabled(true);
+            }
             actionsTree.getSelectionModel().addTreeSelectionListener(e -> updateEnabledState());