You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/11/27 01:19:31 UTC
svn commit: r1413958 - in /jmeter/trunk/src/protocol:
ftp/org/apache/jmeter/protocol/ftp/config/gui/
ftp/org/apache/jmeter/protocol/ftp/control/gui/
ftp/org/apache/jmeter/protocol/ftp/sampler/
java/org/apache/jmeter/protocol/java/config/gui/ java/org/a...
Author: sebb
Date: Tue Nov 27 00:19:20 2012
New Revision: 1413958
URL: http://svn.apache.org/viewvc?rev=1413958&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java Tue Nov 27 00:19:20 2012
@@ -69,6 +69,7 @@ public class FtpConfigGui extends Abstra
init();
}
+ @Override
public String getLabelResource() {
return "ftp_sample_title"; // $NON-NLS-1$
}
@@ -92,6 +93,7 @@ public class FtpConfigGui extends Abstra
}
}
+ @Override
public TestElement createTestElement() {
ConfigTestElement element = new ConfigTestElement();
modifyTestElement(element);
@@ -103,6 +105,7 @@ public class FtpConfigGui extends Abstra
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
// Note: the element is a ConfigTestElement, so cannot use FTPSampler access methods
Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -48,6 +48,7 @@ public class FtpTestSamplerGui extends A
ftpDefaultPanel.configure(element);
}
+ @Override
public TestElement createTestElement() {
FTPSampler sampler = new FTPSampler();
modifyTestElement(sampler);
@@ -59,6 +60,7 @@ public class FtpTestSamplerGui extends A
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
ftpDefaultPanel.modifyTestElement(sampler);
@@ -77,6 +79,7 @@ public class FtpTestSamplerGui extends A
loginPanel.clearGui();
}
+ @Override
public String getLabelResource() {
return "ftp_testing_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Tue Nov 27 00:19:20 2012
@@ -166,6 +166,7 @@ public class FTPSampler extends Abstract
return sb.toString();
}
+ @Override
public SampleResult sample(Entry e) {
SampleResult res = new SampleResult();
res.setSuccessful(false); // Assume failure
@@ -294,6 +295,7 @@ public class FTPSampler extends Abstract
}
/** {@inheritDoc} */
+ @Override
public boolean interrupt() {
FTPClient client = savedClient;
if (client != null) {
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java Tue Nov 27 00:19:20 2012
@@ -90,6 +90,7 @@ public class JavaConfigGui extends Abstr
}
/** {@inheritDoc} */
+ @Override
public String getLabelResource() {
return "java_request_defaults"; // $NON-NLS-1$
}
@@ -156,6 +157,7 @@ public class JavaConfigGui extends Abstr
* @param evt
* the ActionEvent to be handled
*/
+ @Override
public void actionPerformed(ActionEvent evt) {
if (evt.getSource() == classnameCombo) {
String className = ((String) classnameCombo.getSelectedItem()).trim();
@@ -227,6 +229,7 @@ public class JavaConfigGui extends Abstr
}
/** {@inheritDoc} */
+ @Override
public TestElement createTestElement() {
JavaConfig config = new JavaConfig();
modifyTestElement(config);
@@ -234,6 +237,7 @@ public class JavaConfigGui extends Abstr
}
/** {@inheritDoc} */
+ @Override
public void modifyTestElement(TestElement config) {
configureTestElement(config);
((JavaConfig) config).setArguments((Arguments) argsPanel.createTestElement());
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -59,6 +59,7 @@ public class BeanShellSamplerGui extends
super.configure(element);
}
+ @Override
public TestElement createTestElement() {
BeanShellSampler sampler = new BeanShellSampler();
modifyTestElement(sampler);
@@ -70,6 +71,7 @@ public class BeanShellSamplerGui extends
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement te) {
te.clear();
this.configureTestElement(te);
@@ -92,6 +94,7 @@ public class BeanShellSamplerGui extends
resetInterpreter.setSelected(false);
}
+ @Override
public String getLabelResource() {
return "bsh_sampler_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -45,6 +45,7 @@ public class JavaTestSamplerGui extends
init();
}
+ @Override
public String getLabelResource() {
return "java_request"; // $NON-NLS-1$
}
@@ -64,6 +65,7 @@ public class JavaTestSamplerGui extends
}
/* Implements JMeterGuiComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
JavaSampler sampler = new JavaSampler();
modifyTestElement(sampler);
@@ -71,6 +73,7 @@ public class JavaTestSamplerGui extends
}
/* Implements JMeterGuiComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
JavaConfig config = (JavaConfig) javaPanel.createTestElement();
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java Tue Nov 27 00:19:20 2012
@@ -55,16 +55,19 @@ public abstract class AbstractJavaSample
private static final Logger log = LoggingManager.getLoggerForClass();
/* Implements JavaSamplerClient.setupTest(JavaSamplerContext) */
+ @Override
public void setupTest(JavaSamplerContext context) {
log.debug(getClass().getName() + ": setupTest");
}
/* Implements JavaSamplerClient.teardownTest(JavaSamplerContext) */
+ @Override
public void teardownTest(JavaSamplerContext context) {
log.debug(getClass().getName() + ": teardownTest");
}
/* Implements JavaSamplerClient.getDefaultParameters() */
+ @Override
public Arguments getDefaultParameters() {
return null;
}
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java Tue Nov 27 00:19:20 2012
@@ -68,6 +68,7 @@ public class BSFSampler extends BSFTestE
return getName();
}
+ @Override
public SampleResult sample(Entry e)// Entry tends to be ignored ...
{
final String label = getLabel();
@@ -142,6 +143,7 @@ public class BSFSampler extends BSFTestE
/**
* @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
*/
+ @Override
public boolean applies(ConfigTestElement configElement) {
String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java Tue Nov 27 00:19:20 2012
@@ -86,6 +86,7 @@ public class BeanShellSampler extends Be
return getPropertyAsBoolean(RESET_INTERPRETER);
}
+ @Override
public SampleResult sample(Entry e)// Entry tends to be ignored ...
{
// log.info(getLabel()+" "+getFilename());
@@ -163,6 +164,7 @@ public class BeanShellSampler extends Be
return res;
}
+ @Override
public boolean interrupt() {
if (savedBsh != null) {
try {
@@ -178,6 +180,7 @@ public class BeanShellSampler extends Be
/**
* @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
*/
+ @Override
public boolean applies(ConfigTestElement configElement) {
String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java Tue Nov 27 00:19:20 2012
@@ -47,6 +47,7 @@ public class JSR223Sampler extends JSR22
private static final Logger log = LoggingManager.getLoggerForClass();
+ @Override
public SampleResult sample(Entry entry) {
SampleResult result = new SampleResult();
result.setSampleLabel(getName());
@@ -88,6 +89,7 @@ public class JSR223Sampler extends JSR22
/**
* @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
*/
+ @Override
public boolean applies(ConfigTestElement configElement) {
String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java Tue Nov 27 00:19:20 2012
@@ -176,6 +176,7 @@ public class JavaSampler extends Abstrac
* the Entry for this sample
* @return test SampleResult
*/
+ @Override
public SampleResult sample(Entry entry) {
Arguments args = getArguments();
args.addArgument(TestElement.NAME, getName()); // Allow Sampler access
@@ -256,12 +257,14 @@ public class JavaSampler extends Abstrac
// TestStateListener implementation
/* Implements TestStateListener.testStarted() */
+ @Override
public void testStarted() {
log.debug(whoAmI() + "\ttestStarted");
initClass();
}
/* Implements TestStateListener.testStarted(String) */
+ @Override
public void testStarted(String host) {
log.debug(whoAmI() + "\ttestStarted(" + host + ")");
initClass();
@@ -274,6 +277,7 @@ public class JavaSampler extends Abstrac
* constructor) and notify them that the test has ended, allowing the
* JavaSamplerClients to cleanup.
*/
+ @Override
public void testEnded() {
log.debug(whoAmI() + "\ttestEnded");
synchronized (TEAR_DOWN_SET) {
@@ -288,6 +292,7 @@ public class JavaSampler extends Abstrac
}
/* Implements TestStateListener.testEnded(String) */
+ @Override
public void testEnded(String host) {
testEnded();
}
@@ -305,6 +310,7 @@ public class JavaSampler extends Abstrac
*
* @see JavaSamplerClient#runTest(JavaSamplerContext)
*/
+ @Override
public SampleResult runTest(JavaSamplerContext p_context) {
log.debug(whoAmI() + "\trunTest");
Thread.yield();
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java Tue Nov 27 00:19:20 2012
@@ -265,6 +265,7 @@ public class JavaTest extends AbstractJa
*
* @return a SampleResult giving the results of this sample.
*/
+ @Override
public SampleResult runTest(JavaSamplerContext context) {
setupValues(context);
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java Tue Nov 27 00:19:20 2012
@@ -125,6 +125,7 @@ public class SleepTest extends AbstractJ
*
* @return a SampleResult giving the results of this sample.
*/
+ @Override
public SampleResult runTest(JavaSamplerContext context) {
SampleResult results = new SampleResult();
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java Tue Nov 27 00:19:20 2012
@@ -563,7 +563,8 @@ public abstract class AbstractJDBCTestEl
* {@inheritDoc}
* @see org.apache.jmeter.testelement.TestStateListener#testStarted()
*/
- public void testStarted() {
+ @Override
+ public void testStarted() {
testStarted("");
}
@@ -571,7 +572,8 @@ public abstract class AbstractJDBCTestEl
* {@inheritDoc}
* @see org.apache.jmeter.testelement.TestStateListener#testStarted(java.lang.String)
*/
- public void testStarted(String host) {
+ @Override
+ public void testStarted(String host) {
cleanCache();
}
@@ -579,7 +581,8 @@ public abstract class AbstractJDBCTestEl
* {@inheritDoc}
* @see org.apache.jmeter.testelement.TestStateListener#testEnded()
*/
- public void testEnded() {
+ @Override
+ public void testEnded() {
testEnded("");
}
@@ -587,7 +590,8 @@ public abstract class AbstractJDBCTestEl
* {@inheritDoc}
* @see org.apache.jmeter.testelement.TestStateListener#testEnded(java.lang.String)
*/
- public void testEnded(String host) {
+ @Override
+ public void testEnded(String host) {
cleanCache();
}
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java Tue Nov 27 00:19:20 2012
@@ -66,6 +66,7 @@ public class DataSourceElement extends A
public DataSourceElement() {
}
+ @Override
public void testEnded() {
synchronized (this) {
if (excaliburSource != null) {
@@ -82,10 +83,12 @@ public class DataSourceElement extends A
}
}
+ @Override
public void testEnded(String host) {
testEnded();
}
+ @Override
@SuppressWarnings("deprecation") // call to TestBeanHelper.prepare() is intentional
public void testStarted() {
this.setRunningVersion(true);
@@ -111,6 +114,7 @@ public class DataSourceElement extends A
}
}
+ @Override
public void testStarted(String host) {
testStarted();
}
@@ -262,6 +266,7 @@ public class DataSourceElement extends A
sharedDSC=p_dsc;
}
+ @Override
public Connection getConnection() throws SQLException {
Connection conn = null;
ResourceLimitingJdbcDataSource dsc = null;
@@ -295,14 +300,17 @@ public class DataSourceElement extends A
return conn;
}
+ @Override
public void configure(Configuration arg0) throws ConfigurationException {
}
}
+ @Override
public void addConfigElement(ConfigElement config) {
}
+ @Override
public boolean expectsModification() {
return false;
}
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java Tue Nov 27 00:19:20 2012
@@ -56,6 +56,7 @@ public class JDBCSampler extends Abstrac
public JDBCSampler() {
}
+ @Override
public SampleResult sample(Entry e) {
log.debug("sampling jdbc");
@@ -110,6 +111,7 @@ public class JDBCSampler extends Abstrac
/**
* @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
*/
+ @Override
public boolean applies(ConfigTestElement configElement) {
String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java Tue Nov 27 00:19:20 2012
@@ -220,6 +220,7 @@ public class Publisher implements Closea
/**
* Close will close the session
*/
+ @Override
public void close() {
Utils.close(producer, log);
Utils.close(session, log);
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java Tue Nov 27 00:19:20 2012
@@ -267,6 +267,7 @@ public class ReceiveSubscriber implement
* close() will stop the connection first.
* Then it closes the subscriber, session and connection.
*/
+ @Override
public void close() { // called from threadFinished() thread
log.debug("close()");
try {
@@ -285,6 +286,7 @@ public class ReceiveSubscriber implement
/**
* {@inheritDoc}
*/
+ @Override
public void onMessage(Message message) {
if (!queue.offer(message)){
log.warn("Could not add message to queue");
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Tue Nov 27 00:19:20 2012
@@ -122,6 +122,7 @@ public class JMSPublisherGui extends Abs
/**
* the name of the property for the JMSPublisherGui is jms_publisher.
*/
+ @Override
public String getLabelResource() {
return "jms_publisher"; //$NON-NLS-1$
}
@@ -129,6 +130,7 @@ public class JMSPublisherGui extends Abs
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
PublisherSampler sampler = new PublisherSampler();
setupSamplerProperties(sampler);
@@ -140,6 +142,7 @@ public class JMSPublisherGui extends Abs
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement s) {
PublisherSampler sampler = (PublisherSampler) s;
setupSamplerProperties(sampler);
@@ -270,6 +273,7 @@ public class JMSPublisherGui extends Abs
* When a widget state changes, it will notify this class so we can
* enable/disable the correct items.
*/
+ @Override
public void stateChanged(ChangeEvent event) {
if (event.getSource() == configChoice) {
updateConfig(configChoice.getText());
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -102,6 +102,7 @@ public class JMSSamplerGui extends Abstr
jndiPropertiesPanel.clear();
}
+ @Override
public TestElement createTestElement() {
JMSSampler sampler = new JMSSampler();
this.configureTestElement(sampler);
@@ -138,6 +139,7 @@ public class JMSSamplerGui extends Abstr
*
* @param element
*/
+ @Override
public void modifyTestElement(TestElement element) {
this.configureTestElement(element);
if (!(element instanceof JMSSampler)) return;
@@ -277,6 +279,7 @@ public class JMSSamplerGui extends Abstr
return jndiPanel;
}
+ @Override
public String getLabelResource() {
return "jms_point_to_point"; //$NON-NLS-1$ // TODO - probably wrong
}
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java Tue Nov 27 00:19:20 2012
@@ -119,6 +119,7 @@ public class JMSSubscriberGui extends Ab
init();
}
+ @Override
public String getLabelResource() {
return "jms_subscriber_title"; // $NON-NLS-1$
}
@@ -126,6 +127,7 @@ public class JMSSubscriberGui extends Ab
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
SubscriberSampler sampler = new SubscriberSampler();
modifyTestElement(sampler);
@@ -137,6 +139,7 @@ public class JMSSubscriberGui extends Ab
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement s) {
SubscriberSampler sampler = (SubscriberSampler) s;
this.configureTestElement(sampler);
@@ -260,6 +263,7 @@ public class JMSSubscriberGui extends Ab
* When the state of a widget changes, it will notify the gui. the method
* then enables or disables certain parameters.
*/
+ @Override
public void stateChanged(ChangeEvent event) {
if (event.getSource() == useProperties) {
jndiICF.setEnabled(!useProperties.isSelected());
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Tue Nov 27 00:19:20 2012
@@ -75,6 +75,7 @@ public abstract class BaseJMSSampler ext
/**
* {@inheritDoc}
*/
+ @Override
public SampleResult sample(Entry e) {
return this.sample();
}
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java Tue Nov 27 00:19:20 2012
@@ -67,6 +67,7 @@ public class FixedQueueExecutor implemen
/**
* {@inheritDoc}
*/
+ @Override
public Message sendAndReceive(Message request) throws JMSException {
String id = request.getJMSCorrelationID();
if(id == null && !useReqMsgIdAsCorrelId){
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Tue Nov 27 00:19:20 2012
@@ -127,6 +127,7 @@ public class JMSSampler extends Abstract
/**
* {@inheritDoc}
*/
+ @Override
public SampleResult sample(Entry entry) {
SampleResult res = new SampleResult();
res.setSampleLabel(getName());
@@ -291,6 +292,7 @@ public class JMSSampler extends Abstract
return getQueueConnectionFactory() + ", queue: " + getSendQueue();
}
+ @Override
public void threadStarted() {
logThreadStart();
@@ -445,6 +447,7 @@ public class JMSSampler extends Abstract
/**
* {@inheritDoc}
*/
+ @Override
public void threadFinished() {
LOGGER.debug("Thread ended " + new Date());
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java Tue Nov 27 00:19:20 2012
@@ -92,6 +92,7 @@ public class PublisherSampler extends Ba
/**
* the implementation calls testStarted() without any parameters.
*/
+ @Override
public void testStarted(String test) {
testStarted();
}
@@ -99,6 +100,7 @@ public class PublisherSampler extends Ba
/**
* the implementation calls testEnded() without any parameters.
*/
+ @Override
public void testEnded(String host) {
testEnded();
}
@@ -106,12 +108,14 @@ public class PublisherSampler extends Ba
/**
* endTest cleans up the client
*/
+ @Override
public void testEnded() {
log.debug("PublisherSampler.testEnded called");
ClientPool.clearClient();
InitialContextFactory.close();
}
+ @Override
public void testStarted() {
}
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java Tue Nov 27 00:19:20 2012
@@ -103,6 +103,7 @@ public final class Receiver implements R
return receiver;
}
+ @Override
public void run() {
active = true;
Message reply;
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Tue Nov 27 00:19:20 2012
@@ -267,6 +267,7 @@ public class SubscriberSampler extends B
* <br/>
* {@inheritDoc}
*/
+ @Override
public void threadStarted() {
// Disabled thread start if listen on sample choice
if (isDestinationStatic() || START_ON_SAMPLE) {
@@ -316,6 +317,7 @@ public class SubscriberSampler extends B
* <br/>
* {@inheritDoc}
*/
+ @Override
public void threadFinished() {
if (SUBSCRIBER != null){ // Can be null if init fails
SUBSCRIBER.close();
@@ -332,6 +334,7 @@ public class SubscriberSampler extends B
/**
* Handle an interrupt of the test.
*/
+ @Override
public boolean interrupt() {
boolean oldvalue = interrupted;
interrupted = true; // so we break the loops in SampleWithListener and SampleWithReceive
@@ -440,6 +443,7 @@ public class SubscriberSampler extends B
/**
* {@inheritDoc}
*/
+ @Override
public void testEnded() {
InitialContextFactory.close();
}
@@ -447,6 +451,7 @@ public class SubscriberSampler extends B
/**
* {@inheritDoc}
*/
+ @Override
public void testEnded(String host) {
testEnded();
}
@@ -454,6 +459,7 @@ public class SubscriberSampler extends B
/**
* {@inheritDoc}
*/
+ @Override
public void testStarted() {
testStarted("");
}
@@ -461,6 +467,7 @@ public class SubscriberSampler extends B
/**
* {@inheritDoc}
*/
+ @Override
public void testStarted(String host) {
// NOOP
}
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java Tue Nov 27 00:19:20 2012
@@ -53,6 +53,7 @@ public class TemporaryQueueExecutor impl
/**
* {@inheritDoc}
*/
+ @Override
public Message sendAndReceive(Message request) throws JMSException {
return requestor.request(request);
}
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java Tue Nov 27 00:19:20 2012
@@ -114,11 +114,13 @@ public class LDAPArgumentsPanel extends
return null;
}
+ @Override
public String getLabelResource() {
return "ldapext_sample_title"; // $NON-NLS-1$
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
LDAPArguments args = new LDAPArguments();
modifyTestElement(args);
@@ -128,6 +130,7 @@ public class LDAPArgumentsPanel extends
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement args) {
GuiUtils.stopTableEditing(table);
LDAPArguments arguments = null;
@@ -195,6 +198,7 @@ public class LDAPArgumentsPanel extends
* @param e
* the event that has occurred
*/
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
if (action.equals(DELETE)) {
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java Tue Nov 27 00:19:20 2012
@@ -96,6 +96,7 @@ public class LdapConfigGui extends Abstr
this(true);
}
+ @Override
public String getLabelResource() {
return "ldap_sample_title"; // $NON-NLS-1$
}
@@ -147,6 +148,7 @@ public class LdapConfigGui extends Abstr
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
ConfigTestElement element = new ConfigTestElement();
modifyTestElement(element);
@@ -158,6 +160,7 @@ public class LdapConfigGui extends Abstr
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement element) {
element.clear();
configureTestElement(element);
@@ -216,6 +219,7 @@ public class LdapConfigGui extends Abstr
* This itemStateChanged listener for changing the card layout for based on\
* the test selected in the User defined test case.
*/
+ @Override
public void itemStateChanged(ItemEvent ie) {
CardLayout cl = (CardLayout) (cards.getLayout());
if (user_Defined.isSelected()) {
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java Tue Nov 27 00:19:20 2012
@@ -187,6 +187,7 @@ public class LdapExtConfigGui extends Ab
init();
}
+ @Override
public String getLabelResource() {
return "ldapext_sample_title"; // $NON-NLS-1$
}
@@ -262,6 +263,7 @@ public class LdapExtConfigGui extends Ab
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
ConfigTestElement element = new ConfigTestElement();
modifyTestElement(element);
@@ -273,6 +275,7 @@ public class LdapExtConfigGui extends Ab
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement element) {
element.clear();
configureTestElement(element);
@@ -380,6 +383,7 @@ public class LdapExtConfigGui extends Ab
* This itemStateChanged listener for changing the card layout for based on
* the test selected in the User defined test case.
**************************************************************************/
+ @Override
public void itemStateChanged(ItemEvent ie) {
CardLayout cl = (CardLayout) (cards.getLayout());
if (addTest.isSelected()) {
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -64,6 +64,7 @@ public class LdapExtTestSamplerGui exten
ldapDefaultPanel.configure(element);
}
+ @Override
public TestElement createTestElement() {
LDAPExtSampler sampler = new LDAPExtSampler();
modifyTestElement(sampler);
@@ -75,6 +76,7 @@ public class LdapExtTestSamplerGui exten
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
((LDAPExtSampler) sampler).addTestElement(ldapDefaultPanel.createTestElement());
@@ -91,6 +93,7 @@ public class LdapExtTestSamplerGui exten
ldapDefaultPanel.clearGui();
}
+ @Override
public String getLabelResource() {
return "ldapext_testing_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -57,6 +57,7 @@ public class LdapTestSamplerGui extends
ldapDefaultPanel.configure(element);
}
+ @Override
public TestElement createTestElement() {
LDAPSampler sampler = new LDAPSampler();
modifyTestElement(sampler);
@@ -68,6 +69,7 @@ public class LdapTestSamplerGui extends
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
((LDAPSampler) sampler).addTestElement(ldapDefaultPanel.createTestElement());
@@ -86,6 +88,7 @@ public class LdapTestSamplerGui extends
loginPanel.clearGui();
}
+ @Override
public String getLabelResource() {
return "ldap_testing_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Tue Nov 27 00:19:20 2012
@@ -717,6 +717,7 @@ public class LDAPExtSampler extends Abst
* !ToDo (Parameter description)
* @return !ToDo (Return description)
**************************************************************************/
+ @Override
public SampleResult sample(Entry e) {
XMLBuffer xmlBuffer = new XMLBuffer();
xmlBuffer.openTag("ldapanswer"); // $NON-NLS-1$
@@ -967,6 +968,7 @@ public class LDAPExtSampler extends Abst
private void sortAttributes(final List<Attribute> sortedAttrs) {
Collections.sort(sortedAttrs, new Comparator<Attribute>()
{
+ @Override
public int compare(Attribute o1, Attribute o2)
{
String nm1 = o1.getID();
@@ -999,6 +1001,7 @@ public class LDAPExtSampler extends Abst
return len1 - len2;
}
+ @Override
public int compare(SearchResult o1, SearchResult o2)
{
String nm1 = o1.getName();
@@ -1056,19 +1059,23 @@ public class LDAPExtSampler extends Abst
return StringEscapeUtils.escapeXml(value.toString());
}
+ @Override
public void testStarted() {
testStarted(""); // $NON-NLS-1$
}
+ @Override
public void testEnded() {
testEnded(""); // $NON-NLS-1$
}
+ @Override
public void testStarted(String host) {
// ignored
}
// Ensure any remaining contexts are closed
+ @Override
public void testEnded(String host) {
for (Map.Entry<String, DirContext> entry : ldapContexts.entrySet()) {
DirContext dc = entry.getValue();
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java Tue Nov 27 00:19:20 2012
@@ -430,6 +430,7 @@ public class LDAPSampler extends Abstrac
}
}
+ @Override
public SampleResult sample(Entry e) {
SampleResult res = new SampleResult();
boolean isSuccessful = false;
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java Tue Nov 27 00:19:20 2012
@@ -42,6 +42,7 @@ public class MailFileFolder extends Fold
private final File folderPath;// Parent folder (or single message file)
private final boolean isFile;
private static final FilenameFilter FILENAME_FILTER = new FilenameFilter(){
+ @Override
public boolean accept(File dir, String name) {
return name.matches(FILENAME_REGEX);
}
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Tue Nov 27 00:19:20 2012
@@ -132,6 +132,7 @@ public class MailReaderSampler extends A
/**
* {@inheritDoc}
*/
+ @Override
public SampleResult sample(Entry e) {
SampleResult parent = new SampleResult();
boolean isOK = false; // Did sample succeed?
@@ -564,6 +565,7 @@ public class MailReaderSampler extends A
/**
* {@inheritDoc}
*/
+ @Override
public boolean interrupt() {
boolean wasbusy = busy;
busy = false;
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -105,6 +105,7 @@ public class MailReaderSamplerGui extend
initGui();
}
+ @Override
public String getLabelResource() {
return "mail_reader_title"; // $NON-NLS-1$
}
@@ -137,6 +138,7 @@ public class MailReaderSamplerGui extend
/**
* {@inheritDoc}
*/
+ @Override
public TestElement createTestElement() {
MailReaderSampler sampler = new MailReaderSampler();
modifyTestElement(sampler);
@@ -146,6 +148,7 @@ public class MailReaderSamplerGui extend
/**
* {@inheritDoc}
*/
+ @Override
public void modifyTestElement(TestElement te) {
te.clear();
configureTestElement(te);
@@ -205,6 +208,7 @@ public class MailReaderSamplerGui extend
ButtonGroup nmbg = new ButtonGroup();
allMessagesButton = new JRadioButton(AllMessagesLabel);
allMessagesButton.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
if (allMessagesButton.isSelected()) {
someMessagesField.setEnabled(false);
@@ -213,6 +217,7 @@ public class MailReaderSamplerGui extend
});
someMessagesButton = new JRadioButton();
someMessagesButton.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
if (someMessagesButton.isSelected()) {
someMessagesField.setEnabled(true);
@@ -296,6 +301,7 @@ public class MailReaderSamplerGui extend
usernameBox.setText("");// $NON-NLS-1$
}
+ @Override
public void actionPerformed(ActionEvent e) {
final String item = serverTypeBox.getText();
if (item.equals("pop3")||item.equals("pop3s")) {
@@ -308,9 +314,11 @@ public class MailReaderSamplerGui extend
}
}
+ @Override
public void focusGained(FocusEvent e) {
}
+ @Override
public void focusLost(FocusEvent e) {
actionPerformed(null);
}
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java Tue Nov 27 00:19:20 2012
@@ -113,6 +113,7 @@ public class SmtpSampler extends Abstrac
* @return sampleresult Result of the sample
* @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
*/
+ @Override
public SampleResult sample(Entry e) {
Message message = null;
SampleResult res = new SampleResult();
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java Tue Nov 27 00:19:20 2012
@@ -117,16 +117,19 @@ public class SecuritySettingsPanel exten
this.add(rbUseStartTLS, gridBagConstraints);
rbUseNone.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent evt) {
rbSecuritySettingsItemStateChanged(evt);
}
});
rbUseSSL.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent evt) {
rbSecuritySettingsItemStateChanged(evt);
}
});
rbUseStartTLS.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent evt) {
rbSecuritySettingsItemStateChanged(evt);
}
@@ -137,6 +140,7 @@ public class SecuritySettingsPanel exten
cbTrustAllCerts.setEnabled(false);
cbTrustAllCerts.setToolTipText(JMeterUtils.getResString("smtp_trustall_tooltip")); // $NON-NLS-1$
cbTrustAllCerts.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
cbTrustAllCertsActionPerformed(evt);
}
@@ -150,6 +154,7 @@ public class SecuritySettingsPanel exten
cbEnforceStartTLS.setMargin(new java.awt.Insets(0, 0, 0, 0));
cbEnforceStartTLS.setEnabled(false);
cbEnforceStartTLS.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
cbEnforceStartTLSActionPerformed(evt);
}
@@ -164,6 +169,7 @@ public class SecuritySettingsPanel exten
cbUseLocalTrustStore.setMargin(new java.awt.Insets(0, 0, 0, 0));
cbUseLocalTrustStore.setEnabled(false);
cbUseLocalTrustStore.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
cbUseLocalTrustStoreActionPerformed(evt);
}
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java Tue Nov 27 00:19:20 2012
@@ -525,6 +525,7 @@ public class SmtpPanel extends JPanel {
cbSuppressSubject = new JCheckBox(JMeterUtils.getResString("smtp_suppresssubj")); // $NON-NLS-1$
cbSuppressSubject.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent evt) {
emptySubjectActionPerformed(evt);
}
@@ -545,12 +546,14 @@ public class SmtpPanel extends JPanel {
attachmentFileChooser
.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
attachmentFolderFileChooserActionPerformed(evt);
}
});
emlFileChooser.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
emlFileChooserActionPerformed(evt);
}
@@ -669,6 +672,7 @@ public class SmtpPanel extends JPanel {
cbUseAuth.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
cbUseAuth.setMargin(new java.awt.Insets(0, 0, 0, 0));
cbUseAuth.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
cbUseAuthActionPerformed(evt);
}
@@ -752,6 +756,7 @@ public class SmtpPanel extends JPanel {
addHeaderFieldButton = new JButton(JMeterUtils.getResString("smtp_header_add"));
addHeaderFieldButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
addHeaderActionPerformed(evt);
}
@@ -809,6 +814,7 @@ public class SmtpPanel extends JPanel {
tfAttachment.setToolTipText(JMeterUtils.getResString("smtp_attach_file_tooltip")); // $NON-NLS-1$
browseButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
browseButtonActionPerformed(evt);
}
@@ -821,6 +827,7 @@ public class SmtpPanel extends JPanel {
cbUseEmlMessage.setSelected(false);
cbUseEmlMessage.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
cbUseEmlMessageActionPerformed(evt);
}
@@ -838,6 +845,7 @@ public class SmtpPanel extends JPanel {
panelMessageSettings.add(tfEmlMessage, gridBagConstraints);
emlBrowseButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
emlBrowseButtonActionPerformed(evt);
}
@@ -1034,6 +1042,7 @@ public class SmtpPanel extends JPanel {
removeButtons.put(removeButton, nameTF);
removeButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
removeHeaderActionPerformed(evt);
}
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -52,6 +52,7 @@ public class SmtpSamplerGui extends Abst
* @return Null-String
* @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource()
*/
+ @Override
public String getLabelResource() {
return "smtp_sampler_title";
}
@@ -108,6 +109,7 @@ public class SmtpSamplerGui extends Abst
* @return Test-element for JMeter
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
SmtpSampler sampler = new SmtpSampler();
modifyTestElement(sampler);
@@ -119,6 +121,7 @@ public class SmtpSamplerGui extends Abst
* @param te TestElement for JMeter
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
*/
+ @Override
public void modifyTestElement(TestElement te) {
te.clear();
super.configureTestElement(te);
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java Tue Nov 27 00:19:20 2012
@@ -49,12 +49,15 @@ public class TrustAllSSLSocketFactory ex
sslcontext = SSLContext.getInstance("TLS"); // $NON-NLS-1$
sslcontext.init( null, new TrustManager[]{
new X509TrustManager() {
+ @Override
public X509Certificate[] getAcceptedIssuers() {
return EMPTY_X509Certificate;
}
+ @Override
public void checkClientTrusted(
X509Certificate[] certs, String authType) {
}
+ @Override
public void checkServerTrusted(
X509Certificate[] certs, String authType) {
}
Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java (original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java Tue Nov 27 00:19:20 2012
@@ -94,6 +94,7 @@ public class SystemSampler extends Abstr
* the Entry for this sample
* @return test SampleResult
*/
+ @Override
public SampleResult sample(Entry entry) {
SampleResult results = new SampleResult();
results.setDataType(SampleResult.TEXT);
Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -70,6 +70,7 @@ public class SystemSamplerGui extends Ab
init();
}
+ @Override
public String getLabelResource() {
return "system_sampler_title"; // $NON-NLS-1$
}
@@ -96,12 +97,14 @@ public class SystemSamplerGui extends Ab
}
/* Implements JMeterGuiComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
SystemSampler sampler = new SystemSampler();
modifyTestElement(sampler);
return sampler;
}
+ @Override
public void modifyTestElement(TestElement sampler) {
super.configureTestElement(sampler);
SystemSampler systemSampler = (SystemSampler)sampler;
@@ -240,6 +243,7 @@ public class SystemSamplerGui extends Ab
stderr.clearGui();
}
+ @Override
public void itemStateChanged(ItemEvent e) {
if(e.getSource()==checkReturnCode) {
desiredReturnCode.setEnabled(e.getStateChange() == ItemEvent.SELECTED);
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java Tue Nov 27 00:19:20 2012
@@ -62,6 +62,7 @@ public class TCPConfigGui extends Abstra
init();
}
+ @Override
public String getLabelResource() {
return "tcp_config_title"; // $NON-NLS-1$
}
@@ -82,6 +83,7 @@ public class TCPConfigGui extends Abstra
requestData.setText(element.getPropertyAsString(TCPSampler.REQUEST));
}
+ @Override
public TestElement createTestElement() {
ConfigTestElement element = new ConfigTestElement();
modifyTestElement(element);
@@ -93,6 +95,7 @@ public class TCPConfigGui extends Abstra
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
// N.B. this will be a config element, so we cannot use the setXXX() methods
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java Tue Nov 27 00:19:20 2012
@@ -48,6 +48,7 @@ public class TCPSamplerGui extends Abstr
tcpDefaultPanel.configure(element);
}
+ @Override
public TestElement createTestElement() {
TCPSampler sampler = new TCPSampler();
modifyTestElement(sampler);
@@ -59,6 +60,7 @@ public class TCPSamplerGui extends Abstr
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
sampler.addTestElement(tcpDefaultPanel.createTestElement());
@@ -77,6 +79,7 @@ public class TCPSamplerGui extends Abstr
loginPanel.clearGui();
}
+ @Override
public String getLabelResource() {
return "tcp_sample_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java Tue Nov 27 00:19:20 2012
@@ -29,6 +29,7 @@ public abstract class AbstractTCPClient
/**
* {@inheritDoc}
*/
+ @Override
public byte getEolByte() {
return eolByte;
}
@@ -36,6 +37,7 @@ public abstract class AbstractTCPClient
/**
* {@inheritDoc}
*/
+ @Override
public void setEolByte(int eolInt) {
if (eolInt >= Byte.MIN_VALUE && eolInt <= Byte.MAX_VALUE) {
this.eolByte = (byte) eolInt;
@@ -48,18 +50,21 @@ public abstract class AbstractTCPClient
/**
* {@inheritDoc}
*/
+ @Override
public void setupTest() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void teardownTest() {
}
/**
* @return the charset
*/
+ @Override
public String getCharset() {
return charset;
}
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java Tue Nov 27 00:19:20 2012
@@ -91,6 +91,7 @@ public class BinaryTCPClientImpl extends
* @param os output stream
* @param hexEncodedBinary hex-encoded binary
*/
+ @Override
public void write(OutputStream os, String hexEncodedBinary) throws IOException{
os.write(hexStringToByteArray(hexEncodedBinary));
os.flush();
@@ -102,6 +103,7 @@ public class BinaryTCPClientImpl extends
/**
* {@inheritDoc}
*/
+ @Override
public void write(OutputStream os, InputStream is) {
throw new UnsupportedOperationException(
"Method not supported for Length-Prefixed data.");
@@ -115,6 +117,7 @@ public class BinaryTCPClientImpl extends
* @return hex-encoded binary string
* @throws ReadException
*/
+ @Override
public String read(InputStream is) throws ReadException {
ByteArrayOutputStream w = new ByteArrayOutputStream();
try {
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java Tue Nov 27 00:19:20 2012
@@ -55,6 +55,7 @@ public class LengthPrefixedBinaryTCPClie
/**
* {@inheritDoc}
*/
+ @Override
public void write(OutputStream os, String s) throws IOException{
os.write(intToByteArray(s.length()/2,lengthPrefixLen));
if(log.isDebugEnabled()) {
@@ -66,6 +67,7 @@ public class LengthPrefixedBinaryTCPClie
/**
* {@inheritDoc}
*/
+ @Override
public void write(OutputStream os, InputStream is) throws IOException {
this.tcpClient.write(os, is);
}
@@ -73,6 +75,7 @@ public class LengthPrefixedBinaryTCPClie
/**
* {@inheritDoc}
*/
+ @Override
public String read(InputStream is) throws ReadException{
byte[] msg = new byte[0];
int msgLen = 0;
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java Tue Nov 27 00:19:20 2012
@@ -69,6 +69,7 @@ public class TCPClientImpl extends Abstr
/**
* {@inheritDoc}
*/
+ @Override
public void write(OutputStream os, String s) throws IOException{
os.write(s.getBytes(charset));
os.flush();
@@ -80,6 +81,7 @@ public class TCPClientImpl extends Abstr
/**
* {@inheritDoc}
*/
+ @Override
public void write(OutputStream os, InputStream is) throws IOException{
byte buff[]=new byte[512];
while(is.read(buff) > 0){
@@ -93,6 +95,7 @@ public class TCPClientImpl extends Abstr
* If there is no EOL byte defined, then reads until
* the end of the stream is reached.
*/
+ @Override
public String read(InputStream is) throws ReadException{
ByteArrayOutputStream w = new ByteArrayOutputStream();
try {
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=1413958&r1=1413957&r2=1413958&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java Tue Nov 27 00:19:20 2012
@@ -332,6 +332,7 @@ public class TCPSampler extends Abstract
return TCPClient;
}
+ @Override
public SampleResult sample(Entry e)// Entry tends to be ignored ...
{
if (firstSample) { // Do stuff we cannot do as part of threadStarted()
@@ -445,6 +446,7 @@ public class TCPSampler extends Abstract
return true;
}
+ @Override
public void threadStarted() {
log.debug("Thread Started"); //$NON-NLS-1$
firstSample = true;
@@ -479,6 +481,7 @@ public class TCPSampler extends Abstract
/**
* {@inheritDoc}
*/
+ @Override
public void threadFinished() {
log.debug("Thread Finished"); //$NON-NLS-1$
tearDown();
@@ -514,6 +517,7 @@ public class TCPSampler extends Abstract
return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
}
+ @Override
public boolean interrupt() {
Socket sock = currentSocket; // fetch in case gets nulled later
if (sock != null) {