sebb 2004/03/04 17:38:02
Modified: src/protocol/http/org/apache/jmeter/protocol/http/gui
AuthPanel.java CookiePanel.java HeaderPanel.java
src/protocol/http/org/apache/jmeter/protocol/http/control/gui
SoapSamplerGui.java AccessLogSamplerGui.java
RecordController.java HttpTestSampleGui.java
WebServiceSamplerGui.java
src/protocol/http/org/apache/jmeter/protocol/http/config/gui
HttpDefaultsGui.java MultipartUrlConfigGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.15 +6 -7
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Index: AuthPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AuthPanel.java 12 Feb 2004 00:07:12 -0000 1.14
+++ AuthPanel.java 5 Mar 2004 01:38:01 -0000 1.15
@@ -55,7 +55,6 @@
* Sampler. It also understands how to get AuthManagers for the files that the
* user selects.
*
- * @author unattributed
* @version $Revision$ Last updated: $Date$
*/
public class AuthPanel extends AbstractConfigGui implements ActionListener
@@ -113,9 +112,9 @@
tableModel.manager.addTestElement((AuthManager) el.clone());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("auth_manager_title");
+ return "auth_manager_title";
}
/**
1.18 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Index: CookiePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CookiePanel.java 12 Feb 2004 00:07:12 -0000 1.17
+++ CookiePanel.java 5 Mar 2004 01:38:02 -0000 1.18
@@ -106,9 +106,9 @@
init();
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("cookie_manager_title");
+ return "cookie_manager_title";
}
public void actionPerformed(ActionEvent e)
1.15 +6 -6
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Index: HeaderPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HeaderPanel.java 12 Feb 2004 00:07:12 -0000 1.14
+++ HeaderPanel.java 5 Mar 2004 01:38:02 -0000 1.15
@@ -113,9 +113,9 @@
tableModel.manager.addTestElement((HeaderManager) el);
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("header_manager_title");
+ return "header_manager_title";
}
/**
1.12 +4 -10
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
Index: SoapSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SoapSamplerGui.java 12 Feb 2004 00:07:12 -0000 1.11
+++ SoapSamplerGui.java 5 Mar 2004 01:38:02 -0000 1.12
@@ -31,13 +31,10 @@
import org.apache.jorphan.gui.JLabeledTextField;
/**
- * @author mstover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class SoapSamplerGui extends AbstractSamplerGui
{
- private static final String label =
- JMeterUtils.getResString("soap_sampler_title");
private JLabeledTextField urlField;
private JLabeledTextArea soapXml;
@@ -46,12 +43,9 @@
init();
}
- /* (non-Javadoc)
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return label;
+ return "soap_sampler_title";
}
/* (non-Javadoc)
1.11 +5 -8
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AccessLogSamplerGui.java
Index: AccessLogSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AccessLogSamplerGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AccessLogSamplerGui.java 12 Feb 2004 00:07:12 -0000 1.10
+++ AccessLogSamplerGui.java 5 Mar 2004 01:38:02 -0000 1.11
@@ -70,7 +70,6 @@
* <br>
* Created on: Jun 26, 2003
*
- * @author Peter Lin
* @version $Id$
*/
public class AccessLogSamplerGui
@@ -78,7 +77,6 @@
implements ChangeListener, UnsharedComponent
{
- private static final String label = JMeterUtils.getResString("log_sampler");
JLabeledTextField parserClassName =
new JLabeledTextField(JMeterUtils.getResString("log_parser"));
JLabeledTextField generatorClassName =
@@ -119,9 +117,9 @@
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
- public String getStaticLabel()
+ public String getLabelResource()
{
- return label;
+ return "log_sampler";
}
/**
@@ -196,7 +194,7 @@
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
// TITLE
- JLabel panelTitleLabel = new JLabel(label);
+ JLabel panelTitleLabel = new JLabel(getStaticLabel());
Font curFont = panelTitleLabel.getFont();
int curFontSize = curFont.getSize();
curFontSize += 4;
@@ -320,7 +318,6 @@
/**
* Added basic TestCase for AccessLogSamplerGui. It does
* the same test at HttpTestSampleGui.java.
- * @author peter lin
*/
public static class Test extends TestCase
{
1.6 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java
Index: RecordController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RecordController.java 12 Feb 2004 00:07:12 -0000 1.5
+++ RecordController.java 5 Mar 2004 01:38:02 -0000 1.6
@@ -28,9 +28,9 @@
*/
public class RecordController extends LogicControllerGui
{
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("record_controller_title");
+ return "record_controller_title";
}
public TestElement createTestElement()
1.17 +4 -10
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Index: HttpTestSampleGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HttpTestSampleGui.java 12 Feb 2004 00:07:12 -0000 1.16
+++ HttpTestSampleGui.java 5 Mar 2004 01:38:02 -0000 1.17
@@ -36,8 +36,7 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class HttpTestSampleGui extends AbstractSamplerGui
{
@@ -84,14 +83,9 @@
this.configureTestElement(sampler);
}
- /**
- * Gets the ClassLabel attribute of the HttpTestSample object.
- *
- * @return the ClassLabel value
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("web_testing_title");
+ return "web_testing_title";
}
private void init()
1.11 +5 -10
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
Index: WebServiceSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebServiceSamplerGui.java 12 Feb 2004 00:07:12 -0000 1.10
+++ WebServiceSamplerGui.java 5 Mar 2004 01:38:02 -0000 1.11
@@ -60,8 +60,6 @@
implements java.awt.event.ActionListener
{
- private static final String label =
- JMeterUtils.getResString("webservice_sampler_title");
JLabeledTextField urlField =
new JLabeledTextField(JMeterUtils.getResString("url"));
JLabeledTextField soapAction =
@@ -158,12 +156,9 @@
init();
}
- /**
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return label;
+ return "webservice_sampler_title";
}
/**
@@ -266,7 +261,7 @@
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
// TITLE
- JLabel panelTitleLabel = new JLabel(label);
+ JLabel panelTitleLabel = new JLabel(getStaticLabel());
Font curFont = panelTitleLabel.getFont();
int curFontSize = curFont.getSize();
curFontSize += 4;
1.13 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
Index: HttpDefaultsGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpDefaultsGui.java 12 Feb 2004 00:07:12 -0000 1.12
+++ HttpDefaultsGui.java 5 Mar 2004 01:38:02 -0000 1.13
@@ -50,9 +50,9 @@
init();
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("url_config_title");
+ return "url_config_title";
}
/**
1.11 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Index: MultipartUrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultipartUrlConfigGui.java 12 Feb 2004 00:07:12 -0000 1.10
+++ MultipartUrlConfigGui.java 5 Mar 2004 01:38:02 -0000 1.11
@@ -89,9 +89,9 @@
paramNameField.setText(el.getPropertyAsString(HTTPSampler.FILE_FIELD));
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("url_multipart_config_title");
+ return "url_multipart_config_title";
}
public void updateGui()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
