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:38:42 UTC
cvs commit: jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui JavaConfigGui.java
sebb 2004/03/04 17:38:42
Modified: src/protocol/java/org/apache/jmeter/protocol/java/control/gui
JavaTestSamplerGui.java BSFSamplerGui.java
BeanShellSamplerGui.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui
PoolConfigGui.java DbConfigGui.java
SqlConfigGui.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
src/protocol/java/org/apache/jmeter/protocol/java/config/gui
JavaConfigGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.13 +4 -9 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
Index: JavaTestSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaTestSamplerGui.java 10 Feb 2004 00:46:44 -0000 1.12
+++ JavaTestSamplerGui.java 5 Mar 2004 01:38:42 -0000 1.13
@@ -25,16 +25,12 @@
import org.apache.jmeter.protocol.java.sampler.JavaSampler;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
-
/**
* The <code>JavaTestSamplerGui</code> class provides the user interface
* for the {@link JavaSampler}.
*
- * @author Brad Kiewel
- * @author <a href="mailto:jeremy_a@bigfoot.com">Jeremy Arnold</a>
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class JavaTestSamplerGui extends AbstractSamplerGui
{
@@ -50,10 +46,9 @@
init();
}
- /* Implements JMeterGuiComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("java_request");
+ return "java_request";
}
/**
1.4 +5 -5 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
Index: BSFSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BSFSamplerGui.java 25 Feb 2004 22:59:13 -0000 1.3
+++ BSFSamplerGui.java 5 Mar 2004 01:38:42 -0000 1.4
@@ -33,7 +33,7 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author sebb AT apache DOT org
+ *
* @version $Revision$ $Date$
*/
public class BSFSamplerGui extends AbstractSamplerGui
@@ -76,9 +76,9 @@
te.setProperty(BSFSampler.SCRIPT, scriptField.getText());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("bsf_sampler_title") + " (ALPHA CODE)";
+ return "bsf_sampler_title";
}
private void init()
1.9 +4 -5 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
Index: BeanShellSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BeanShellSamplerGui.java 25 Feb 2004 22:59:13 -0000 1.8
+++ BeanShellSamplerGui.java 5 Mar 2004 01:38:42 -0000 1.9
@@ -33,7 +33,6 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author sebb AT apache DOT org
* @version $Revision$ $Date$
*/
public class BeanShellSamplerGui extends AbstractSamplerGui
@@ -77,9 +76,9 @@
te.setProperty(BeanShellSampler.PARAMETERS, parameters.getText());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("bsh_sampler_title");
+ return "bsh_sampler_title";
}
1.12 +4 -5 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java
Index: PoolConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PoolConfigGui.java 25 Feb 2004 23:00:54 -0000 1.11
+++ PoolConfigGui.java 5 Mar 2004 01:38:42 -0000 1.12
@@ -37,8 +37,7 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class PoolConfigGui extends AbstractConfigGui implements FocusListener
{
@@ -96,9 +95,9 @@
maxUseField.getText());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("database_conn_pool_title");
+ return "database_conn_pool_title";
}
public void focusGained(FocusEvent e)
1.11 +4 -5 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java
Index: DbConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DbConfigGui.java 12 Feb 2004 00:33:56 -0000 1.10
+++ DbConfigGui.java 5 Mar 2004 01:38:42 -0000 1.11
@@ -33,8 +33,7 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class DbConfigGui extends AbstractConfigGui
{
@@ -57,9 +56,9 @@
init();
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("database_login_title");
+ return "database_login_title";
}
public TestElement createTestElement()
1.10 +4 -5 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java
Index: SqlConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SqlConfigGui.java 25 Feb 2004 23:00:54 -0000 1.9
+++ SqlConfigGui.java 5 Mar 2004 01:38:42 -0000 1.10
@@ -34,8 +34,7 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class SqlConfigGui extends AbstractConfigGui
{
@@ -53,9 +52,9 @@
init();
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("database_sql_query_title");
+ return "database_sql_query_title";
}
public void configure(TestElement element)
1.41 +4 -7 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ProxyControlGui.java 20 Feb 2004 01:03:08 -0000 1.40
+++ ProxyControlGui.java 5 Mar 2004 01:38:42 -0000 1.41
@@ -65,9 +65,6 @@
import org.apache.log.Logger;
/**
- * @author Michael Stover
- * @author Thad Smith (controller combo code, taken from ModuleController)
- * @author <a href="mailto:jsalvata@apache.org">Jordi Salvat i Alabart</a>
* @version $Revision$ updated on $Date$
*/
public class ProxyControlGui
@@ -207,9 +204,9 @@
return list;
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("proxy_title");
+ return "proxy_title";
}
public Collection getMenuCategories()
1.18 +4 -7 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
Index: JavaConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavaConfigGui.java 13 Feb 2004 02:40:55 -0000 1.17
+++ JavaConfigGui.java 5 Mar 2004 01:38:42 -0000 1.18
@@ -48,9 +48,7 @@
* The <code>JavaConfigGui</code> class provides the user interface for
* the {@link JavaConfig} object.
*
- * @author Brad Kiewel
- * @author <a href="mailto:jeremy_a@bigfoot.com">Jeremy Arnold</a>
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class JavaConfigGui extends AbstractConfigGui implements ActionListener
{
@@ -96,10 +94,9 @@
init();
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("java_request_defaults");
+ return "java_request_defaults";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org