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 ms...@apache.org on 2003/05/12 17:20:19 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui CounterConfigGui.java UserParametersGui.java
mstover1 2003/05/12 08:20:19
Modified: src/components/org/apache/jmeter/modifiers
CounterConfig.java UserParameters.java
src/components/org/apache/jmeter/modifiers/gui
CounterConfigGui.java UserParametersGui.java
Log:
UP and Counter shouldn't be config elements
Revision Changes Path
1.12 +2 -2 jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Index: CounterConfig.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CounterConfig.java 2 May 2003 21:38:09 -0000 1.11
+++ CounterConfig.java 12 May 2003 15:20:17 -0000 1.12
@@ -1,10 +1,10 @@
package org.apache.jmeter.modifiers;
import java.io.Serializable;
-import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.engine.util.NoThreadClone;
+import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.threads.JMeterContextService;
@@ -19,7 +19,7 @@
* Window>Preferences>Java>Templates.
*/
public class CounterConfig
- extends ConfigTestElement
+ extends AbstractTestElement
implements Serializable, LoopIterationListener,NoThreadClone
{
private static Logger log = LoggingManager.getLoggerFor(JMeterUtils.ELEMENTS);
1.16 +2 -22 jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
Index: UserParameters.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- UserParameters.java 12 May 2003 15:13:46 -0000 1.15
+++ UserParameters.java 12 May 2003 15:20:17 -0000 1.16
@@ -4,10 +4,10 @@
import java.util.Collection;
import java.util.LinkedList;
-import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.processor.PreProcessor;
+import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.CollectionProperty;
@@ -21,7 +21,7 @@
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
-public class UserParameters extends ConfigTestElement implements Serializable, PreProcessor, LoopIterationListener
+public class UserParameters extends AbstractTestElement implements Serializable, PreProcessor, LoopIterationListener
{
public static final String NAMES = "UserParameters.names";
@@ -156,26 +156,6 @@
UserParameters up = (UserParameters) super.clone();
up.lock = lock;
return up;
- }
-
- /* (non-Javadoc)
- * @see org.apache.jmeter.testelement.TestElement#recoverRunningVersion()
- */
- public void recoverRunningVersion()
- {
- log.warn("Recover UP running version: " + this);
- // TODO Auto-generated method stub
- super.recoverRunningVersion();
- }
-
- /* (non-Javadoc)
- * @see org.apache.jmeter.testelement.TestElement#setRunningVersion(boolean)
- */
- public void setRunningVersion(boolean runningVersion)
- {
- log.warn("set UP running version to: " + runningVersion + " for " + this);
- // TODO Auto-generated method stub
- super.setRunningVersion(runningVersion);
}
/* (non-Javadoc)
1.6 +2 -2 jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Index: CounterConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CounterConfigGui.java 20 Apr 2003 18:13:11 -0000 1.5
+++ CounterConfigGui.java 12 May 2003 15:20:17 -0000 1.6
@@ -1,14 +1,14 @@
package org.apache.jmeter.modifiers.gui;
import javax.swing.JCheckBox;
-import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.modifiers.CounterConfig;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JLabeledTextField;
import org.apache.jorphan.gui.layout.VerticalLayout;
-public class CounterConfigGui extends AbstractConfigGui
+public class CounterConfigGui extends AbstractPreProcessorGui
{
private JLabeledTextField startField, incrField, endField, varNameField;
private JCheckBox perUserField;
1.10 +2 -2 jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
Index: UserParametersGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UserParametersGui.java 7 May 2003 15:23:15 -0000 1.9
+++ UserParametersGui.java 12 May 2003 15:20:17 -0000 1.10
@@ -19,10 +19,10 @@
import javax.swing.ListSelectionModel;
import javax.swing.table.TableCellEditor;
-import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.gui.util.PowerTableModel;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.modifiers.UserParameters;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -30,7 +30,7 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-public class UserParametersGui extends AbstractConfigGui {
+public class UserParametersGui extends AbstractPreProcessorGui {
private static Logger log = LoggingManager.getLoggerFor(JMeterUtils.GUI);
private String THREAD_COLUMNS = JMeterUtils.getResString("user");
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org