Author: sebb
Date: Fri Sep 16 00:29:44 2011
New Revision: 1171343
URL: http://svn.apache.org/viewvc?rev=1171343&view=rev
Log:
Bug 51821 - Add short-cut for Enabling / Disabling (sub)tree or branches in
test plan.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1171343&r1=1171342&r2=1171343&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
Fri Sep 16 00:29:44 2011
@@ -77,11 +77,12 @@ public class ActionNames {
public static final String SAVE_GRAPHICS = "save_graphics"; //
$NON-NLS-1$
public static final String SAVE_GRAPHICS_ALL= "save_graphics_all"; //
$NON-NLS-1$
public static final String SSL_MANAGER = "sslManager"; // $NON-NLS-1$
+ public static final String STOP_THREAD = "stop_thread"; // $NON-NLS-1$
public static final String SUB_TREE_LOADED = "sub_tree_loaded"; //
$NON-NLS-1$
public static final String SUB_TREE_MERGED = "sub_tree_merged"; //
$NON-NLS-1$
public static final String SUB_TREE_SAVED = "sub_tree_saved"; //
$NON-NLS-1$
+ public static final String TOGGLE = "toggle"; // $NON-NLS-1$
enable/disable
public static final String WHAT_CLASS = "what_class"; // $NON-NLS-1$
- public static final String STOP_THREAD = "stop_thread"; //
$NON-NLS-1$
// Prevent instantiation
private ActionNames(){
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=1171343&r1=1171342&r2=1171343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
Fri Sep 16 00:29:44 2011
@@ -38,6 +38,7 @@ public class EnableComponent implements
static {
commands.add(ActionNames.ENABLE);
commands.add(ActionNames.DISABLE);
+ commands.add(ActionNames.TOGGLE);
}
/**
@@ -52,6 +53,9 @@ public class EnableComponent implements
} else if (e.getActionCommand().equals(ActionNames.DISABLE)) {
log.debug("disabling currently selected gui objects");
enableComponents(nodes, false);
+ } else if (e.getActionCommand().equals(ActionNames.TOGGLE)) {
+ log.debug("toggling currently selected gui objects");
+ toggleComponents(nodes);
}
}
@@ -63,6 +67,15 @@ public class EnableComponent implements
}
}
+ private void toggleComponents(JMeterTreeNode[] nodes) {
+ GuiPackage pack = GuiPackage.getInstance();
+ for (int i = 0; i < nodes.length; i++) {
+ boolean enable = !nodes[i].isEnabled();
+ nodes[i].setEnabled(enable);
+ pack.getGui(nodes[i].getTestElement()).setEnabled(enable);
+ }
+ }
+
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
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=1171343&r1=1171342&r2=1171343&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 Sep 16 00:29:44 2011
@@ -52,6 +52,7 @@ public final class KeyStrokes {
public static final KeyStroke REMOTE_START_ALL =
KeyStroke.getKeyStroke(KeyEvent.VK_R, CONTROL_MASK | KeyEvent.SHIFT_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 TOGGLE =
KeyStroke.getKeyStroke(KeyEvent.VK_T, CONTROL_MASK);
public static final KeyStroke PASTE =
KeyStroke.getKeyStroke(KeyEvent.VK_V, CONTROL_MASK);
public static final KeyStroke WHAT_CLASS =
KeyStroke.getKeyStroke(KeyEvent.VK_W, CONTROL_MASK);
public static final KeyStroke CUT =
KeyStroke.getKeyStroke(KeyEvent.VK_X, CONTROL_MASK);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1171343&r1=1171342&r2=1171343&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Fri Sep 16 00:29:44 2011
@@ -227,6 +227,8 @@ public final class MenuFactory {
}
menu.add(enabled);
menu.add(disabled);
+ JMenuItem toggle = makeMenuItemRes("toggle", ActionNames.TOGGLE,
KeyStrokes.TOGGLE);// $NON-NLS-1$
+ menu.add(toggle);
addSeparator(menu);
menu.add(makeMenuItemRes("help", ActionNames.HELP));// $NON-NLS-1$
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1171343&r1=1171342&r2=1171343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Fri Sep 16 00:29:44 2011
@@ -926,6 +926,7 @@ throughput_control_title=Throughput Cont
throughput_control_tplabel=Throughput
time_format=Format string for SimpleDateFormat (optional)
timelim=Time limit
+toggle=Toggle
tr=Turkish
transaction_controller_parent=Generate parent sample
transaction_controller_title=Transaction Controller
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1171343&r1=1171342&r2=1171343&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Sep 16 00:29:44 2011
@@ -117,6 +117,7 @@ This can be overridden by setting the JM
<h3>General</h3>
<ul>
<li>Bug 51831 - Cannot disable UDP server or change the maximum UDP port</li>
+<li>Bug 51821 - Add short-cut for Enabling / Disabling (sub)tree or branches
in test plan.</li>
</ul>
<!-- ==================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
