mstover1 2002/08/19 15:33:14
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter/gui
AbstractJMeterGuiComponent.java
JMeterGUIComponent.java
src/core/org/apache/jmeter/gui/action AbstractAction.java
src/core/org/apache/jmeter/gui/tree JMeterCellRenderer.java
JMeterTreeNode.java
src/core/org/apache/jmeter/gui/util MenuFactory.java
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
Added: src/core/org/apache/jmeter/gui/action EnableComponent.java
Log:
Added ability to disable/enable test components.
Revision Changes Path
1.2 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ViewResultsFullVisualizer.java 11 Aug 2002 19:24:41 -0000 1.1
+++ ViewResultsFullVisualizer.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -299,7 +299,7 @@
icon = new ImageIcon(responseBytes);
}
if(response != null)
- {
+ {
JTextArea textArea = new JTextArea();
textArea.setText(response);
gbc.gridx = 0;
1.2 +12 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Index: AbstractJMeterGuiComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractJMeterGuiComponent.java 11 Aug 2002 19:24:43 -0000 1.1
+++ AbstractJMeterGuiComponent.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -15,6 +15,8 @@
public abstract class AbstractJMeterGuiComponent
extends JPanel
implements JMeterGUIComponent {
+
+ private boolean enabled = true;
public AbstractJMeterGuiComponent() {
namePanel = new NamePanel();
@@ -26,6 +28,16 @@
*/
public void setName(String name) {
namePanel.setName(name);
+ }
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ public void setEnabled(boolean e)
+ {
+ enabled = e;
}
/**
1.2 +9 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
Index: JMeterGUIComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterGUIComponent.java 11 Aug 2002 19:24:43 -0000 1.1
+++ JMeterGUIComponent.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -48,6 +48,14 @@
*@return !ToDo (Return description)
***************************************/
public TestElement createTestElement();
+
+ /**
+ * Test GUI elements can be turned disabled, in which case
+ * they do not become part of the test when run.
+ */
+ public boolean isEnabled();
+
+ public void setEnabled(boolean enabled);
/****************************************
* !ToDo (Method description)
1.2 +10 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAction.java 11 Aug 2002 19:24:43 -0000 1.1
+++ AbstractAction.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -36,9 +36,16 @@
while (iter.hasNext())
{
JMeterGUIComponent item = (JMeterGUIComponent)iter.next();
- convertSubTree(tree.get(item));
- TestElement testElement = item.createTestElement();
- tree.replace(item,testElement);
+ if(item.isEnabled())
+ {
+ convertSubTree(tree.get(item));
+ TestElement testElement = item.createTestElement();
+ tree.replace(item,testElement);
+ }
+ else
+ {
+ tree.remove(item);
+ }
}
}
1.1
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/EnableComponent.java
Index: EnableComponent.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.HashSet;
import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
/**
* @author Administrator
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public class EnableComponent implements Command {
public static final String ENABLE = "enable";
public static final String DISABLE = "disable";
private static Set commands = new HashSet();
static
{
commands.add(ENABLE);
commands.add(DISABLE);
}
/**
* @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
*/
public void doAction(ActionEvent e) {
if(e.getActionCommand().equals(ENABLE))
{
GuiPackage.getInstance().getTreeListener().getCurrentNode().setEnabled(true);
}
else if(e.getActionCommand().equals(DISABLE))
{
GuiPackage.getInstance().getTreeListener().getCurrentNode().setEnabled(false);
}
}
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
public Set getActionNames() {
return commands;
}
}
1.2 +1 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
Index: JMeterCellRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterCellRenderer.java 11 Aug 2002 19:24:44 -0000 1.1
+++ JMeterCellRenderer.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -90,6 +90,7 @@
{
super.getTreeCellRendererComponent(tree,((JMeterGUIComponent)value).getName(),
sel,expanded,leaf,row,hasFocus);
+ this.setEnabled(((JMeterGUIComponent)value).isEnabled());
ImageIcon ic = ((JMeterTreeNode)value).getIcon();
if (ic!=null)
setIcon(ic);
1.2 +11 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Index: JMeterTreeNode.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterTreeNode.java 11 Aug 2002 19:24:44 -0000 1.1
+++ JMeterTreeNode.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -85,6 +85,16 @@
super(userObj);
}
+ public boolean isEnabled()
+ {
+ return ((JMeterGUIComponent)getUserObject()).isEnabled();
+ }
+
+ public void setEnabled(boolean enabled)
+ {
+ ((JMeterGUIComponent)getUserObject()).setEnabled(enabled);
+ }
+
public ImageIcon getIcon()
{
return null;
1.2 +35 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MenuFactory.java 11 Aug 2002 19:24:44 -0000 1.1
+++ MenuFactory.java 19 Aug 2002 22:33:13 -0000 1.2
@@ -52,12 +52,27 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/package org.apache.jmeter.gui.util;
-import java.util.*;
-import javax.swing.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.MenuElement;
+
+import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.util.*;
-import org.apache.log4j.*;
+import org.apache.jmeter.util.ClassFinder;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.log4j.Category;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -190,6 +205,21 @@
addSeparator(menu);
menu.add(makeMenuItem(JMeterUtils.getResString("open"), "Open",
JMeterUtils.getResString("open")));
menu.add(makeMenuItem(JMeterUtils.getResString("save"), "Save",
"save"));
+ JMenuItem disabled =
makeMenuItem(JMeterUtils.getResString("disable"),"Disable","disable");
+ JMenuItem enabled =
makeMenuItem(JMeterUtils.getResString("enable"),"Enable","enable");
+ boolean isEnabled =
GuiPackage.getInstance().getTreeListener().getCurrentNode().isEnabled();
+ if(isEnabled)
+ {
+ disabled.setEnabled(true);
+ enabled.setEnabled(false);
+ }
+ else
+ {
+ disabled.setEnabled(false);
+ enabled.setEnabled(true);
+ }
+ menu.add(enabled);
+ menu.add(disabled);
}
/****************************************
1.6 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages.properties 18 Aug 2002 03:12:48 -0000 1.5
+++ messages.properties 19 Aug 2002 22:33:14 -0000 1.6
@@ -285,4 +285,6 @@
add_user=Add User
delete_parameter=Delete Variable
delete_user=Delete User
-column_delete_disallowed=Deleting this column is not permitted
\ No newline at end of file
+column_delete_disallowed=Deleting this column is not permitted
+enable=Activate
+disable=Disable
\ No newline at end of file
1.7 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- messages_de.properties 18 Aug 2002 03:12:48 -0000 1.6
+++ messages_de.properties 19 Aug 2002 22:33:14 -0000 1.7
@@ -280,4 +280,6 @@
add_user=Add User
delete_parameter=Delete Variable
delete_user=Delete User
-column_delete_disallowed=Deleting this column is not permitted
\ No newline at end of file
+column_delete_disallowed=Deleting this column is not permitted
+enable=Activate
+disable=Disable
\ No newline at end of file
1.6 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_ja.properties 18 Aug 2002 03:12:48 -0000 1.5
+++ messages_ja.properties 19 Aug 2002 22:33:14 -0000 1.6
@@ -280,4 +280,6 @@
add_user=Add User
delete_parameter=Delete Variable
delete_user=Delete User
-column_delete_disallowed=Deleting this column is not permitted
\ No newline at end of file
+column_delete_disallowed=Deleting this column is not permitted
+enable=Activate
+disable=Disable
\ No newline at end of file
1.6 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_no.properties 18 Aug 2002 03:12:48 -0000 1.5
+++ messages_no.properties 19 Aug 2002 22:33:14 -0000 1.6
@@ -272,4 +272,6 @@
add_user=Add User
delete_parameter=Delete Variable
delete_user=Delete User
-column_delete_disallowed=Deleting this column is not permitted
\ No newline at end of file
+column_delete_disallowed=Deleting this column is not permitted
+enable=Activate
+disable=Disable
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
