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:13 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui MD5HexAssertionGUI.java AssertionGui.java XMLAssertionGui.java DurationAssertionGui.java SizeAssertionGui.java BeanShellAssertionGui.java
sebb 2004/03/04 17:32:13
Modified: src/components/org/apache/jmeter/assertions/gui
MD5HexAssertionGUI.java AssertionGui.java
XMLAssertionGui.java DurationAssertionGui.java
SizeAssertionGui.java BeanShellAssertionGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.3 +4 -9 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
Index: MD5HexAssertionGUI.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MD5HexAssertionGUI.java 13 Feb 2004 01:24:36 -0000 1.2
+++ MD5HexAssertionGUI.java 5 Mar 2004 01:32:13 -0000 1.3
@@ -22,8 +22,6 @@
*
* @version $Revision$ updated on $Date$
*
- * @author <a href="mailto:jh@domek.be">Jorg Heymans</a>
- *
*/
package org.apache.jmeter.assertions.gui;
@@ -81,11 +79,8 @@
this.md5HexInput.setText(String.valueOf(assertion.getAllowedMD5Hex()));
}
- /*
- * @return
- */
- public String getStaticLabel() {
- return JMeterUtils.getResString("md5hex_assertion_title");
+ public String getLabelResource() {
+ return "md5hex_assertion_title";
}
/*
1.17 +6 -8 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
Index: AssertionGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AssertionGui.java 13 Feb 2004 01:24:36 -0000 1.16
+++ AssertionGui.java 5 Mar 2004 01:32:13 -0000 1.17
@@ -44,8 +44,7 @@
/**
* GUI interface for a {@link ResponseAssertion}.
*
- * @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ on $Date$
*/
public class AssertionGui extends AbstractAssertionGui
{
@@ -103,10 +102,9 @@
init();
}
- /* Implements JMeterGUIComponent.getStaticLabel() */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("assertion_title");
+ return "assertion_title";
}
/* Implements JMeterGUIComponent.createTestElement() */
1.5 +4 -6 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
Index: XMLAssertionGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLAssertionGui.java 13 Feb 2004 01:24:36 -0000 1.4
+++ XMLAssertionGui.java 5 Mar 2004 01:32:13 -0000 1.5
@@ -20,12 +20,10 @@
import org.apache.jmeter.assertions.XMLAssertion;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * @author <a href="mailto:gottfried@szing.at">Gottfried Szing</a>
* @version $Revision$, $Date$
*/
public class XMLAssertionGui extends AbstractAssertionGui
@@ -41,9 +39,9 @@
/**
* Returns the label to be shown within the JTree-Component.
*/
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("xml_assertion_title");
+ return "xml_assertion_title";
}
public TestElement createTestElement()
1.17 +4 -8 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
Index: DurationAssertionGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DurationAssertionGui.java 13 Feb 2004 01:24:36 -0000 1.16
+++ DurationAssertionGui.java 5 Mar 2004 01:32:13 -0000 1.17
@@ -36,7 +36,6 @@
import org.apache.log.Logger;
/**
- * @author Michael Stover
* @version $Revision$ Last updated: $Date$
*/
public class DurationAssertionGui
@@ -52,12 +51,9 @@
init();
}
- /**
- * Returns the label to be shown within the JTree-Component.
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("duration_assertion_title");
+ return "duration_assertion_title";
}
public String getDurationAttributesTitle()
1.14 +4 -8 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
Index: SizeAssertionGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SizeAssertionGui.java 13 Feb 2004 01:24:36 -0000 1.13
+++ SizeAssertionGui.java 5 Mar 2004 01:32:13 -0000 1.14
@@ -40,7 +40,6 @@
import org.apache.log.Logger;
/**
- * @author Michael Stover
* @version $Revision$ Last updated: $Date$
*/
public class SizeAssertionGui
@@ -63,12 +62,9 @@
init();
}
- /**
- * Returns the label to be shown within the JTree-Component.
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("size_assertion_title");
+ return "size_assertion_title";
}
public String getSizeAttributesTitle()
1.4 +4 -5 jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
Index: BeanShellAssertionGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanShellAssertionGui.java 25 Feb 2004 22:59:52 -0000 1.3
+++ BeanShellAssertionGui.java 5 Mar 2004 01:32:13 -0000 1.4
@@ -32,7 +32,6 @@
import org.apache.jmeter.util.JMeterUtils;
/**
- * @author sebb AT apache DOT org
* @version $Revision$ $Date$
*/
public class BeanShellAssertionGui extends AbstractAssertionGui
@@ -76,9 +75,9 @@
te.setProperty(BeanShellAssertion.PARAMETERS, parameters.getText());
}
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("bsh_assertion_title");
+ return "bsh_assertion_title";
}
private JPanel createFilenamePanel()//TODO ought to be a FileChooser ...
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org