sebb 2004/03/04 17:34:05
Modified: src/core/org/apache/jmeter/control/gui TestPlanGui.java
IfControllerPanel.java LoopControlPanel.java
AbstractControllerGui.java LogicControllerGui.java
WorkBenchGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.18 +4 -6
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestPlanGui.java 14 Feb 2004 03:34:30 -0000 1.17
+++ TestPlanGui.java 5 Mar 2004 01:34:05 -0000 1.18
@@ -44,8 +44,7 @@
* JMeter GUI component representing the test plan which will be executed when
* the test is run.
*
- * @author Michael Stover
- * @version $Revision$ Last Updated: $date$
+ * @version $Revision$ Last Updated: $Date$
*/
public class TestPlanGui extends AbstractJMeterGuiComponent
{
@@ -126,10 +125,9 @@
}
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("test_plan");
+ return "test_plan";
}
/**
1.3 +4 -6
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
Index: IfControllerPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IfControllerPanel.java 14 Feb 2004 03:34:30 -0000 1.2
+++ IfControllerPanel.java 5 Mar 2004 01:34:05 -0000 1.3
@@ -45,7 +45,6 @@
implements ActionListener
{
- private static final String CONDITION_TITLE = "if_controller_title";
private static final String CONDITION_LABEL = "if_controller_label";
/**
@@ -137,9 +136,8 @@
new FocusRequester(theCondition);
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel() {
- return JMeterUtils.getResString(CONDITION_TITLE);
+ public String getLabelResource() {
+ return "if_controller_title";
}
/**
1.13 +4 -6
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
Index: LoopControlPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LoopControlPanel.java 14 Feb 2004 03:34:30 -0000 1.12
+++ LoopControlPanel.java 5 Mar 2004 01:34:05 -0000 1.13
@@ -38,8 +38,7 @@
* should be executed some number of times in a loop. This component can be
* used standalone or embedded into some other component.
*
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class LoopControlPanel
@@ -162,10 +161,9 @@
}
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("loop_controller_title");
+ return "loop_controller_title";
}
/**
1.5 +2 -4
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java
Index: AbstractControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractControllerGui.java 14 Feb 2004 03:34:30 -0000 1.4
+++ AbstractControllerGui.java 5 Mar 2004 01:34:05 -0000 1.5
@@ -27,10 +27,8 @@
/**
* This is the base class for JMeter GUI components which manage controllers.
- * Copyright: 2000,2003
*
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public abstract class AbstractControllerGui extends AbstractJMeterGuiComponent
{
1.9 +5 -7
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
Index: LogicControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LogicControllerGui.java 13 Feb 2004 02:21:37 -0000 1.8
+++ LogicControllerGui.java 5 Mar 2004 01:34:05 -0000 1.9
@@ -21,13 +21,11 @@
import org.apache.jmeter.control.GenericController;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
/**
* A generic controller component.
*
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class LogicControllerGui extends AbstractControllerGui
{
@@ -53,10 +51,10 @@
configureTestElement(el);
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+
+ public String getLabelResource()
{
- return JMeterUtils.getResString("logic_controller_title");
+ return "logic_controller_title";
}
/**
1.13 +4 -6
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
Index: WorkBenchGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WorkBenchGui.java 13 Feb 2004 02:40:55 -0000 1.12
+++ WorkBenchGui.java 5 Mar 2004 01:34:05 -0000 1.13
@@ -33,8 +33,7 @@
* JMeter GUI component representing a work bench where users can make
* preparations for the test plan.
*
- * @author Kevin Hammond
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class WorkBenchGui extends AbstractJMeterGuiComponent
{
@@ -116,10 +115,9 @@
return menu;
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("workbench_title");
+ return "workbench_title";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
