Attachment #23522 for bug #47064

View | Details | Raw Unified | Return to bug 47064
Collapse All | Expand All

Lines 301-307 Link Here

(-)src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java (-1 / +1 lines)
301	}	301	}
302		302
303	private boolean isRightClick(MouseEvent e) {	303	private boolean isRightClick(MouseEvent e) {
304	return (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 \|\| (MouseEvent.BUTTON3_MASK == e.getModifiers());	304	return e.isPopupTrigger() \|\| (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 \|\| (MouseEvent.BUTTON3_MASK == e.getModifiers());
305	}	305	}
306		306
307	private void displayPopUp(MouseEvent e) {	307	private void displayPopUp(MouseEvent e) {





package org.apache.jmeter.gui.action;

import java.awt.Toolkit;
import java.awt.event.KeyEvent;

import javax.swing.KeyStroke;

    private KeyStrokes(){
    }

    public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke PASTE = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke REMOVE = KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0);
    public static final KeyStroke SAVE_GRAPHICS = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke SAVE_GRAPHICS_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK);
    public static final KeyStroke HELP = KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke WHAT_CLASS = KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke DEBUG_ON = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK);
    public static final KeyStroke DEBUG_OFF = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke FUNCTIONS = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke SSL_MANAGER = KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke ACTION_START = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke ACTION_STOP = KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke ACTION_SHUTDOWN = KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke CLEAR = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|KeyEvent.SHIFT_DOWN_MASK);
    public static final KeyStroke CLEAR_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke REMOTE_START_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | 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, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke SAVE_ALL_AS = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK);
    public static final KeyStroke OPEN = KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke CLOSE = KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
    public static final KeyStroke EXIT = KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
	public static final KeyStroke COLLAPSE_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
	// VK_PLUS + CTRL_DOWN_MASK did not work...
	public static final KeyStroke EXPAND_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK);
    

    /**

Lines 44-50 Link Here

(-)src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (-1 / +1 lines)
44		44
45	try {	45	try {
46	String defaultUI = JMeterUtils.getPropDefault("jmeter.laf", UIManager	46	String defaultUI = JMeterUtils.getPropDefault("jmeter.laf", UIManager
47	.getCrossPlatformLookAndFeelClassName());	47	.getSystemLookAndFeelClassName());
48	UIManager.setLookAndFeel(defaultUI);	48	UIManager.setLookAndFeel(defaultUI);
49	} catch (IllegalAccessException e) {	49	} catch (IllegalAccessException e) {
50	} catch (ClassNotFoundException e) {	50	} catch (ClassNotFoundException e) {

Lines 44-50 Link Here

(-)src/core/org/apache/jmeter/util/JMeterVersion.java (-1 / +1 lines)
44	* This ensures that JMeterUtils always gets the correct	44	* This ensures that JMeterUtils always gets the correct
45	* version, even if JMeterUtils is not re-compiled during the build.	45	* version, even if JMeterUtils is not re-compiled during the build.
46	*/	46	*/
47	private static final String VERSION = "2.3.2";	47	private static final String VERSION = "2.3.2.20090421";
48		48
49	static final String COPYRIGHT = "Copyright (c) 1998-2008 The Apache Software Foundation";	49	static final String COPYRIGHT = "Copyright (c) 1998-2008 The Apache Software Foundation";
50		50




package org.apache.jmeter.gui.util;

