Author: sebb
Date: Fri Apr 24 16:58:08 2009
New Revision: 768370

URL: http://svn.apache.org/viewvc?rev=768370&view=rev
Log:
Bug 47064 - fixes for Mac LAF

Modified:
    jakarta/jmeter/trunk/bin/jmeter.sh
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/bin/jmeter.sh
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.sh?rev=768370&r1=768369&r2=768370&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.sh (original)
+++ jakarta/jmeter/trunk/bin/jmeter.sh Fri Apr 24 16:58:08 2009
@@ -27,4 +27,5 @@
 ##
 ##   ==============================================
 
-java $JVM_ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"
+# Add Mac-specific property - should be ignored elsewhere (Bug 47064)
+java $JVM_ARGS -Dapple.laf.useScreenMenuBar=true -jar `dirname 
$0`/ApacheJMeter.jar "$@"

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=768370&r1=768369&r2=768370&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java 
Fri Apr 24 16:58:08 2009
@@ -18,6 +18,7 @@
 
 package org.apache.jmeter.gui.action;
 
+import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 
 import javax.swing.KeyStroke;
@@ -30,34 +31,37 @@
     // Prevent instantiation
     private KeyStrokes(){
     }
-
-    public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke PASTE = 
KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK);
+    
+    // Bug 47064 - fixes for Mac LAF
+    private static int CONTROL_MASK 
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+    
+    public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, 
CONTROL_MASK);
+    public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, 
CONTROL_MASK);
+    public static final KeyStroke PASTE = 
KeyStroke.getKeyStroke(KeyEvent.VK_V, CONTROL_MASK);
     public static final KeyStroke REMOVE = 
KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0);
-    public static final KeyStroke SAVE_GRAPHICS = 
KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke SAVE_GRAPHICS_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_DOWN_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
-    public static final KeyStroke HELP = KeyStroke.getKeyStroke(KeyEvent.VK_H, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke WHAT_CLASS = 
KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke DEBUG_ON = 
KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
-    public static final KeyStroke DEBUG_OFF = 
KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke FUNCTIONS = 
KeyStroke.getKeyStroke(KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke SSL_MANAGER = 
KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke ACTION_START = 
KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke ACTION_STOP = 
KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke ACTION_SHUTDOWN = 
KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke CLEAR = 
KeyStroke.getKeyStroke(KeyEvent.VK_E, 
KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK);
-    public static final KeyStroke CLEAR_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke REMOTE_START_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke SAVE_GRAPHICS = 
KeyStroke.getKeyStroke(KeyEvent.VK_G, CONTROL_MASK);
+    public static final KeyStroke SAVE_GRAPHICS_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_G, CONTROL_MASK | KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke HELP = KeyStroke.getKeyStroke(KeyEvent.VK_H, 
CONTROL_MASK);
+    public static final KeyStroke WHAT_CLASS = 
KeyStroke.getKeyStroke(KeyEvent.VK_W, CONTROL_MASK);
+    public static final KeyStroke DEBUG_ON = 
KeyStroke.getKeyStroke(KeyEvent.VK_D, CONTROL_MASK | KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke DEBUG_OFF = 
KeyStroke.getKeyStroke(KeyEvent.VK_D, CONTROL_MASK);
+    public static final KeyStroke FUNCTIONS = 
KeyStroke.getKeyStroke(KeyEvent.VK_F, CONTROL_MASK);
+    public static final KeyStroke SSL_MANAGER = 
KeyStroke.getKeyStroke(KeyEvent.VK_M, CONTROL_MASK);
+    public static final KeyStroke ACTION_START = 
KeyStroke.getKeyStroke(KeyEvent.VK_R, CONTROL_MASK);
+    public static final KeyStroke ACTION_STOP = 
KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, CONTROL_MASK);
+    public static final KeyStroke ACTION_SHUTDOWN = 
KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, CONTROL_MASK);
+    public static final KeyStroke CLEAR = 
KeyStroke.getKeyStroke(KeyEvent.VK_E, CONTROL_MASK|KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke CLEAR_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_E, CONTROL_MASK);
+    public static final KeyStroke REMOTE_START_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_R, CONTROL_MASK | KeyEvent.SHIFT_DOWN_MASK);
     public static final KeyStroke REMOTE_STOP_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.ALT_DOWN_MASK);
-    public static final KeyStroke SAVE = KeyStroke.getKeyStroke(KeyEvent.VK_S, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke SAVE_ALL_AS = 
KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
-    public static final KeyStroke OPEN = KeyStroke.getKeyStroke(KeyEvent.VK_O, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke CLOSE = 
KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke EXIT = KeyStroke.getKeyStroke(KeyEvent.VK_Q, 
KeyEvent.CTRL_DOWN_MASK);
-    public static final KeyStroke COLLAPSE_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_DOWN_MASK);
+    public static final KeyStroke SAVE = KeyStroke.getKeyStroke(KeyEvent.VK_S, 
CONTROL_MASK);
+    public static final KeyStroke SAVE_ALL_AS = 
KeyStroke.getKeyStroke(KeyEvent.VK_S, CONTROL_MASK | KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke OPEN = KeyStroke.getKeyStroke(KeyEvent.VK_O, 
CONTROL_MASK);
+    public static final KeyStroke CLOSE = 
KeyStroke.getKeyStroke(KeyEvent.VK_L, CONTROL_MASK);
+    public static final KeyStroke EXIT = KeyStroke.getKeyStroke(KeyEvent.VK_Q, 
CONTROL_MASK);
+    public static final KeyStroke COLLAPSE_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, CONTROL_MASK);
     // VK_PLUS + CTRL_DOWN_MASK did not work...
-    public static final KeyStroke EXPAND_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_DOWN_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
+    public static final KeyStroke EXPAND_ALL = 
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, CONTROL_MASK | 
KeyEvent.SHIFT_DOWN_MASK);
 
 
     /**

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java?rev=768370&r1=768369&r2=768370&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
 Fri Apr 24 16:58:08 2009
@@ -301,7 +301,7 @@
     }
 
     private boolean isRightClick(MouseEvent e) {
-        return (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 || 
(MouseEvent.BUTTON3_MASK == e.getModifiers());
+        return e.isPopupTrigger() || (MouseEvent.BUTTON2_MASK & 
e.getModifiers()) > 0 || (MouseEvent.BUTTON3_MASK == e.getModifiers());
     }
 
     private void displayPopUp(MouseEvent e) {

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java?rev=768370&r1=768369&r2=768370&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java
 Fri Apr 24 16:58:08 2009
@@ -286,7 +286,7 @@
     }
 
     private boolean isRightClick(MouseEvent e) {
-        return (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 || 
(MouseEvent.BUTTON3_MASK == e.getModifiers());
+        return e.isPopupTrigger() || (MouseEvent.BUTTON2_MASK & 
e.getModifiers()) > 0 || (MouseEvent.BUTTON3_MASK == e.getModifiers());
     }
 
     /*

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=768370&r1=768369&r2=768370&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Apr 24 16:58:08 2009
@@ -202,6 +202,7 @@
 <li>Remove Host from headers saved by the Proxy server, as that will normally 
be generated by the HTTP stack</li>
 <li>Bug 46993 - Saving from Header Manager generates ClassCastException</li>
 <li>Bug 47009 - Insert parent caused child controller name to be reset</li>
+<li>Bug 47064 - fixes for Mac LAF</li>
 </ul>
 
 <h3>Improvements</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org

Reply via email to