mstover1 2002/09/20 11:23:31
Modified: src/components/org/apache/jmeter/control
InterleaveControl.java RandomController.java
src/components/org/apache/jmeter/control/gui
RandomControlGui.java
Log:
Adding style choice to RandomController
Revision Changes Path
1.3 +9 -10
jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InterleaveControl.java 20 Aug 2002 18:45:52 -0000 1.2
+++ InterleaveControl.java 20 Sep 2002 18:23:31 -0000 1.3
@@ -133,20 +133,22 @@
protected void removeCurrentController()
{
- if(getStyle() == NEW_STYLE)
- {
- interleave = true;
- }
+ setInterleave(NEW_STYLE);
super.removeCurrentController();
}
protected void incrementCurrent()
{
- if(getStyle() == NEW_STYLE)
+ setInterleave(NEW_STYLE);
+ super.incrementCurrent();
+ }
+
+ protected void setInterleave(int style)
+ {
+ if(getStyle() == style)
{
interleave = true;
}
- super.incrementCurrent();
}
public void setStyle(int style)
@@ -161,10 +163,7 @@
public Sampler next()
{
- if(getStyle() == DEFAULT_STYLE)
- {
- interleave = true;
- }
+ setInterleave(DEFAULT_STYLE);
TestElement controller = getCurrentController();
if(controller == null)
{
1.2 +1 -0
jakarta-jmeter/src/components/org/apache/jmeter/control/RandomController.java
Index: RandomController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/RandomController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RandomController.java 11 Aug 2002 19:24:40 -0000 1.1
+++ RandomController.java 20 Sep 2002 18:23:31 -0000 1.2
@@ -82,6 +82,7 @@
protected void incrementCurrent()
{
+ setInterleave(NEW_STYLE);
current = rand.nextInt(this.getSubControllers().size());
}
}
1.2 +28 -2
jakarta-jmeter/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
Index: RandomControlGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/RandomControlGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RandomControlGui.java 11 Aug 2002 19:24:40 -0000 1.1
+++ RandomControlGui.java 20 Sep 2002 18:23:31 -0000 1.2
@@ -55,12 +55,14 @@
package org.apache.jmeter.control.gui;
import java.awt.Font;
+import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
+
+import org.apache.jmeter.control.InterleaveControl;
import org.apache.jmeter.control.RandomController;
-import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.util.VerticalLayout;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -76,6 +78,7 @@
public class RandomControlGui extends AbstractControllerGui
{
+ JCheckBox style;
/****************************************
* !ToDo (Constructor description)
***************************************/
@@ -93,8 +96,29 @@
{
RandomController ic = new RandomController();
configureTestElement(ic);
+ if(style.isSelected())
+ {
+ ic.setStyle(ic.DEFAULT_STYLE);
+ }
+ else
+ {
+ ic.setStyle(ic.NEW_STYLE);
+ }
return ic;
}
+
+ public void configure(TestElement el)
+ {
+ super.configure(el);
+ if(((RandomController)el).getStyle() ==
InterleaveControl.DEFAULT_STYLE)
+ {
+ style.setSelected(true);
+ }
+ else
+ {
+ style.setSelected(false);
+ }
+ }
/****************************************
* !ToDoo (Method description)
@@ -128,5 +152,7 @@
mainPanel.add(getNamePanel());
this.add(mainPanel);
+ style = new
JCheckBox(JMeterUtils.getResString("ignore_subcontrollers"));
+ this.add(style);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