import java.awt.Component;
import java.awt.Toolkit;
import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Iterator;

		helpMenu.setMnemonic('H');
		JMenuItem contextHelp = new JMenuItem(JMeterUtils.getResString("help"), 'H');
		contextHelp.setActionCommand("help");
		contextHelp.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		contextHelp.addActionListener(ReportActionRouter.getInstance());
		help_about = new JMenuItem(JMeterUtils.getResString("about"), 'A');
		help_about.setActionCommand("about");

		JMenuItem functionHelper = new JMenuItem(JMeterUtils.getResString("function_dialog_menu_item"), 'F');
		functionHelper.addActionListener(ReportActionRouter.getInstance());
		functionHelper.setActionCommand("functions");
		functionHelper.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		lafMenu = new JMenu(JMeterUtils.getResString("appearance"));
		UIManager.LookAndFeelInfo lafs[] = UIManager.getInstalledLookAndFeels();
		for (int i = 0; i < lafs.length; ++i) {

			sslManager.addActionListener(ReportActionRouter.getInstance());
			sslManager.setActionCommand("sslManager");
			sslManager.setMnemonic('S');
			sslManager.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
			optionsMenu.add(sslManager);
		}
		optionsMenu.add(makeLanguageMenu());

		runMenu = new JMenu(JMeterUtils.getResString("run"));
		runMenu.setMnemonic('R');
		run_start = new JMenuItem(JMeterUtils.getResString("start"), 'S');
		run_start.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		run_start.addActionListener(ReportActionRouter.getInstance());
		run_start.setActionCommand(ACTION_START);
		run_stop = new JMenuItem(JMeterUtils.getResString("stop"), 'T');
		run_stop.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		run_stop.setEnabled(false);
		run_stop.addActionListener(ReportActionRouter.getInstance());
		run_stop.setActionCommand(ACTION_STOP);

		run_shut = new JMenuItem(JMeterUtils.getResString("shutdown"), 'Y');
		run_shut.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		run_shut.setEnabled(false);
		run_shut.addActionListener(ReportActionRouter.getInstance());
		run_shut.setActionCommand(ACTION_SHUTDOWN);

		run_clearAll = new JMenuItem(JMeterUtils.getResString("clear_all"), 'a');
		run_clearAll.addActionListener(ReportActionRouter.getInstance());
		run_clearAll.setActionCommand(ActionNames.CLEAR_ALL);
		run_clearAll.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		runMenu.add(run_start);
		if (remote_start != null) {
			runMenu.add(remote_start);
		}
		remote_start_all = new JMenuItem(JMeterUtils.getResString("remote_start_all"), 'Z');
		remote_start_all.setName("remote_start_all");
		remote_start_all.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		remote_start_all.addActionListener(ReportActionRouter.getInstance());
		remote_start_all.setActionCommand("remote_start_all");
		runMenu.add(remote_start_all);

		fileMenu = new JMenu(JMeterUtils.getResString("file"));
		fileMenu.setMnemonic('F');
		JMenuItem file_save = new JMenuItem(JMeterUtils.getResString("save"), 'S');
		file_save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		file_save.setActionCommand("save");
		file_save.addActionListener(ReportActionRouter.getInstance());
		file_save.setEnabled(true);

		file_save_as = new JMenuItem(JMeterUtils.getResString("save_all_as"), 'A');
		file_save_as.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		file_save_as.setActionCommand("save_all_as");
		file_save_as.addActionListener(ReportActionRouter.getInstance());
		file_save_as.setEnabled(true);

		file_load = new JMenuItem(JMeterUtils.getResString("menu_open"), 'O');
		file_load.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		file_load.addActionListener(ReportActionRouter.getInstance());
		// Set default SAVE menu item to disabled since the default node that
		// is selected is ROOT, which does not allow items to be inserted.

		file_load.setActionCommand("open");

		file_close = new JMenuItem(JMeterUtils.getResString("menu_close"), 'C');
		file_close.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		file_close.setActionCommand("close");
		file_close.addActionListener(ReportActionRouter.getInstance());

		file_exit = new JMenuItem(JMeterUtils.getResString("exit"), 'X');
		file_exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		file_exit.setActionCommand("exit");
		file_exit.addActionListener(ReportActionRouter.getInstance());






package org.apache.jmeter.gui.util;

