Author: sebb
Date: Tue Nov 27 00:10:06 2012
New Revision: 1413952
URL: http://svn.apache.org/viewvc?rev=1413952&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -120,11 +120,13 @@ public class AssertionGui extends Abstra
init();
}
+ @Override
public String getLabelResource() {
return "assertion_title"; // $NON-NLS-1$
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
ResponseAssertion el = new ResponseAssertion();
modifyTestElement(el);
@@ -132,6 +134,7 @@ public class AssertionGui extends Abstra
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
if (el instanceof ResponseAssertion) {
@@ -401,6 +404,7 @@ public class AssertionGui extends Abstra
*
*/
private class ClearPatternsListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent e) {
int index = stringTable.getSelectedRow();
if (index > -1) {
@@ -419,6 +423,7 @@ public class AssertionGui extends Abstra
*
*/
private class AddPatternListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent e) {
tableModel.addNewRow();
deletePattern.setEnabled(true);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -58,6 +58,7 @@ public class BeanShellAssertionGui exten
super.configure(element);
}
+ @Override
public TestElement createTestElement() {
BeanShellAssertion sampler = new BeanShellAssertion();
modifyTestElement(sampler);
@@ -69,6 +70,7 @@ public class BeanShellAssertionGui exten
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement te) {
te.clear();
this.configureTestElement(te);
@@ -78,6 +80,7 @@ public class BeanShellAssertionGui exten
te.setProperty(new
BooleanProperty(BeanShellAssertion.RESET_INTERPRETER,
resetInterpreter.isSelected()));
}
+ @Override
public String getLabelResource() {
return "bsh_assertion_title"; // $NON-NLS-1$
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -43,6 +43,7 @@ public class DurationAssertionGui extend
init();
}
+ @Override
public String getLabelResource() {
return "duration_assertion_title"; // $NON-NLS-1$
}
@@ -51,6 +52,7 @@ public class DurationAssertionGui extend
return JMeterUtils.getResString("duration_assertion_duration_test");
// $NON-NLS-1$
}
+ @Override
public TestElement createTestElement() {
DurationAssertion el = new DurationAssertion();
modifyTestElement(el);
@@ -62,6 +64,7 @@ public class DurationAssertionGui extend
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
if (el instanceof DurationAssertion) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -85,6 +85,7 @@ public class HTMLAssertionGui extends Ab
/**
* Returns the label to be shown within the JTree-Component.
*/
+ @Override
public String getLabelResource() {
return "html_assertion_title"; // $NON-NLS-1$
}
@@ -92,6 +93,7 @@ public class HTMLAssertionGui extends Ab
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
HTMLAssertion el = new HTMLAssertion();
modifyTestElement(el);
@@ -103,6 +105,7 @@ public class HTMLAssertionGui extends Ab
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement inElement) {
log.debug("HTMLAssertionGui.modifyTestElement() called");
@@ -316,6 +319,7 @@ public class HTMLAssertionGui extends Ab
*
* @see
java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if (errorsOnly.isSelected()) {
warningThresholdField.setEnabled(false);
@@ -326,10 +330,12 @@ public class HTMLAssertionGui extends Ab
}
}
+ @Override
public void keyPressed(KeyEvent e) {
// NOOP
}
+ @Override
public void keyReleased(KeyEvent e) {
String fieldName = e.getComponent().getName();
@@ -356,6 +362,7 @@ public class HTMLAssertionGui extends Ab
}
}
+ @Override
public void keyTyped(KeyEvent e) {
// NOOP
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
Tue Nov 27 00:10:06 2012
@@ -76,6 +76,7 @@ public class MD5HexAssertionGUI extends
this.md5HexInput.setText(String.valueOf(assertion.getAllowedMD5Hex()));
}
+ @Override
public String getLabelResource() {
return "md5hex_assertion_title"; // $NON-NLS-1$
}
@@ -83,6 +84,7 @@ public class MD5HexAssertionGUI extends
/*
* @return
*/
+ @Override
public TestElement createTestElement() {
MD5HexAssertion el = new MD5HexAssertion();
@@ -94,6 +96,7 @@ public class MD5HexAssertionGUI extends
/*
* @param element
*/
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
String md5HexString = this.md5HexInput.getText();
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -71,6 +71,7 @@ import org.apache.jorphan.gui.layout.Ver
init();
}
+ @Override
public String getLabelResource() {
return "smime_assertion_title";
}
@@ -110,6 +111,7 @@ import org.apache.jorphan.gui.layout.Ver
panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
.getResString("smime_assertion_signature"))); // $NON-NLS-1$
notSigned.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
verifySignature.setEnabled(!notSigned.isSelected());
}
@@ -137,6 +139,7 @@ import org.apache.jorphan.gui.layout.Ver
panel.add(signerCheckConstraints);
signerCheckConstraints.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
signerDnField.setEnabled(signerCheckConstraints.isSelected());
signerSerialNumberField.setEnabled(signerCheckConstraints.isSelected());
@@ -170,6 +173,7 @@ import org.apache.jorphan.gui.layout.Ver
// panel.add(signerCheckByFile);
signerCheckByFile.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
signerCertFile.setEnabled(signerCheckByFile.isSelected());
}
@@ -216,6 +220,7 @@ import org.apache.jorphan.gui.layout.Ver
messagePositionTf.setText(smimeAssertion.getSpecificMessagePosition());
}
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
SMIMEAssertionTestElement smimeAssertion = (SMIMEAssertionTestElement)
el;
@@ -235,6 +240,7 @@ import org.apache.jorphan.gui.layout.Ver
smimeAssertion.setSpecificMessagePosition(messagePositionTf.getText());
}
+ @Override
public TestElement createTestElement() {
SMIMEAssertionTestElement smimeAssertion = new
SMIMEAssertionTestElement();
modifyTestElement(smimeAssertion);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -67,10 +67,12 @@ public class SizeAssertionGui extends Ab
init();
}
+ @Override
public String getLabelResource() {
return "size_assertion_title"; //$NON-NLS-1$
}
+ @Override
public TestElement createTestElement() {
SizeAssertion el = new SizeAssertion();
modifyTestElement(el);
@@ -82,6 +84,7 @@ public class SizeAssertionGui extends Ab
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
SizeAssertion assertion = (SizeAssertion) el;
@@ -269,6 +272,7 @@ public class SizeAssertionGui extends Ab
return button;
}
+ @Override
public void actionPerformed(ActionEvent e) {
int comparator = Integer.parseInt(e.getActionCommand());
execState = comparator;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -35,10 +35,12 @@ public class XMLAssertionGui extends Abs
/**
* Returns the label to be shown within the JTree-Component.
*/
+ @Override
public String getLabelResource() {
return "xml_assertion_title"; // $NON-NLS-1$
}
+ @Override
public TestElement createTestElement() {
XMLAssertion el = new XMLAssertion();
modifyTestElement(el);
@@ -50,6 +52,7 @@ public class XMLAssertionGui extends Abs
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
Tue Nov 27 00:10:06 2012
@@ -60,6 +60,7 @@ public class XMLConfPanel extends JPanel
validate = new
JCheckBox(JMeterUtils.getResString("xml_validate_button")); //$NON-NLS-1$
tolerant = new
JCheckBox(JMeterUtils.getResString("xml_tolerant_button")); //$NON-NLS-1$
tolerant.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
tolerant();
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
Tue Nov 27 00:10:06 2012
@@ -57,6 +57,7 @@ public class XMLSchemaAssertionGUI exten
/**
* Returns the label to be shown within the JTree-Component.
*/
+ @Override
public String getLabelResource() {
return "xmlschema_assertion_title"; //$NON-NLS-1$
}
@@ -64,6 +65,7 @@ public class XMLSchemaAssertionGUI exten
/**
* create Test Element
*/
+ @Override
public TestElement createTestElement() {
log.debug("XMLSchemaAssertionGui.createTestElement() called");
XMLSchemaAssertion el = new XMLSchemaAssertion();
@@ -76,6 +78,7 @@ public class XMLSchemaAssertionGUI exten
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement inElement) {
log.debug("XMLSchemaAssertionGui.modifyTestElement() called");
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
Tue Nov 27 00:10:06 2012
@@ -43,6 +43,7 @@ public class XPathAssertionGui extends A
/**
* Returns the label to be shown within the JTree-Component.
*/
+ @Override
public String getLabelResource() {
return "xpath_assertion_title"; //$NON-NLS-1$
}
@@ -50,6 +51,7 @@ public class XPathAssertionGui extends A
/**
* Create test element
*/
+ @Override
public TestElement createTestElement() {
XPathAssertion el = new XPathAssertion();
modifyTestElement(el);
@@ -97,6 +99,7 @@ public class XPathAssertionGui extends A
*
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
super.configureTestElement(el);
if (el instanceof XPathAssertion) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1413952&r1=1413951&r2=1413952&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
Tue Nov 27 00:10:06 2012
@@ -136,6 +136,7 @@ public class XPathPanel extends JPanel {
if (checkXPath == null) {
checkXPath = new
JButton(JMeterUtils.getResString("xpath_assertion_button")); //$NON-NLS-1$
checkXPath.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
validXPath(xpath.getText(), true);
}
