You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/02 02:06:40 UTC
svn commit: r382208 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/
Author: sebb
Date: Wed Mar 1 17:06:37 2006
New Revision: 382208
URL: http://svn.apache.org/viewcvs?rev=382208&view=rev
Log:
Move action name strings to ActionNames class
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AboutCommand.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddParent.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddToTree.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Analyze.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CheckDirty.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Clear.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Close.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Command.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Copy.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Cut.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/DragNDrop.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EditCommand.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ExitCommand.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Help.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Paste.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/RemoteStart.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Remove.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Start.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AboutCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AboutCommand.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -54,8 +53,8 @@
static {
HashSet commands = new HashSet();
- commands.add("about");
- AboutCommand.commandSet = Collections.unmodifiableSet(commands);
+ commands.add(ActionNames.ABOUT);
+ commandSet = Collections.unmodifiableSet(commands);
}
/**
@@ -64,7 +63,7 @@
* if at all possible.
*/
public void doAction(ActionEvent e) {
- if (e.getActionCommand().equals("about")) {
+ if (e.getActionCommand().equals(ActionNames.ABOUT)) {
this.about();
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddParent.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddParent.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddParent.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -34,11 +33,11 @@
* @version $Revision$
*/
public class AddParent implements Command {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static {
- commands.add("Add Parent");
+ commands.add(ActionNames.ADD_PARENT);
}
public AddParent() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AddToTree.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -19,8 +18,8 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
import javax.swing.JComponent;
@@ -33,17 +32,21 @@
import org.apache.log.Logger;
/**
- * @author unattributed
* @version $Revision$ Last updated: $Date$
*/
public class AddToTree implements Command {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static Set commandSet;
+
+ static {
+ HashSet commands = new HashSet();
+ commands.add(ActionNames.ADD);
+ commandSet = Collections.unmodifiableSet(commands);
+ }
- private Map allJMeterComponentCommands;
public AddToTree() {
- allJMeterComponentCommands = new HashMap();
- allJMeterComponentCommands.put("Add", "Add");
}
/**
@@ -52,7 +55,7 @@
* @return the ActionNames value
*/
public Set getActionNames() {
- return allJMeterComponentCommands.keySet();
+ return commandSet;
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Analyze.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Analyze.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Analyze.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Analyze.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -36,7 +35,7 @@
private static Set commands = new HashSet();
static {
- commands.add("Analyze File");
+ commands.add(ActionNames.ANALYZE_FILE);
}
public Analyze() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -34,12 +33,10 @@
public class ChangeLanguage implements Command {
private static final Set commands = new HashSet();
- public final static String CHANGE_LANGUAGE = "change_language";
-
- private Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
static {
- commands.add(CHANGE_LANGUAGE);
+ commands.add(ActionNames.CHANGE_LANGUAGE);
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CheckDirty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CheckDirty.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -42,32 +41,19 @@
private static Map previousGuiItems;
- public static final String CHECK_DIRTY = "check_dirty";
+ private boolean checkMode = false;
- public static final String SUB_TREE_SAVED = "sub_tree_saved";
+ private boolean removeMode = false;
- public static final String SUB_TREE_LOADED = "sub_tree_loaded";
-
- public static final String ADD_ALL = "add_all";
-
- // Not implemented: public static final String SAVE = "save_as";
- // Not implemented: public static final String SAVE_ALL = "save_all";
- // Not implemented: public static final String SAVE_TO_PREVIOUS = "save";
- public static final String REMOVE = "check_remove";
-
- boolean checkMode = false;
-
- boolean removeMode = false;
-
- boolean dirty = false;
+ private boolean dirty = false;
private static Set commands = new HashSet();
static {
- commands.add(CHECK_DIRTY);
- commands.add(SUB_TREE_SAVED);
- commands.add(SUB_TREE_LOADED);
- commands.add(ADD_ALL);
- commands.add(REMOVE);
+ commands.add(ActionNames.CHECK_DIRTY);
+ commands.add(ActionNames.SUB_TREE_SAVED);
+ commands.add(ActionNames.SUB_TREE_LOADED);
+ commands.add(ActionNames.ADD_ALL);
+ commands.add(ActionNames.CHECK_REMOVE);
}
public CheckDirty() {
@@ -86,16 +72,16 @@
*/
public void doAction(ActionEvent e) {
String action = e.getActionCommand();
- if (action.equals(SUB_TREE_SAVED)) {
+ if (action.equals(ActionNames.SUB_TREE_SAVED)) {
HashTree subTree = (HashTree) e.getSource();
subTree.traverse(this);
- } else if (action.equals(SUB_TREE_LOADED)) {
+ } else if (action.equals(ActionNames.SUB_TREE_LOADED)) {
ListedHashTree addTree = (ListedHashTree) e.getSource();
addTree.traverse(this);
- } else if (action.equals(ADD_ALL)) {
+ } else if (action.equals(ActionNames.ADD_ALL)) {
previousGuiItems.clear();
GuiPackage.getInstance().getTreeModel().getTestPlan().traverse(this);
- } else if (action.equals(REMOVE)) {
+ } else if (action.equals(ActionNames.CHECK_REMOVE)) {
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
removeMode = true;
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Clear.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Clear.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -35,16 +34,12 @@
* @version $Revision$
*/
public class Clear implements Command {
- transient private static Logger log = LoggingManager.getLoggerForClass();
-
- public final static String CLEAR = "action.clear";
-
- public final static String CLEAR_ALL = "action.clear_all";
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static {
- commands.add(CLEAR);
- commands.add(CLEAR_ALL);
+ commands.add(ActionNames.CLEAR);
+ commands.add(ActionNames.CLEAR_ALL);
}
public Clear() {
@@ -56,7 +51,7 @@
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
- if (e.getActionCommand().equals(CLEAR)) {
+ if (e.getActionCommand().equals(ActionNames.CLEAR)) {
JMeterGUIComponent model = guiPackage.getCurrentGui();
try {
((Clearable) model).clear();
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Close.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Close.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -39,7 +38,7 @@
private static Set commands = new HashSet();
static {
- commands.add("close");
+ commands.add(ActionNames.CLOSE);
}
/**
@@ -64,13 +63,13 @@
* the generic UI action event
*/
public void doAction(ActionEvent e) {
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), CheckDirty.CHECK_DIRTY));
+ ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
GuiPackage guiPackage = GuiPackage.getInstance();
if (guiPackage.isDirty()) {
if (JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils
.getResString("cancel_new_to_save"), JMeterUtils.getResString("Save?"), JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), Save.SAVE));
+ ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
}
}
guiPackage.getTreeModel().clearTestPlan();
@@ -79,6 +78,6 @@
// Clear the name of the test plan file
GuiPackage.getInstance().setTestPlanFile(null);
- ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), CheckDirty.ADD_ALL));
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), ActionNames.ADD_ALL));
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Command.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Command.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Command.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Command.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Copy.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Copy.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2005 The Apache Software Foundation.
*
@@ -42,11 +41,10 @@
private static JMeterTreeNode copiedNodes[] = null;
- private static String COPY = "Copy";
-
private static HashSet commands = new HashSet();
+
static {
- commands.add(COPY);
+ commands.add(ActionNames.COPY);
}
/*
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -33,7 +32,7 @@
private static Set commands;
static {
commands = new HashSet();
- commands.add("functions");
+ commands.add(ActionNames.FUNCTIONS);
}
public CreateFunctionDialog() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Cut.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Cut.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Cut.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Cut.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -30,11 +29,9 @@
* @version $Revision$
*/
public class Cut extends AbstractAction {
- public final static String CUT = "Cut";
-
private static Set commands = new HashSet();
static {
- commands.add(CUT);
+ commands.add(ActionNames.CUT);
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/DragNDrop.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/DragNDrop.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/DragNDrop.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/DragNDrop.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -36,17 +35,11 @@
* @version $Revision$
*/
public class DragNDrop extends AbstractAction {
- public final static String ADD = "drag_n_drop.add";//$NON-NLS-1$
-
- public final static String INSERT_BEFORE = "drag_n_drop.insert_before";//$NON-NLS-1$
-
- public final static String INSERT_AFTER = "drag_n_drop.insert_after";//$NON-NLS-1$
-
private static Set commands = new HashSet();
static {
- commands.add(ADD);
- commands.add(INSERT_BEFORE);
- commands.add(INSERT_AFTER);
+ commands.add(ActionNames.DRAG_ADD);
+ commands.add(ActionNames.INSERT_BEFORE);
+ commands.add(ActionNames.INSERT_AFTER);
}
/**
@@ -65,19 +58,19 @@
}
// System.out.println(action+" "+te.getClass().getName());
- if (ADD.equals(action) && canAddTo(currentNode)) {
+ if (ActionNames.DRAG_ADD.equals(action) && canAddTo(currentNode)) {
removeNodesFromParents(draggedNodes);
for (int i = 0; i < draggedNodes.length; i++) {
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i], currentNode,
currentNode.getChildCount());
}
- } else if (INSERT_BEFORE.equals(action) && canAddTo(parentNode)) {
+ } else if (ActionNames.INSERT_BEFORE.equals(action) && canAddTo(parentNode)) {
removeNodesFromParents(draggedNodes);
for (int i = 0; i < draggedNodes.length; i++) {
int index = parentNode.getIndex(currentNode);
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i], parentNode, index);
}
- } else if (INSERT_AFTER.equals(action) && canAddTo(parentNode)) {
+ } else if (ActionNames.INSERT_AFTER.equals(action) && canAddTo(parentNode)) {
removeNodesFromParents(draggedNodes);
for (int i = 0; i < draggedNodes.length; i++) {
int index = parentNode.getIndex(currentNode) + 1;
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EditCommand.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EditCommand.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EditCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EditCommand.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -32,7 +31,7 @@
public class EditCommand implements Command {
private static Set commands = new HashSet();
static {
- commands.add("edit");
+ commands.add(ActionNames.EDIT);
}
public EditCommand() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/EnableComponent.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -31,16 +30,12 @@
* @version $Revision$
*/
public class EnableComponent implements Command {
- private static Logger log = LoggingManager.getLoggerForClass();
-
- public static final String ENABLE = "enable";
-
- public static final String DISABLE = "disable";
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static {
- commands.add(ENABLE);
- commands.add(DISABLE);
+ commands.add(ActionNames.ENABLE);
+ commands.add(ActionNames.DISABLE);
}
/**
@@ -49,10 +44,10 @@
public void doAction(ActionEvent e) {
JMeterTreeNode[] nodes = GuiPackage.getInstance().getTreeListener().getSelectedNodes();
- if (e.getActionCommand().equals(ENABLE)) {
+ if (e.getActionCommand().equals(ActionNames.ENABLE)) {
log.debug("enabling currently selected gui objects");
enableComponents(nodes, true);
- } else if (e.getActionCommand().equals(DISABLE)) {
+ } else if (e.getActionCommand().equals(ActionNames.DISABLE)) {
log.debug("disabling currently selected gui objects");
enableComponents(nodes, false);
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ExitCommand.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ExitCommand.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ExitCommand.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -63,7 +62,7 @@
* Description of Parameter
*/
public void doAction(ActionEvent e) {
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), CheckDirty.CHECK_DIRTY));
+ ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
if (GuiPackage.getInstance().isDirty()) {
int chosenOption = JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils
.getResString("cancel_exit_to_save"), JMeterUtils.getResString("Save?"),
@@ -71,7 +70,7 @@
if (chosenOption == JOptionPane.NO_OPTION) {
System.exit(0);
} else if (chosenOption == JOptionPane.YES_OPTION) {
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), Save.SAVE_ALL_AS));
+ ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE_ALL_AS));
if (!GuiPackage.getInstance().isDirty()) {
System.exit(0);
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Help.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Help.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Help.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Help.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -37,19 +36,16 @@
/**
*
- * @author unattributed
* @version $Revision$ $Date$
*/
public class Help implements Command {
transient private static Logger log = LoggingManager.getLoggerForClass();
- public final static String HELP = "help";
-
private static Set commands = new HashSet();
- public static final String HELP_DOCS = "file:///" + JMeterUtils.getJMeterHome() + "/printable_docs/usermanual/";
+ private static final String HELP_DOCS = "file:///" + JMeterUtils.getJMeterHome() + "/printable_docs/usermanual/";
- public static final String HELP_PAGE = HELP_DOCS + "component_reference.html";
+ private static final String HELP_PAGE = HELP_DOCS + "component_reference.html";
public static final String HELP_FUNCTIONS = HELP_DOCS + "functions.html";
@@ -62,7 +58,7 @@
private static String currentPage;
static {
- commands.add(HELP);
+ commands.add(ActionNames.HELP);
helpDoc = new HtmlPane();
scroller = new JScrollPane(helpDoc);
helpDoc.setEditable(false);
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -41,7 +40,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.ConversionException;
/**
@@ -49,14 +47,12 @@
* @version $Revision$
*/
public class Load implements Command {
- transient private static Logger log = LoggingManager.getLoggerForClass();
-
- XStream loadService = new XStream();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static {
- commands.add("open");
- commands.add("merge");
+ commands.add(ActionNames.OPEN);
+ commands.add(ActionNames.MERGE);
}
public Load() {
@@ -68,7 +64,7 @@
}
public void doAction(ActionEvent e) {
- boolean merging = e.getActionCommand().equals("merge");
+ boolean merging = e.getActionCommand().equals(ActionNames.MERGE);
if (!merging) {
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), "close"));
@@ -144,7 +140,7 @@
new TreePath(((JMeterTreeNode) newTree.getArray()[0]).getPath()));
tree = GuiPackage.getInstance().getCurrentSubTree();
ActionRouter.getInstance().actionPerformed(
- new ActionEvent(tree.get(tree.getArray()[tree.size() - 1]), id, CheckDirty.SUB_TREE_LOADED));
+ new ActionEvent(tree.get(tree.getArray()[tree.size() - 1]), id, ActionNames.SUB_TREE_LOADED));
return isTestPlan;
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -38,7 +37,7 @@
static {
UIManager.LookAndFeelInfo[] lfs = UIManager.getInstalledLookAndFeels();
for (int i = 0; i < lfs.length; i++) {
- commands.add("laf:" + lfs[i].getClassName());
+ commands.add(ActionNames.LAF_PREFIX + lfs[i].getClassName());
}
try {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Paste.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Paste.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Paste.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Paste.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -34,11 +33,9 @@
*/
public class Paste extends AbstractAction {
- public final static String PASTE = "Paste";
-
private static Set commands = new HashSet();
static {
- commands.add(PASTE);
+ commands.add(ActionNames.PASTE);
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/RemoteStart.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/RemoteStart.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -42,16 +41,21 @@
* @version $Revision$ Last updated $Date$
*/
public class RemoteStart extends AbstractAction {
- transient private static Logger log = LoggingManager.getLoggerForClass();
- private static Set commands = new HashSet();
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static final String LOCAL_HOST = "127.0.0.1"; // $NON-NLS-1$
+
+ private static final String REMOTE_HOSTS = "remote_hosts"; // $NON-NLS-1$ jmeter.properties
+
+ private static Set commands = new HashSet();
static {
- commands.add("remote_start");
- commands.add("remote_stop");
- commands.add("remote_start_all");
- commands.add("remote_stop_all");
- commands.add("remote_exit");
- commands.add("remote_exit_all");
+ commands.add(ActionNames.REMOTE_START);
+ commands.add(ActionNames.REMOTE_STOP);
+ commands.add(ActionNames.REMOTE_START_ALL);
+ commands.add(ActionNames.REMOTE_STOP_ALL);
+ commands.add(ActionNames.REMOTE_EXIT);
+ commands.add(ActionNames.REMOTE_EXIT_ALL);
}
private Map remoteEngines = new HashMap();
@@ -65,15 +69,15 @@
name = name.trim();
}
String action = e.getActionCommand();
- if (action.equals("remote_stop")) {
+ if (action.equals(ActionNames.REMOTE_STOP)) {
doRemoteStop(name);
- } else if (action.equals("remote_start")) {
+ } else if (action.equals(ActionNames.REMOTE_START)) {
popupShouldSave(e);
doRemoteInit(name);
doRemoteStart(name);
- } else if (action.equals("remote_start_all")) {
+ } else if (action.equals(ActionNames.REMOTE_START_ALL)) {
popupShouldSave(e);
- String remote_hosts_string = JMeterUtils.getPropDefault("remote_hosts", "127.0.0.1");
+ String remote_hosts_string = JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
java.util.StringTokenizer st = new java.util.StringTokenizer(remote_hosts_string, ",");
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
@@ -84,17 +88,17 @@
String el = (String) st.nextElement();
doRemoteStart(el.trim());
}
- } else if (action.equals("remote_stop_all")) {
- String remote_hosts_string = JMeterUtils.getPropDefault("remote_hosts", "127.0.0.1");
+ } else if (action.equals(ActionNames.REMOTE_STOP_ALL)) {
+ String remote_hosts_string = JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
java.util.StringTokenizer st = new java.util.StringTokenizer(remote_hosts_string, ",");
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
doRemoteStop(el.trim());
}
- } else if (action.equals("remote_exit")) {
+ } else if (action.equals(ActionNames.REMOTE_EXIT)) {
doRemoteExit(name);
- } else if (action.equals("remote_exit_all")) {
- String remote_hosts_string = JMeterUtils.getPropDefault("remote_hosts", "127.0.0.1");
+ } else if (action.equals(ActionNames.REMOTE_EXIT_ALL)) {
+ String remote_hosts_string = JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
java.util.StringTokenizer st = new java.util.StringTokenizer(remote_hosts_string, ",");
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Remove.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Remove.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Remove.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Remove.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -34,9 +33,10 @@
* @version $Revision$
*/
public class Remove implements Command {
- private static Set commands = new HashSet();
+
+ private static Set commands = new HashSet();
static {
- commands.add("remove");
+ commands.add(ActionNames.REMOVE);
}
/**
@@ -55,7 +55,7 @@
}
public void doAction(ActionEvent e) {
- ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), CheckDirty.REMOVE));
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_REMOVE));
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
TreePath newTreePath = // Save parent node for later
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -52,7 +51,7 @@
private static Set commandSet;
static {
HashSet commands = new HashSet();
- commands.add("sslManager");
+ commands.add(ActionNames.SSL_MANAGER);
SSLManagerCommand.commandSet = Collections.unmodifiableSet(commands);
}
@@ -64,7 +63,7 @@
* if at all possible.
*/
public void doAction(ActionEvent e) {
- if (e.getActionCommand().equals("sslManager")) {
+ if (e.getActionCommand().equals(ActionNames.SSL_MANAGER)) {
this.sslManager();
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java Wed Mar 1 17:06:37 2006
@@ -45,21 +45,13 @@
* @version $Revision$ updated on $Date$
*/
public class Save implements Command {
- transient private static Logger log = LoggingManager.getLoggerForClass();
-
- public final static String SAVE_ALL_AS = "save_all_as";
-
- public final static String SAVE_AS = "save_as";
-
- public final static String SAVE = "save";
-
- // NOTUSED private String chosenFile;
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static {
- commands.add(SAVE_AS);
- commands.add(SAVE_ALL_AS);
- commands.add(SAVE);
+ commands.add(ActionNames.SAVE_AS);
+ commands.add(ActionNames.SAVE_ALL_AS);
+ commands.add(ActionNames.SAVE);
}
/**
@@ -82,14 +74,14 @@
if (!commands.contains(e.getActionCommand())) {
throw new IllegalUserActionException("Invalid user command:" + e.getActionCommand());
}
- if (e.getActionCommand().equals(SAVE_AS)) {
+ if (e.getActionCommand().equals(ActionNames.SAVE_AS)) {
subTree = GuiPackage.getInstance().getCurrentSubTree();
} else {
subTree = GuiPackage.getInstance().getTreeModel().getTestPlan();
}
String updateFile = GuiPackage.getInstance().getTestPlanFile();
- if (!SAVE.equals(e.getActionCommand()) || updateFile == null) {
+ if (!ActionNames.SAVE.equals(e.getActionCommand()) || updateFile == null) {
JFileChooser chooser = FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
.getCurrentNode().getName()
+ ".jmx");
@@ -97,14 +89,14 @@
return;
}
updateFile = chooser.getSelectedFile().getAbsolutePath();
- if (!e.getActionCommand().equals(SAVE_AS)) {
+ if (!e.getActionCommand().equals(ActionNames.SAVE_AS)) {
GuiPackage.getInstance().setTestPlanFile(updateFile);
}
}
// TODO: doesn't putting this here mark the tree as
// saved even though a failure may occur later?
- ActionRouter.getInstance().doActionNow(new ActionEvent(subTree, e.getID(), CheckDirty.SUB_TREE_SAVED));
+ ActionRouter.getInstance().doActionNow(new ActionEvent(subTree, e.getID(), ActionNames.SUB_TREE_SAVED));
try {
convertSubTree(subTree);
} catch (Exception err) {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Wed Mar 1 17:06:37 2006
@@ -41,11 +41,9 @@
*/
public class SaveGraphics implements Command {
- public final static String SAVE_GRAPHICS = "save_graphics"; // $NON-NLS-1$
-
private static Set commands = new HashSet();
static {
- commands.add(SAVE_GRAPHICS);
+ commands.add(ActionNames.SAVE_GRAPHICS);
}
private static final String[] extensions
@@ -72,7 +70,7 @@
if (!commands.contains(e.getActionCommand())) {
throw new IllegalUserActionException("Invalid user command:" + e.getActionCommand());
}
- if (e.getActionCommand().equals(SAVE_GRAPHICS)) {
+ if (e.getActionCommand().equals(ActionNames.SAVE_GRAPHICS)) {
component = GuiPackage.getInstance().getCurrentGui();
// get the JComponent from the visualizer
if (component instanceof Printable) {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Start.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Start.java?rev=382208&r1=382207&r2=382208&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Start.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Start.java Wed Mar 1 17:06:37 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -29,7 +28,6 @@
import org.apache.jmeter.engine.TreeCloner;
import org.apache.jmeter.engine.util.DisabledComponentRemover;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.util.JMeterMenuBar;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
@@ -45,9 +43,9 @@
private static Set commands = new HashSet();
static {
- commands.add(JMeterMenuBar.ACTION_START);
- commands.add(JMeterMenuBar.ACTION_STOP);
- commands.add(JMeterMenuBar.ACTION_SHUTDOWN);
+ commands.add(ActionNames.ACTION_START);
+ commands.add(ActionNames.ACTION_STOP);
+ commands.add(ActionNames.ACTION_SHUTDOWN);
}
private StandardJMeterEngine engine;
@@ -68,16 +66,16 @@
}
public void doAction(ActionEvent e) {
- if (e.getActionCommand().equals(JMeterMenuBar.ACTION_START)) {
+ if (e.getActionCommand().equals(ActionNames.ACTION_START)) {
popupShouldSave(e);
startEngine();
- } else if (e.getActionCommand().equals(JMeterMenuBar.ACTION_STOP)) {
+ } else if (e.getActionCommand().equals(ActionNames.ACTION_STOP)) {
if (engine != null) {
GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
engine.stopTest();
engine = null;
}
- } else if (e.getActionCommand().equals(JMeterMenuBar.ACTION_SHUTDOWN)) {
+ } else if (e.getActionCommand().equals(ActionNames.ACTION_SHUTDOWN)) {
if (engine != null) {
GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
engine.askThreadsToStop();
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org