import java.awt.Toolkit;
import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Collections;

					KeyEvent.VK_DELETE, 0)));
		}
		menu.add(makeMenuItem(JMeterUtils.getResString("cut"), "Cut", "Cut", KeyStroke.getKeyStroke(KeyEvent.VK_X,
				Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
		menu.add(makeMenuItem(JMeterUtils.getResString("copy"), "Copy", "Copy", KeyStroke.getKeyStroke(KeyEvent.VK_C,
				Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
		menu.add(makeMenuItem(JMeterUtils.getResString("paste"), "Paste", "Paste", KeyStroke.getKeyStroke(
				KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
		menu.add(makeMenuItem(JMeterUtils.getResString("paste_insert"), "Paste Insert", "Paste Insert"));
	}


		menu.add(makeMenuItem(JMeterUtils.getResString("open"), "Open", "open"));
		menu.add(makeMenuItem(JMeterUtils.getResString("save_as"), "Save As", "save_as"));
		JMenuItem savePicture = makeMenuItem(JMeterUtils.getResString("save_as_image"), "Save Image", "save_graphics",
				KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
		menu.add(savePicture);
		if (!(ReportGuiPackage.getInstance().getCurrentGui() instanceof Printable)) {
			savePicture.setEnabled(false);

Lines 286-292 Link Here

(-)src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java (-1 / +1 lines)
286	}	286	}
287		287
288	private boolean isRightClick(MouseEvent e) {	288	private boolean isRightClick(MouseEvent e) {
289	return (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 \|\| (MouseEvent.BUTTON3_MASK == e.getModifiers());	289	return e.isPopupTrigger() \|\| (MouseEvent.BUTTON2_MASK & e.getModifiers()) > 0 \|\| (MouseEvent.BUTTON3_MASK == e.getModifiers());
290	}	290	}
291		291
292	/*	292	/*

Lines 40-46 Link Here

(-)src/reports/org/apache/jmeter/report/gui/action/ReportLookAndFeelCommand.java (-1 / +1 lines)
40		40
41	try {	41	try {
42	String defaultUI = JMeterUtils.getPropDefault("jmeter.laf", UIManager	42	String defaultUI = JMeterUtils.getPropDefault("jmeter.laf", UIManager
43	.getCrossPlatformLookAndFeelClassName());	43	.getSystemLookAndFeelClassName());
44	UIManager.setLookAndFeel(defaultUI);	44	UIManager.setLookAndFeel(defaultUI);
45	} catch (Exception e) {	45	} catch (Exception e) {
46	}	46	}

Lines 75-81 Link Here

(-)bin/jmeter.properties (-1 / +1 lines)
75	# Metal = javax.swing.plaf.metal.MetalLookAndFeel	75	# Metal = javax.swing.plaf.metal.MetalLookAndFeel
76	# Motif = com.sun.java.swing.plaf.motif.MotifLookAndFeel	76	# Motif = com.sun.java.swing.plaf.motif.MotifLookAndFeel
77	# Windows = com.sun.java.swing.plaf.windows.WindowsLookAndFeel	77	# Windows = com.sun.java.swing.plaf.windows.WindowsLookAndFeel
78	jmeter.laf=javax.swing.plaf.metal.MetalLookAndFeel	78	#jmeter.laf=javax.swing.plaf.metal.MetalLookAndFeel
79		79
80	# Icon definitions	80	# Icon definitions
81	# default:	81	# default:

Lines 27-30 Link Here

(-)bin/jmeter.sh (-1 / +1 lines)
27	# Hopefully this is an universal option:	27	# Hopefully this is an universal option:
28	SERVER=-server	28	SERVER=-server
29		29
30	java $SERVER $JVM_ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"	30	java $SERVER $JVM_ARGS -Dapple.laf.useScreenMenuBar=true -jar `dirname $0`/ApacheJMeter.jar "$@"

Return to bug 47064

Lines 18-23 Link Here

(-)src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java (-4 / +5 lines)
18		18
19	package org.apache.jmeter.gui.util;	19	package org.apache.jmeter.gui.util;
20		20
		21	import java.awt.Toolkit;
21	import java.awt.event.KeyEvent;	22	import java.awt.event.KeyEvent;
22	import java.util.Collection;	23	import java.util.Collection;
23	import java.util.Collections;	24	import java.util.Collections;
Lines 132-142 Link Here
132	KeyEvent.VK_DELETE, 0)));	133	KeyEvent.VK_DELETE, 0)));
133	}	134	}
134	menu.add(makeMenuItem(JMeterUtils.getResString("cut"), "Cut", "Cut", KeyStroke.getKeyStroke(KeyEvent.VK_X,	135	menu.add(makeMenuItem(JMeterUtils.getResString("cut"), "Cut", "Cut", KeyStroke.getKeyStroke(KeyEvent.VK_X,
135	KeyEvent.CTRL_MASK)));	136	Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
136	menu.add(makeMenuItem(JMeterUtils.getResString("copy"), "Copy", "Copy", KeyStroke.getKeyStroke(KeyEvent.VK_C,	137	menu.add(makeMenuItem(JMeterUtils.getResString("copy"), "Copy", "Copy", KeyStroke.getKeyStroke(KeyEvent.VK_C,
137	KeyEvent.CTRL_MASK)));	138	Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
138	menu.add(makeMenuItem(JMeterUtils.getResString("paste"), "Paste", "Paste", KeyStroke.getKeyStroke(	139	menu.add(makeMenuItem(JMeterUtils.getResString("paste"), "Paste", "Paste", KeyStroke.getKeyStroke(
139	KeyEvent.VK_V, KeyEvent.CTRL_MASK)));	140	KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())));
140	menu.add(makeMenuItem(JMeterUtils.getResString("paste_insert"), "Paste Insert", "Paste Insert"));	141	menu.add(makeMenuItem(JMeterUtils.getResString("paste_insert"), "Paste Insert", "Paste Insert"));
141	}	142	}
142		143
Lines 145-151 Link Here
145	menu.add(makeMenuItem(JMeterUtils.getResString("open"), "Open", "open"));	146	menu.add(makeMenuItem(JMeterUtils.getResString("open"), "Open", "open"));
146	menu.add(makeMenuItem(JMeterUtils.getResString("save_as"), "Save As", "save_as"));	147	menu.add(makeMenuItem(JMeterUtils.getResString("save_as"), "Save As", "save_as"));
147	JMenuItem savePicture = makeMenuItem(JMeterUtils.getResString("save_as_image"), "Save Image", "save_graphics",	148	JMenuItem savePicture = makeMenuItem(JMeterUtils.getResString("save_as_image"), "Save Image", "save_graphics",
148	KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK));	149	KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
149	menu.add(savePicture);	150	menu.add(savePicture);
150	if (!(ReportGuiPackage.getInstance().getCurrentGui() instanceof Printable)) {	151	if (!(ReportGuiPackage.getInstance().getCurrentGui() instanceof Printable)) {
151	savePicture.setEnabled(false);	152	savePicture.setEnabled(false);

Lines 18-23 Link Here

(-)src/core/org/apache/jmeter/gui/action/KeyStrokes.java (-24 / +25 lines)
18		18
19	package org.apache.jmeter.gui.action;	19	package org.apache.jmeter.gui.action;
20		20
		21	import java.awt.Toolkit;
21	import java.awt.event.KeyEvent;	22	import java.awt.event.KeyEvent;
22		23
23	import javax.swing.KeyStroke;	24	import javax.swing.KeyStroke;
Lines 31-63 Link Here
31	private KeyStrokes(){	32	private KeyStrokes(){
32	}	33	}
33		34
34	public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_DOWN_MASK);	35	public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
35	public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK);	36	public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
36	public static final KeyStroke PASTE = KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK);	37	public static final KeyStroke PASTE = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
37	public static final KeyStroke REMOVE = KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0);	38	public static final KeyStroke REMOVE = KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0);
38	public static final KeyStroke SAVE_GRAPHICS = KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_DOWN_MASK);	39	public static final KeyStroke SAVE_GRAPHICS = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
39	public static final KeyStroke SAVE_GRAPHICS_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_DOWN_MASK \| KeyEvent.SHIFT_DOWN_MASK);	40	public static final KeyStroke SAVE_GRAPHICS_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() \| KeyEvent.SHIFT_DOWN_MASK);
40	public static final KeyStroke HELP = KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK);	41	public static final KeyStroke HELP = KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
41	public static final KeyStroke WHAT_CLASS = KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK);	42	public static final KeyStroke WHAT_CLASS = KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
42	public static final KeyStroke DEBUG_ON = KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK \| KeyEvent.SHIFT_DOWN_MASK);	43	public static final KeyStroke DEBUG_ON = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() \| KeyEvent.SHIFT_DOWN_MASK);
43	public static final KeyStroke DEBUG_OFF = KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK);	44	public static final KeyStroke DEBUG_OFF = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
44	public static final KeyStroke FUNCTIONS = KeyStroke.getKeyStroke(KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK);	45	public static final KeyStroke FUNCTIONS = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
45	public static final KeyStroke SSL_MANAGER = KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK);	46	public static final KeyStroke SSL_MANAGER = KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
46	public static final KeyStroke ACTION_START = KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK);	47	public static final KeyStroke ACTION_START = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
47	public static final KeyStroke ACTION_STOP = KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, KeyEvent.CTRL_DOWN_MASK);	48	public static final KeyStroke ACTION_STOP = KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
48	public static final KeyStroke ACTION_SHUTDOWN = KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, KeyEvent.CTRL_DOWN_MASK);	49	public static final KeyStroke ACTION_SHUTDOWN = KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
49	public static final KeyStroke CLEAR = KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK\|KeyEvent.SHIFT_DOWN_MASK);	50	public static final KeyStroke CLEAR = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()\|KeyEvent.SHIFT_DOWN_MASK);
50	public static final KeyStroke CLEAR_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK);	51	public static final KeyStroke CLEAR_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
51	public static final KeyStroke REMOTE_START_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK \| KeyEvent.SHIFT_DOWN_MASK);	52	public static final KeyStroke REMOTE_START_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() \| KeyEvent.SHIFT_DOWN_MASK);
52	public static final KeyStroke REMOTE_STOP_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.ALT_DOWN_MASK);	53	public static final KeyStroke REMOTE_STOP_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.ALT_DOWN_MASK);
53	public static final KeyStroke SAVE = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK);	54	public static final KeyStroke SAVE = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
54	public static final KeyStroke SAVE_ALL_AS = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK \| KeyEvent.SHIFT_DOWN_MASK);	55	public static final KeyStroke SAVE_ALL_AS = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() \| KeyEvent.SHIFT_DOWN_MASK);
55	public static final KeyStroke OPEN = KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK);	56	public static final KeyStroke OPEN = KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
56	public static final KeyStroke CLOSE = KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK);	57	public static final KeyStroke CLOSE = KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
57	public static final KeyStroke EXIT = KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK);	58	public static final KeyStroke EXIT = KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
58	public static final KeyStroke COLLAPSE_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_DOWN_MASK);	59	public static final KeyStroke COLLAPSE_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
59	// VK_PLUS + CTRL_DOWN_MASK did not work...	60	// VK_PLUS + CTRL_DOWN_MASK did not work...
60	public static final KeyStroke EXPAND_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_DOWN_MASK \| KeyEvent.SHIFT_DOWN_MASK);	61	public static final KeyStroke EXPAND_ALL = KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() \| KeyEvent.SHIFT_DOWN_MASK);
61		62
62		63
63	/**	64	/**