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 2004/03/05 02:32:37 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/control/gui InterleaveControlGui.java ThroughputControllerGui.java TransactionControllerGui.java ModuleControllerGui.java RandomControlGui.java ForeachControlPanel.java RandomOrderControllerGui.java OnceOnlyControllerGui.java
sebb 2004/03/04 17:32:37
Modified: src/components/org/apache/jmeter/control/gui
InterleaveControlGui.java
ThroughputControllerGui.java
TransactionControllerGui.java
ModuleControllerGui.java RandomControlGui.java
ForeachControlPanel.java
RandomOrderControllerGui.java
OnceOnlyControllerGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.15 +4 -5 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
Index: InterleaveControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- InterleaveControlGui.java 13 Feb 2004 01:31:55 -0000 1.14
+++ InterleaveControlGui.java 5 Mar 2004 01:32:37 -0000 1.15
@@ -26,8 +26,7 @@
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class InterleaveControlGui extends AbstractControllerGui
{
@@ -78,9 +77,9 @@
}
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("interleave_control_title");
+ return "interleave_control_title";
}
private void init()
1.10 +4 -5 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
Index: ThroughputControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ThroughputControllerGui.java 13 Feb 2004 02:40:54 -0000 1.9
+++ ThroughputControllerGui.java 5 Mar 2004 01:32:37 -0000 1.10
@@ -36,8 +36,7 @@
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class ThroughputControllerGui extends AbstractControllerGui
{
@@ -126,9 +125,9 @@
perthread.setSelected(((ThroughputController) el).isPerThread());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("throughput_control_title");
+ return "throughput_control_title";
}
private void init()
1.3 +4 -7 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/TransactionControllerGui.java
Index: TransactionControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/TransactionControllerGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransactionControllerGui.java 13 Feb 2004 02:40:54 -0000 1.2
+++ TransactionControllerGui.java 5 Mar 2004 01:32:37 -0000 1.3
@@ -22,13 +22,11 @@
import org.apache.jmeter.control.TransactionController;
import org.apache.jmeter.control.gui.AbstractControllerGui;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
/**
* A Transaction controller component.
*
- * @author sebb AT apache DOT org
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class TransactionControllerGui extends AbstractControllerGui
{
@@ -54,10 +52,9 @@
configureTestElement(el);
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("transaction_controller_title")+" (ALPHA code)";
+ return "transaction_controller_title";
}
/**
1.16 +4 -8 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
Index: ModuleControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ModuleControllerGui.java 20 Feb 2004 01:03:07 -0000 1.15
+++ ModuleControllerGui.java 5 Mar 2004 01:32:37 -0000 1.16
@@ -42,8 +42,7 @@
/**
* ModuleController Gui.
*
- * @author Thad Smith
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class ModuleControllerGui
extends AbstractControllerGui /*implements UnsharedComponent*/
@@ -65,12 +64,9 @@
init();
}
- /* (non-Javadoc)
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("module_controller_title");
+ return "module_controller_title";
}
/* (non-Javadoc)
1.13 +4 -10 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RandomControlGui.java 13 Feb 2004 01:31:55 -0000 1.12
+++ RandomControlGui.java 5 Mar 2004 01:32:37 -0000 1.13
@@ -27,8 +27,7 @@
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class RandomControlGui extends AbstractControllerGui
{
@@ -79,14 +78,9 @@
}
}
- /****************************************
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- ***************************************/
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("random_control_title");
+ return "random_control_title";
}
private void init()
1.4 +4 -7 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
Index: ForeachControlPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ForeachControlPanel.java 16 Feb 2004 23:59:14 -0000 1.3
+++ ForeachControlPanel.java 5 Mar 2004 01:32:37 -0000 1.4
@@ -34,9 +34,7 @@
* used standalone or embedded into some other component.
* Copyright: 2000
*
- * @author Dolf Smits
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date
*/
public class ForeachControlPanel
@@ -141,10 +139,9 @@
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("foreach_controller_title");
+ return "foreach_controller_title";
}
/**
1.4 +4 -9 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java
Index: RandomOrderControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RandomOrderControllerGui.java 13 Feb 2004 01:29:25 -0000 1.3
+++ RandomOrderControllerGui.java 5 Mar 2004 01:32:37 -0000 1.4
@@ -18,23 +18,18 @@
import org.apache.jmeter.control.RandomOrderController;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
/**
* GUI for RandomOrderController.
*
- * @author Mike Verdone
* @version $Revision$ updated on $Date$
*/
public class RandomOrderControllerGui extends LogicControllerGui
{
- /* (non-Javadoc)
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("random_order_control_title");
+ return "random_order_control_title";
}
/* (non-Javadoc)
1.10 +4 -6 jakarta-jmeter/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
Index: OnceOnlyControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OnceOnlyControllerGui.java 13 Feb 2004 01:31:55 -0000 1.9
+++ OnceOnlyControllerGui.java 5 Mar 2004 01:32:37 -0000 1.10
@@ -20,12 +20,10 @@
import org.apache.jmeter.control.OnceOnlyController;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class OnceOnlyControllerGui extends AbstractControllerGui
{
@@ -50,9 +48,9 @@
configureTestElement(oc);
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("once_only_controller_title");
+ return "once_only_controller_title";
}
private void init()
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org