svn commit: r1734547 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java

[sebb]

Author: sebb
Date: Fri Mar 11 12:20:18 2016
New Revision: 1734547

URL: http://svn.apache.org/viewvc?rev=1734547&view=rev
Log:
Allow tests to work under headless mode

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=1734547&r1=1734546&r2=1734547&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java Fri Mar 
11 12:20:18 2016
@@ -34,7 +34,20 @@ public final class KeyStrokes {
     }
 
     // Bug 47064 - fixes for Mac LAF
-    private static final int CONTROL_MASK 
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+    private static final int CONTROL_MASK;
+    // Allow tests to work under headless mode
+    static {
+        int mask = KeyEvent.CTRL_DOWN_MASK; // This is better than nothing...
+        try {
+            mask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+        } catch (java.awt.HeadlessException e) {
+            // suppress the error if we are deliberately running headless
+            if (!"true".equals(System.getProperty("java.awt.headless"))) {
+                throw e;
+            }
+        }
+        CONTROL_MASK = mask;
+    }
 
     public static final KeyStroke COPY              = 
KeyStroke.getKeyStroke(KeyEvent.VK_C, CONTROL_MASK);
     public static final KeyStroke DUPLICATE         = 
KeyStroke.getKeyStroke(KeyEvent.VK_C, CONTROL_MASK | 
InputEvent.SHIFT_DOWN_MASK);