Author: sebb
Date: Fri May 4 03:10:32 2007
New Revision: 535147
URL: http://svn.apache.org/viewvc?view=rev&rev=535147
Log:
Bug 42325 - Implement the "clear" method for the LogicControllers
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
Fri May 4 03:10:32 2007
@@ -34,9 +34,6 @@
* The user interface for a foreach controller which specifies that its
* subcomponents should be executed some number of times in a loop. This
* component can be used standalone or embedded into some other component.
- * Copyright: 2000
- *
- * @version $Revision$ on $Date
*/
public class ForeachControlPanel extends AbstractControllerGui {
@@ -64,10 +61,10 @@
private boolean displayName = true;
/** The name of the infinite checkbox component. */
- private static final String INPUTVAL = "Input Field";
+ private static final String INPUTVAL = "Input Field"; // $NON-NLS-1$
/** The name of the loops field component. */
- private static final String RETURNVAL = "Return Field";
+ private static final String RETURNVAL = "Return Field"; // $NON-NLS-1$
/**
* Create a new LoopControlPanel as a standalone component.
@@ -121,19 +118,31 @@
if (inputVal.getText().length() > 0) {
((ForeachController)
lc).setInputVal(inputVal.getText());
} else {
- ((ForeachController) lc).setInputVal("");
+ ((ForeachController) lc).setInputVal(""); //
$NON-NLS-1$
}
if (returnVal.getText().length() > 0) {
((ForeachController)
lc).setReturnVal(returnVal.getText());
} else {
- ((ForeachController) lc).setReturnVal("");
+ ((ForeachController) lc).setReturnVal(""); //
$NON-NLS-1$
}
((ForeachController)
lc).setUseSeparator(useSeparator.isSelected());
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ inputVal.setText(""); // $NON-NLS-1$
+ returnVal.setText(""); // $NON-NLS-1$
+ useSeparator.setSelected(true);
+ }
+
public String getLabelResource() {
- return "foreach_controller_title";
+ return "foreach_controller_title"; // $NON-NLS-1$
}
/**
@@ -173,12 +182,12 @@
VerticalPanel loopPanel = new VerticalPanel();
// LOOP LABEL
- JLabel inputValLabel = new
JLabel(JMeterUtils.getResString("foreach_input"));
- JLabel returnValLabel = new
JLabel(JMeterUtils.getResString("foreach_output"));
+ JLabel inputValLabel = new
JLabel(JMeterUtils.getResString("foreach_input")); // $NON-NLS-1$
+ JLabel returnValLabel = new
JLabel(JMeterUtils.getResString("foreach_output")); // $NON-NLS-1$
// TEXT FIELD
JPanel inputValSubPanel = new JPanel(new BorderLayout(5, 0));
- inputVal = new JTextField("", 5);
+ inputVal = new JTextField("", 5); // $NON-NLS-1$
inputVal.setName(INPUTVAL);
inputValLabel.setLabelFor(inputVal);
inputValSubPanel.add(inputValLabel, BorderLayout.WEST);
@@ -186,14 +195,14 @@
// TEXT FIELD
JPanel returnValSubPanel = new JPanel(new BorderLayout(5, 0));
- returnVal = new JTextField("", 5);
+ returnVal = new JTextField("", 5); // $NON-NLS-1$
returnVal.setName(RETURNVAL);
returnValLabel.setLabelFor(returnVal);
returnValSubPanel.add(returnValLabel, BorderLayout.WEST);
returnValSubPanel.add(returnVal, BorderLayout.CENTER);
// Checkbox
- useSeparator = new
JCheckBox(JMeterUtils.getResString("foreach_use_separator"), true);
+ useSeparator = new
JCheckBox(JMeterUtils.getResString("foreach_use_separator"), true); //
$NON-NLS-1$
loopPanel.add(inputValSubPanel);
loopPanel.add(returnValSubPanel);
@@ -201,5 +210,4 @@
return loopPanel;
}
-
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
Fri May 4 03:10:32 2007
@@ -25,9 +25,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- * @version $Revision$ on $Date$
- */
public class InterleaveControlGui extends AbstractControllerGui {
private JCheckBox style;
@@ -64,8 +61,16 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+ style.setSelected(false);
+ }
+
public String getLabelResource() {
- return "interleave_control_title";
+ return "interleave_control_title"; // $NON-NLS-1$
}
private void init() {
@@ -74,7 +79,7 @@
add(makeTitlePanel());
- style = new
JCheckBox(JMeterUtils.getResString("ignore_subcontrollers"));
+ style = new
JCheckBox(JMeterUtils.getResString("ignore_subcontrollers")); // $NON-NLS-1$
add(style);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
Fri May 4 03:10:32 2007
@@ -26,9 +26,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- * @version $Revision$ on $Date$
- */
public class RandomControlGui extends AbstractControllerGui {
private JCheckBox style;
@@ -56,6 +53,14 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+ style.setSelected(false);
+ }
+
public void configure(TestElement el) {
super.configure(el);
if (((RandomController) el).getStyle() ==
InterleaveControl.IGNORE_SUB_CONTROLLERS) {
@@ -66,7 +71,7 @@
}
public String getLabelResource() {
- return "random_control_title";
+ return "random_control_title"; // $NON-NLS-1$
}
private void init() {
@@ -74,7 +79,7 @@
setBorder(makeBorder());
add(makeTitlePanel());
- style = new
JCheckBox(JMeterUtils.getResString("ignore_subcontrollers"));
+ style = new
JCheckBox(JMeterUtils.getResString("ignore_subcontrollers")); // $NON-NLS-1$
add(style);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
Fri May 4 03:10:32 2007
@@ -28,11 +28,8 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @version $Revision$ on $Date$
- */
public class SwitchControllerGui extends AbstractControllerGui {
- private static final String SWITCH_LABEL = "switch_controller_label";
+ private static final String SWITCH_LABEL = "switch_controller_label";
// $NON-NLS-1$
private JTextField switchValue;
@@ -56,13 +53,21 @@
((SwitchController) ic).setSelection(switchValue.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+ switchValue.setText(""); // $NON-NLS-1$
+ }
+
public void configure(TestElement el) {
super.configure(el);
switchValue.setText(((SwitchController) el).getSelection());
}
public String getLabelResource() {
- return "switch_controller_title";
+ return "switch_controller_title"; // $NON-NLS-1$
}
private void init() {
@@ -78,11 +83,10 @@
private JPanel createSwitchPanel() {
JPanel switchPanel = new JPanel(new BorderLayout(5, 0));
JLabel selectionLabel = new
JLabel(JMeterUtils.getResString(SWITCH_LABEL));
- switchValue = new JTextField("");
+ switchValue = new JTextField(""); // $NON-NLS-1$
selectionLabel.setLabelFor(switchValue);
switchPanel.add(selectionLabel, BorderLayout.WEST);
switchPanel.add(switchValue, BorderLayout.CENTER);
return switchPanel;
}
-
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
Fri May 4 03:10:32 2007
@@ -35,9 +35,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- * @version $Revision$ on $Date$
- */
public class ThroughputControllerGui extends AbstractControllerGui {
private JComboBox styleBox;
@@ -49,15 +46,15 @@
private boolean isPerThread = true;
- private String BYNUMBER_LABEL =
JMeterUtils.getResString("throughput_control_bynumber_label");
+ private String BYNUMBER_LABEL =
JMeterUtils.getResString("throughput_control_bynumber_label"); // $NON-NLS-1$
- private String BYPERCENT_LABEL =
JMeterUtils.getResString("throughput_control_bypercent_label");
+ private String BYPERCENT_LABEL =
JMeterUtils.getResString("throughput_control_bypercent_label"); // $NON-NLS-1$
- private String THROUGHPUT_LABEL =
JMeterUtils.getResString("throughput_control_tplabel");
+ private String THROUGHPUT_LABEL =
JMeterUtils.getResString("throughput_control_tplabel"); // $NON-NLS-1$
- private String THROUGHPUT = "Througput Field";
+ private String THROUGHPUT = "Througput Field"; // $NON-NLS-1$
- private String PERTHREAD_LABEL =
JMeterUtils.getResString("throughput_control_perthread_label");
+ private String PERTHREAD_LABEL =
JMeterUtils.getResString("throughput_control_perthread_label"); // $NON-NLS-1$
public ThroughputControllerGui() {
init();
@@ -93,6 +90,16 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+ styleBox.setSelectedIndex(0);
+ throughput.setText("1"); // $NON-NLS-1$
+ perthread.setSelected(true);
+ }
+
public void configure(TestElement el) {
super.configure(el);
if (((ThroughputController) el).getStyle() ==
ThroughputController.BYNUMBER) {
@@ -138,7 +145,7 @@
throughput = new JTextField(5);
tpPanel.add(throughput);
throughput.setName(THROUGHPUT);
- throughput.setText("1");
+ throughput.setText("1"); // $NON-NLS-1$
// throughput.addActionListener(this);
tpPanel.add(throughput);
add(tpPanel);
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=535147&r1=535146&r2=535147
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Fri May 4 03:10:32 2007
@@ -223,6 +223,7 @@
<li>Bug 30120 - Name of simple controller is resetted if a new simple
controller is added as child</li>
<li>Bug 41078 - merge results in name change of test plan</li>
<li>Bug 40077 - Creating new Elements copies values from Existing elements</li>
+<li>Bug 42325 - Implement the "clear" method for the LogicControllers</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
