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:18:25 UTC
svn commit: r1413957 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http:
config/gui/ control/ control/gui/ gui/ modifier/ modifier/gui/ parser/
proxy/ proxy/gui/ sampler/ util/ util/accesslog/ visualizers/
Author: sebb
Date: Tue Nov 27 00:18:19 2012
New Revision: 1413957
URL: http://svn.apache.org/viewvc?rev=1413957&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHttpClientSocketFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHttpClientSocketFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java Tue Nov 27 00:18:19 2012
@@ -60,6 +60,7 @@ public class HttpDefaultsGui extends Abs
init();
}
+ @Override
public String getLabelResource() {
return "url_config_title"; // $NON-NLS-1$
}
@@ -67,6 +68,7 @@ public class HttpDefaultsGui extends Abs
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
ConfigTestElement config = new ConfigTestElement();
modifyTestElement(config);
@@ -78,6 +80,7 @@ public class HttpDefaultsGui extends Abs
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement config) {
ConfigTestElement cfg = (ConfigTestElement ) config;
ConfigTestElement el = (ConfigTestElement) urlConfig.createTestElement();
@@ -155,6 +158,7 @@ public class HttpDefaultsGui extends Abs
imageParser = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$
checkBoxPanel.add(imageParser);
imageParser.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) { enableConcurrentDwn(true); }
else { enableConcurrentDwn(false); }
@@ -163,6 +167,7 @@ public class HttpDefaultsGui extends Abs
// Concurrent resources download
concurrentDwn = new JCheckBox(JMeterUtils.getResString("web_testing_concurrent_download")); // $NON-NLS-1$
concurrentDwn.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(final ItemEvent e) {
if (imageParser.isSelected() && e.getStateChange() == ItemEvent.SELECTED) { concurrentPool.setEnabled(true); }
else { concurrentPool.setEnabled(false); }
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Tue Nov 27 00:18:19 2012
@@ -694,6 +694,7 @@ public class UrlConfigGui extends JPanel
}
}
// autoRedirects and followRedirects cannot both be selected
+ @Override
public void stateChanged(ChangeEvent e) {
if (e.getSource() == autoRedirects){
if (autoRedirects.isSelected()) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java Tue Nov 27 00:18:19 2012
@@ -405,18 +405,23 @@ public class CacheManager extends Config
};
}
+ @Override
public void testStarted() {
}
+ @Override
public void testEnded() {
}
+ @Override
public void testStarted(String host) {
}
+ @Override
public void testEnded(String host) {
}
+ @Override
public void testIterationStart(LoopIterationEvent event) {
if (getClearEachIteration()) {
clearCache();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Tue Nov 27 00:18:19 2012
@@ -368,6 +368,7 @@ public class CookieManager extends Confi
}
/** {@inheritDoc} */
+ @Override
public void testStarted() {
initialCookies = getCookies();
try {
@@ -381,19 +382,23 @@ public class CookieManager extends Confi
}
/** {@inheritDoc} */
+ @Override
public void testEnded() {
}
/** {@inheritDoc} */
+ @Override
public void testStarted(String host) {
testStarted();
}
/** {@inheritDoc} */
+ @Override
public void testEnded(String host) {
}
/** {@inheritDoc} */
+ @Override
public void testIterationStart(LoopIterationEvent event) {
if (getClearEachIteration()) {
log.debug("Initialise cookies from pre-defined list");
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java Tue Nov 27 00:18:19 2012
@@ -106,6 +106,7 @@ public class HC3CookieHandler implements
* URL of the request to which the returned header will be added.
* @return the value string for the cookie header (goes after "Cookie: ").
*/
+ @Override
public String getCookieHeaderForURL(
CollectionProperty cookiesCP,
URL url,
@@ -130,6 +131,7 @@ public class HC3CookieHandler implements
/**
* {@inheritDoc}
*/
+ @Override
public void addCookieFromHeader(CookieManager cookieManager,
boolean checkCookies,String cookieHeader, URL url){
boolean debugEnabled = log.isDebugEnabled();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java Tue Nov 27 00:18:19 2012
@@ -69,6 +69,7 @@ public class HC4CookieHandler implements
this.cookieSpec = registry.getCookieSpec(policy);
}
+ @Override
public void addCookieFromHeader(CookieManager cookieManager,
boolean checkCookies, String cookieHeader, URL url) {
boolean debugEnabled = log.isDebugEnabled();
@@ -131,6 +132,7 @@ public class HC4CookieHandler implements
}
}
+ @Override
public String getCookieHeaderForURL(CollectionProperty cookiesCP, URL url,
boolean allowVariableCookie) {
List<org.apache.http.cookie.Cookie> c =
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java Tue Nov 27 00:18:19 2012
@@ -150,6 +150,7 @@ public class HttpMirrorServer extends Th
}
}
+ @Override
public void stopServer() {
running = false;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java Tue Nov 27 00:18:19 2012
@@ -54,6 +54,7 @@ public class HttpMirrorThread implements
/**
* Main processing method for the HttpMirror object
*/
+ @Override
public void run() {
log.debug("Starting thread");
BufferedInputStream in = null;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java Tue Nov 27 00:18:19 2012
@@ -116,6 +116,7 @@ public class HttpMirrorControlGui extend
}
+ @Override
public void actionPerformed(ActionEvent action) {
String command = action.getActionCommand();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java Tue Nov 27 00:18:19 2012
@@ -99,6 +99,7 @@ public class HttpTestSampleGui extends A
/**
* {@inheritDoc}
*/
+ @Override
public TestElement createTestElement() {
HTTPSamplerBase sampler = new HTTPSamplerProxy();
modifyTestElement(sampler);
@@ -110,6 +111,7 @@ public class HttpTestSampleGui extends A
* <p>
* {@inheritDoc}
*/
+ @Override
public void modifyTestElement(TestElement sampler) {
sampler.clear();
urlConfigGui.modifyTestElement(sampler);
@@ -130,6 +132,7 @@ public class HttpTestSampleGui extends A
/**
* {@inheritDoc}
*/
+ @Override
public String getLabelResource() {
return "web_testing_title"; // $NON-NLS-1$
}
@@ -159,6 +162,7 @@ public class HttpTestSampleGui extends A
getImages = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$
// add a listener to activate or not concurrent dwn.
getImages.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) { enableConcurrentDwn(true); }
else { enableConcurrentDwn(false); }
@@ -167,6 +171,7 @@ public class HttpTestSampleGui extends A
// Download concurrent resources
concurrentDwn = new JCheckBox(JMeterUtils.getResString("web_testing_concurrent_download")); // $NON-NLS-1$
concurrentDwn.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(final ItemEvent e) {
if (getImages.isSelected() && e.getStateChange() == ItemEvent.SELECTED) { concurrentPool.setEnabled(true); }
else { concurrentPool.setEnabled(false); }
@@ -238,6 +243,7 @@ public class HttpTestSampleGui extends A
}
}
+ @Override
public void itemStateChanged(ItemEvent event) {
if (event.getStateChange() == ItemEvent.SELECTED) {
enableConcurrentDwn(true);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java Tue Nov 27 00:18:19 2012
@@ -51,6 +51,7 @@ public class SoapSamplerGui extends Abst
init();
}
+ @Override
public String getLabelResource() {
return "soap_sampler_title"; //$NON-NLS-1$
}
@@ -58,6 +59,7 @@ public class SoapSamplerGui extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public TestElement createTestElement() {
SoapSampler sampler = new SoapSampler();
modifyTestElement(sampler);
@@ -69,6 +71,7 @@ public class SoapSamplerGui extends Abst
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement s) {
this.configureTestElement(s);
if (s instanceof SoapSampler) {
@@ -140,6 +143,7 @@ public class SoapSamplerGui extends Abst
mainPanel.add(soapXmlFile, BorderLayout.SOUTH);
sendSoapAction.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
soapAction.setEnabled(sendSoapAction.isSelected());
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java Tue Nov 27 00:18:19 2012
@@ -144,6 +144,7 @@ public class WebServiceSamplerGui extend
init();
}
+ @Override
public String getLabelResource() {
return "webservice_sampler_title"; // $NON-NLS-1$
}
@@ -151,6 +152,7 @@ public class WebServiceSamplerGui extend
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
WebServiceSampler sampler = new WebServiceSampler();
this.configureTestElement(sampler);
@@ -163,6 +165,7 @@ public class WebServiceSamplerGui extend
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement s) {
WebServiceSampler sampler = (WebServiceSampler) s;
this.configureTestElement(sampler);
@@ -476,6 +479,7 @@ public class WebServiceSamplerGui extend
* @param event
* that occurred
*/
+ @Override
public void actionPerformed(ActionEvent event) {
final Object eventSource = event.getSource();
if (eventSource == selectButton) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Tue Nov 27 00:18:19 2012
@@ -92,6 +92,7 @@ public class AuthPanel extends AbstractC
init();
}
+ @Override
public TestElement createTestElement() {
AuthManager authMan = tableModel.manager;
configureTestElement(authMan);
@@ -103,6 +104,7 @@ public class AuthPanel extends AbstractC
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
GuiUtils.stopTableEditing(authTable);
el.clear();
@@ -133,6 +135,7 @@ public class AuthPanel extends AbstractC
}
}
+ @Override
public String getLabelResource() {
return "auth_manager_title"; //$NON-NLS-1$
}
@@ -148,6 +151,7 @@ public class AuthPanel extends AbstractC
add(createAuthTablePanel(), BorderLayout.CENTER);
}
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
@@ -314,6 +318,7 @@ public class AuthPanel extends AbstractC
/**
* Required by table model interface.
*/
+ @Override
public int getRowCount() {
return manager.getAuthObjects().size();
}
@@ -321,6 +326,7 @@ public class AuthPanel extends AbstractC
/**
* Required by table model interface.
*/
+ @Override
public int getColumnCount() {
return manager.getColumnCount();
}
@@ -336,6 +342,7 @@ public class AuthPanel extends AbstractC
/**
* Required by table model interface.
*/
+ @Override
public Object getValueAt(int row, int column) {
Authorization auth = manager.getAuthObjectAt(row);
@@ -392,6 +399,7 @@ public class AuthPanel extends AbstractC
setBorder(myBorder);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
setText((String) value);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java Tue Nov 27 00:18:19 2012
@@ -52,6 +52,7 @@ public class CacheManagerGui extends Abs
init();
}
+ @Override
public String getLabelResource() {
return "cache_manager_title"; // $NON-NLS-1$
}
@@ -75,6 +76,7 @@ public class CacheManagerGui extends Abs
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
CacheManager element = new CacheManager();
modifyTestElement(element);
@@ -82,6 +84,7 @@ public class CacheManagerGui extends Abs
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
final CacheManager cacheManager = (CacheManager)element;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Tue Nov 27 00:18:19 2012
@@ -140,10 +140,12 @@ public class CookiePanel extends Abstrac
init();
}
+ @Override
public String getLabelResource() {
return "cookie_manager_title"; //$NON-NLS-1$
}
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
@@ -245,6 +247,7 @@ public class CookiePanel extends Abstrac
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement cm) {
GuiUtils.stopTableEditing(cookieTable);
cm.clear();
@@ -296,6 +299,7 @@ public class CookiePanel extends Abstrac
}
}
+ @Override
public TestElement createTestElement() {
CookieManager cookieManager = new CookieManager();
modifyTestElement(cookieManager);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java Tue Nov 27 00:18:19 2012
@@ -219,6 +219,7 @@ public class HTTPFileArgsPanel extends J
* @param e
* the event that has occurred
*/
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
if (action.equals(ADD)) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java Tue Nov 27 00:18:19 2012
@@ -86,6 +86,7 @@ public class HeaderPanel extends Abstrac
init();
}
+ @Override
public TestElement createTestElement() {
configureTestElement(headerManager);
return (TestElement) headerManager.clone();
@@ -96,6 +97,7 @@ public class HeaderPanel extends Abstrac
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement el) {
GuiUtils.stopTableEditing(headerTable);
el.clear();
@@ -126,6 +128,7 @@ public class HeaderPanel extends Abstrac
}
+ @Override
public String getLabelResource() {
return "header_manager_title"; // $NON-NLS-1$
}
@@ -138,6 +141,7 @@ public class HeaderPanel extends Abstrac
add(createHeaderTablePanel(), BorderLayout.CENTER);
}
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
@@ -340,6 +344,7 @@ public class HeaderPanel extends Abstrac
return getValueAt(0, column).getClass();
}
+ @Override
public int getRowCount() {
return manager.getHeaders().size();
}
@@ -347,6 +352,7 @@ public class HeaderPanel extends Abstrac
/**
* Required by table model interface.
*/
+ @Override
public int getColumnCount() {
return manager.getColumnCount();
}
@@ -362,6 +368,7 @@ public class HeaderPanel extends Abstrac
/**
* Required by table model interface.
*/
+ @Override
public Object getValueAt(int row, int column) {
Header head = manager.getHeader(row);
if (column == 0) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java Tue Nov 27 00:18:19 2012
@@ -61,6 +61,7 @@ public class AnchorModifier extends Abst
/**
* Modifies an Entry object based on HTML response text.
*/
+ @Override
public void process() {
JMeterContext context = getThreadContext();
Sampler sam = context.getCurrentSampler();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java Tue Nov 27 00:18:19 2012
@@ -79,17 +79,21 @@ public class ParamModifier extends Abstr
return (ParamMask) getProperty(MASK).getObjectValue();
}
+ @Override
public void testStarted() {
getMask().resetValue();
}
+ @Override
public void testStarted(String host) {
getMask().resetValue();
}
+ @Override
public void testEnded() {
}
+ @Override
public void testEnded(String host) {
}
@@ -104,6 +108,7 @@ public class ParamModifier extends Abstr
* matches a defined mask.
*
*/
+ @Override
public void process() {
Sampler sam = getThreadContext().getCurrentSampler();
HTTPSamplerBase sampler = null;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java Tue Nov 27 00:18:19 2012
@@ -66,6 +66,7 @@ public class URLRewritingModifier extend
// PreProcessors are cloned per-thread, so this will be saved per-thread
private transient String savedValue = ""; // $NON-NLS-1$
+ @Override
public void process() {
JMeterContext ctx = getThreadContext();
Sampler sampler = ctx.getCurrentSampler();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java Tue Nov 27 00:18:19 2012
@@ -59,21 +59,27 @@ public class UserParameterXMLContentHand
/*-------------------------------------------------------------------------
* Methods implemented from org.xml.sax.ContentHandler
*----------------------------------------------------------------------- */
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void startElement(String namespaceURL, String localName, String qName, Attributes atts) throws SAXException {
contents.reset();
@@ -93,6 +99,7 @@ public class UserParameterXMLContentHand
}
+ @Override
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
if (qName.equals("paramname")) {
paramname = contents.toString();
@@ -108,16 +115,20 @@ public class UserParameterXMLContentHand
}
}
+ @Override
public void characters(char ch[], int start, int length) throws SAXException {
contents.write(ch, start, length);
}
+ @Override
public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String date) throws SAXException {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java Tue Nov 27 00:18:19 2012
@@ -31,18 +31,21 @@ import org.xml.sax.SAXParseException;
public class UserParameterXMLErrorHandler implements ErrorHandler {
private static final Logger log = LoggingManager.getLoggerForClass();
+ @Override
public void warning(SAXParseException exception) throws SAXException {
log.warn("**Parsing Warning**\n" + " line: " + exception.getLineNumber() + "\n" + " URI: :"
+ exception.getSystemId() + "\n" + " Message: " + exception.getMessage());
throw new SAXException("Warning encountered");
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
log.error("**Parsing Warning**\n" + " line: " + exception.getLineNumber() + "\n" + " URI: :"
+ exception.getSystemId() + "\n" + " Message: " + exception.getMessage());
throw new SAXException("Error encountered");
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
log.error("**Parsing Warning**\n" + " line: " + exception.getLineNumber() + "\n" + " URI: :"
+ exception.getSystemId() + "\n" + " Message: " + exception.getMessage());
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java Tue Nov 27 00:18:19 2012
@@ -31,10 +31,12 @@ public class AnchorModifierGui extends A
init();
}
+ @Override
public String getLabelResource() {
return "anchor_modifier_title"; //$NON-NLS-1$
}
+ @Override
public TestElement createTestElement() {
AnchorModifier modifier = new AnchorModifier();
modifyTestElement(modifier);
@@ -46,6 +48,7 @@ public class AnchorModifierGui extends A
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement modifier) {
configureTestElement(modifier);
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java Tue Nov 27 00:18:19 2012
@@ -81,6 +81,7 @@ public class ParamModifierGui extends Ab
init();
}
+ @Override
public String getLabelResource() {
return "html_parameter_mask"; //$NON-NLS-1$
}
@@ -92,6 +93,7 @@ public class ParamModifierGui extends Ab
updateGui(model);
}
+ @Override
public TestElement createTestElement() {
ParamModifier modifier = new ParamModifier();
modifyTestElement(modifier);
@@ -103,6 +105,7 @@ public class ParamModifierGui extends Ab
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement m) {
configureTestElement(m);
if (m instanceof ParamModifier) {
@@ -132,9 +135,11 @@ public class ParamModifierGui extends Ab
_suffix.setText(""); //$NON-NLS-1$
}
+ @Override
public void focusGained(FocusEvent evt) {
}
+ @Override
public void focusLost(FocusEvent evt) {
String name = ((Component) evt.getSource()).getName();
if (evt.isTemporary()) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java Tue Nov 27 00:18:19 2012
@@ -42,6 +42,7 @@ public class URLRewritingModifierGui ext
private JCheckBox shouldCache;
+ @Override
public String getLabelResource() {
return "http_url_rewriting_modifier_title"; // $NON-NLS-1$
}
@@ -80,6 +81,7 @@ public class URLRewritingModifierGui ext
/**
* {@inheritDoc}
*/
+ @Override
public TestElement createTestElement() {
URLRewritingModifier modifier = new URLRewritingModifier();
modifyTestElement(modifier);
@@ -91,6 +93,7 @@ public class URLRewritingModifierGui ext
* <p>
* {@inheritDoc}
*/
+ @Override
public void modifyTestElement(TestElement modifier) {
this.configureTestElement(modifier);
URLRewritingModifier rewritingModifier = ((URLRewritingModifier) modifier);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Tue Nov 27 00:18:19 2012
@@ -111,6 +111,7 @@ public class URLCollection {
iter = i;
}
+ @Override
public boolean hasNext() {
return iter.hasNext();
}
@@ -118,10 +119,12 @@ public class URLCollection {
/*
* Unwraps the URLString class to return the URL
*/
+ @Override
public URL next() {
return iter.next().getURL();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java Tue Nov 27 00:18:19 2012
@@ -67,6 +67,7 @@ public class URLString implements Compar
}
/** {@inheritDoc} */
+ @Override
public int compareTo(URLString o) {
return urlAsString.compareTo(o.toString());
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java Tue Nov 27 00:18:19 2012
@@ -152,6 +152,7 @@ public class Daemon extends Thread imple
*
* see #ACCEPT_TIMEOUT
*/
+ @Override
public void stopServer() {
running = false;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java Tue Nov 27 00:18:19 2012
@@ -53,6 +53,7 @@ public class DefaultSamplerCreator exten
/**
* @see org.apache.jmeter.protocol.http.proxy.SamplerCreator#getManagedContentTypes()
*/
+ @Override
public String[] getManagedContentTypes() {
return new String[0];
}
@@ -61,6 +62,7 @@ public class DefaultSamplerCreator exten
*
* @see org.apache.jmeter.protocol.http.proxy.SamplerCreator#createSampler(org.apache.jmeter.protocol.http.proxy.HttpRequestHdr, java.util.Map, java.util.Map)
*/
+ @Override
public HTTPSamplerBase createSampler(HttpRequestHdr request,
Map<String, String> pageEncodings, Map<String, String> formEncodings) {
// Instantiate the sampler
@@ -81,6 +83,7 @@ public class DefaultSamplerCreator exten
/**
* @see org.apache.jmeter.protocol.http.proxy.SamplerCreator#populateSampler(org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase, org.apache.jmeter.protocol.http.proxy.HttpRequestHdr, java.util.Map, java.util.Map)
*/
+ @Override
public final void populateSampler(HTTPSamplerBase sampler,
HttpRequestHdr request, Map<String, String> pageEncodings,
Map<String, String> formEncodings) throws Exception{
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Tue Nov 27 00:18:19 2012
@@ -537,7 +537,8 @@ public class ProxyControl extends Generi
sc.setProperty(TestElement.GUI_CLASS, LOGIC_CONTROLLER_GUI);
sc.setName("-------------------"); // $NON-NLS-1$
JMeterUtils.runSafe(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
model.addComponent(sc, node);
} catch (IllegalUserActionException e) {
@@ -566,7 +567,8 @@ public class ProxyControl extends Generi
sc.setProperty(TestElement.GUI_CLASS, LOGIC_CONTROLLER_GUI);
sc.setName(name);
JMeterUtils.runSafe(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
model.addComponent(sc, node);
} catch (IllegalUserActionException e) {
@@ -595,7 +597,8 @@ public class ProxyControl extends Generi
sc.setProperty(TestElement.GUI_CLASS, TRANSACTION_CONTROLLER_GUI);
sc.setName(name);
JMeterUtils.runSafe(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
model.addComponent(sc, node);
} catch (IllegalUserActionException e) {
@@ -832,7 +835,8 @@ public class ProxyControl extends Generi
final boolean firstInBatchFinal = firstInBatch;
final JMeterTreeNode myTargetFinal = myTarget;
JMeterUtils.runSafe(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
final JMeterTreeNode newNode = treeModel.addComponent(sampler, myTargetFinal);
if (firstInBatchFinal) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Tue Nov 27 00:18:19 2012
@@ -328,12 +328,14 @@ public class ProxyControlGui extends Log
* Also handles samplerTypeName
*/
/** {@inheritDoc} */
+ @Override
public void itemStateChanged(ItemEvent e) {
// System.err.println(e.paramString());
enableRestart();
}
/** {@inheritDoc} */
+ @Override
public void actionPerformed(ActionEvent action) {
String command = action.getActionCommand();
@@ -483,14 +485,17 @@ public class ProxyControlGui extends Log
}
/** {@inheritDoc} */
+ @Override
public void keyPressed(KeyEvent e) {
}
/** {@inheritDoc} */
+ @Override
public void keyTyped(KeyEvent e) {
}
/** {@inheritDoc} */
+ @Override
public void keyReleased(KeyEvent e) {
String fieldName = e.getComponent().getName();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Tue Nov 27 00:18:19 2012
@@ -509,6 +509,7 @@ public class AjpSampler extends HTTPSamp
return s;
}
+ @Override
public boolean interrupt() {
Socket chan = activeChannel;
if (chan != null) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java Tue Nov 27 00:18:19 2012
@@ -36,6 +36,7 @@ public class HTTPFileImpl extends HTTPAb
super(base);
}
+ @Override
public boolean interrupt() {
return false;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Tue Nov 27 00:18:19 2012
@@ -1113,6 +1113,7 @@ public class HTTPHC3Impl extends HTTPHCA
}
/** {@inheritDoc} */
+ @Override
public boolean interrupt() {
HttpClient client = savedClient;
if (client != null) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Tue Nov 27 00:18:19 2012
@@ -125,6 +125,7 @@ public class HTTPHC4Impl extends HTTPHCA
private static final String CONTEXT_METRICS = "jmeter_metrics"; // TODO hack, to be removed later
private static final HttpResponseInterceptor METRICS_SAVER = new HttpResponseInterceptor(){
+ @Override
public void process(HttpResponse response, HttpContext context)
throws HttpException, IOException {
HttpConnection conn = (HttpConnection) context.getAttribute(ExecutionContext.HTTP_CONNECTION);
@@ -133,7 +134,8 @@ public class HTTPHC4Impl extends HTTPHCA
}
};
private static final HttpRequestInterceptor METRICS_RESETTER = new HttpRequestInterceptor() {
- public void process(HttpRequest request, HttpContext context)
+ @Override
+ public void process(HttpRequest request, HttpContext context)
throws HttpException, IOException {
HttpConnection conn = (HttpConnection) context.getAttribute(ExecutionContext.HTTP_CONNECTION);
HttpConnectionMetrics metrics = conn.getMetrics();
@@ -1109,6 +1111,7 @@ public class HTTPHC4Impl extends HTTPHCA
}
}
+ @Override
public boolean interrupt() {
HttpUriRequest request = currentRequest;
if (request != null) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java Tue Nov 27 00:18:19 2012
@@ -648,6 +648,7 @@ public class HTTPJavaImpl extends HTTPAb
}
/** {@inheritDoc} */
+ @Override
public boolean interrupt() {
HttpURLConnection conn = savedConn;
if (conn != null) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java Tue Nov 27 00:18:19 2012
@@ -33,6 +33,7 @@ public class HTTPSampler extends HTTPSam
hc = new HTTPJavaImpl(this);
}
+ @Override
public boolean interrupt() {
return hc.interrupt();
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java Tue Nov 27 00:18:19 2012
@@ -42,6 +42,7 @@ public class HTTPSampler2 extends HTTPSa
hc = new HTTPHC3Impl(this);
}
+ @Override
public boolean interrupt() {
return hc.interrupt();
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Tue Nov 27 00:18:19 2012
@@ -1072,6 +1072,7 @@ public abstract class HTTPSamplerBase ex
* <code>Entry</code> to be sampled
* @return results of the sampling
*/
+ @Override
public SampleResult sample(Entry e) {
return sample();
}
@@ -1230,8 +1231,10 @@ public abstract class HTTPSamplerBase ex
poolSize, poolSize, KEEPALIVETIME, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(),
new ThreadFactory() {
+ @Override
public Thread newThread(final Runnable r) {
Thread t = new CleanerThread(new Runnable() {
+ @Override
public void run() {
try {
r.run();
@@ -1315,12 +1318,14 @@ public abstract class HTTPSamplerBase ex
/**
* {@inheritDoc}
*/
+ @Override
public void testEnded() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void testEnded(String host) {
testEnded();
}
@@ -1328,7 +1333,8 @@ public abstract class HTTPSamplerBase ex
/**
* {@inheritDoc}
*/
- public void testIterationStart(LoopIterationEvent event) {
+ @Override
+ public void testIterationStart(LoopIterationEvent event) {
if (!USE_CACHED_SSL_CONTEXT) {
JsseSSLManager sslMgr = (JsseSSLManager) SSLManager.getInstance();
sslMgr.resetContext();
@@ -1348,12 +1354,14 @@ public abstract class HTTPSamplerBase ex
/**
* {@inheritDoc}
*/
+ @Override
public void testStarted() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void testStarted(String host) {
testStarted();
}
@@ -1592,9 +1600,11 @@ public abstract class HTTPSamplerBase ex
// Implement these here, to avoid re-implementing for sub-classes
// (previously these were implemented in all TestElements)
+ @Override
public void threadStarted(){
}
+ @Override
public void threadFinished(){
}
@@ -1787,6 +1797,7 @@ public abstract class HTTPSamplerBase ex
this.jmeterContextOfParentThread = JMeterContextService.getContext();
}
+ @Override
public AsynSamplerResultHolder call() {
JMeterContextService.replaceContext(jmeterContextOfParentThread);
((CleanerThread) Thread.currentThread()).registerSamplerForEndNotification(sampler);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java Tue Nov 27 00:18:19 2012
@@ -72,6 +72,7 @@ public final class HTTPSamplerProxy exte
}
}
+ @Override
public boolean interrupt() {
if (impl != null) {
return impl.interrupt(); // Forward to sampler
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java Tue Nov 27 00:18:19 2012
@@ -174,10 +174,12 @@ public class SoapSampler extends HTTPSam
postedBody.append("Filename: ").append(xmlFile).append("\n");
postedBody.append("<actual file content, not shown here>");
post.setRequestEntity(new RequestEntity() {
+ @Override
public boolean isRepeatable() {
return true;
}
+ @Override
public void writeRequest(OutputStream out) throws IOException {
InputStream in = null;
try{
@@ -189,6 +191,7 @@ public class SoapSampler extends HTTPSam
}
}
+ @Override
public long getContentLength() {
switch(length){
case -1:
@@ -200,6 +203,7 @@ public class SoapSampler extends HTTPSam
}
}
+ @Override
public String getContentType() {
// TODO do we need to add a charset for the file contents?
return DEFAULT_CONTENT_TYPE; // $NON-NLS-1$
@@ -208,16 +212,19 @@ public class SoapSampler extends HTTPSam
} else {
postedBody.append(getXmlData());
post.setRequestEntity(new RequestEntity() {
+ @Override
public boolean isRepeatable() {
return true;
}
+ @Override
public void writeRequest(OutputStream out) throws IOException {
// charset must agree with content-type below
IOUtils.write(getXmlData(), out, ENCODING); // $NON-NLS-1$
out.flush();
}
+ @Override
public long getContentLength() {
try {
return getXmlData().getBytes(ENCODING).length; // so we don't generate chunked encoding
@@ -227,6 +234,7 @@ public class SoapSampler extends HTTPSam
}
}
+ @Override
public String getContentType() {
return DEFAULT_CONTENT_TYPE+"; charset="+ENCODING; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java Tue Nov 27 00:18:19 2012
@@ -39,6 +39,7 @@ import org.apache.jmeter.util.JsseSSLMan
public class HC4TrustAllSSLSocketFactory extends SSLSocketFactory {
private static final TrustStrategy TRUSTALL = new TrustStrategy(){
+ @Override
public boolean isTrusted(X509Certificate[] chain, String authType) {
return true;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHttpClientSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHttpClientSocketFactory.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHttpClientSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHttpClientSocketFactory.java Tue Nov 27 00:18:19 2012
@@ -42,16 +42,19 @@ public class LoopbackHttpClientSocketFac
super();
}
+ @Override
public Socket createSocket(String host, int port, InetAddress clientHost,
int clientPort) throws IOException, UnknownHostException {
return new LoopbackHTTPSocket(host,port,clientHost,clientPort);
}
+ @Override
public Socket createSocket(String host, int port) throws IOException,
UnknownHostException {
return new LoopbackHTTPSocket(host,port);
}
+ @Override
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
HttpConnectionParams params)
throws IOException, UnknownHostException, ConnectTimeoutException {
@@ -77,6 +80,7 @@ public class LoopbackHttpClientSocketFac
// Now allow the URL handling to work.
URLStreamHandlerFactory ushf = new URLStreamHandlerFactory(){
+ @Override
public URLStreamHandler createURLStreamHandler(String protocol) {
if (protocol.equalsIgnoreCase(LOOPBACK)){
return new URLStreamHandler(){
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHttpClientSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHttpClientSocketFactory.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHttpClientSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHttpClientSocketFactory.java Tue Nov 27 00:18:19 2012
@@ -45,16 +45,19 @@ public class SlowHttpClientSocketFactory
CPS = cps;
}
+ @Override
public Socket createSocket(String host, int port, InetAddress clientHost,
int clientPort) throws IOException, UnknownHostException {
return new SlowSocket(CPS,host,port,clientHost,clientPort);
}
+ @Override
public Socket createSocket(String host, int port) throws IOException,
UnknownHostException {
return new SlowSocket(CPS,host,port);
}
+ @Override
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
HttpConnectionParams params)
throws IOException, UnknownHostException, ConnectTimeoutException {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java Tue Nov 27 00:18:19 2012
@@ -121,6 +121,7 @@ public class LogFilter implements Filter
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#setReplaceExtension(java.lang.String,
* java.lang.String)
*/
+ @Override
public void setReplaceExtension(String oldext, String newext) {
if (oldext != null && newext != null) {
this.CHANGEEXT = true;
@@ -140,6 +141,7 @@ public class LogFilter implements Filter
* @param filenames
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#includeFiles(java.lang.String[])
*/
+ @Override
public void includeFiles(String[] filenames) {
if (filenames != null && filenames.length > 0) {
INCFILE = filenames;
@@ -153,6 +155,7 @@ public class LogFilter implements Filter
* @param filenames
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#excludeFiles(java.lang.String[])
*/
+ @Override
public void excludeFiles(String[] filenames) {
if (filenames != null && filenames.length > 0) {
EXCFILE = filenames;
@@ -168,6 +171,7 @@ public class LogFilter implements Filter
* @param regexp
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#includePattern(String[])
*/
+ @Override
public void includePattern(String[] regexp) {
if (regexp != null && regexp.length > 0) {
INCPTRN = regexp;
@@ -189,6 +193,7 @@ public class LogFilter implements Filter
*
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#excludePattern(String[])
*/
+ @Override
public void excludePattern(String[] regexp) {
if (regexp != null && regexp.length > 0) {
EXCPTRN = regexp;
@@ -214,6 +219,7 @@ public class LogFilter implements Filter
* @param path
* @return boolean
*/
+ @Override
public boolean isFiltered(String path,TestElement el) {
// we do a quick check to see if any
// filters are set. If not we just
@@ -387,6 +393,7 @@ public class LogFilter implements Filter
*
* @see org.apache.jmeter.protocol.http.util.accesslog.Filter#filter(java.lang.String)
*/
+ @Override
public String filter(String text) {
if (this.CHANGEEXT) {
if (replaceExtension(text)) {
@@ -420,6 +427,7 @@ public class LogFilter implements Filter
/**
* {@inheritDoc}
*/
+ @Override
public void reset() {
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java Tue Nov 27 00:18:19 2012
@@ -77,6 +77,7 @@ public class SessionFilter implements Fi
/**
* {@inheritDoc}
*/
+ @Override
public void reset() {
cookieManagers.clear();
}
@@ -109,18 +110,21 @@ public class SessionFilter implements Fi
/**
* {@inheritDoc}
*/
+ @Override
public void excludeFiles(String[] filenames) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void excludePattern(String[] regexp) {
}
/**
* {@inheritDoc}
*/
+ @Override
public String filter(String text) {
return text;
}
@@ -128,18 +132,21 @@ public class SessionFilter implements Fi
/**
* {@inheritDoc}
*/
+ @Override
public void includeFiles(String[] filenames) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void includePattern(String[] regexp) {
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isFiltered(String path,TestElement sampler) {
String ipAddr = getIpAddress(path);
CookieManager cm = getCookieManager(ipAddr);
@@ -194,12 +201,14 @@ public class SessionFilter implements Fi
/**
* {@inheritDoc}
*/
+ @Override
public void setReplaceExtension(String oldextension, String newextension) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void threadFinished() {
synchronized(managersInUse)
{
@@ -211,6 +220,7 @@ public class SessionFilter implements Fi
/**
* {@inheritDoc}
*/
+ @Override
public void threadStarted() {
}
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java Tue Nov 27 00:18:19 2012
@@ -119,6 +119,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void close() {
JOrphanUtils.closeQuietly(OUTPUT);
JOrphanUtils.closeQuietly(WRITER);
@@ -127,6 +128,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setHost(String host) {
SAMPLE.setDomain(host);
}
@@ -134,6 +136,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setLabel(String label) {
}
@@ -141,6 +144,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setMethod(String post_get) {
SAMPLE.setMethod(post_get);
}
@@ -148,6 +152,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setParams(NVPair[] params) {
for (int idx = 0; idx < params.length; idx++) {
SAMPLE.addArgument(params[idx].getName(), params[idx].getValue());
@@ -157,6 +162,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setPath(String path) {
SAMPLE.setPath(path);
}
@@ -164,6 +170,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setPort(int port) {
SAMPLE.setPort(port);
}
@@ -171,6 +178,7 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setQueryString(String querystring) {
SAMPLE.parseArguments(querystring);
}
@@ -178,18 +186,21 @@ public class StandardGenerator implement
/**
* {@inheritDoc}
*/
+ @Override
public void setSourceLogs(String sourcefile) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void setTarget(Object target) {
}
/**
* {@inheritDoc}
*/
+ @Override
public Object generateRequest() {
SAMPLE = HTTPSamplerFactory.newInstance();
return SAMPLE;
@@ -199,6 +210,7 @@ public class StandardGenerator implement
* save must be called to write the jmx file, otherwise it will not be
* saved.
*/
+ @Override
public void save() {
// no implementation at this time, since
// we bypass the idea of having a console
@@ -212,6 +224,7 @@ public class StandardGenerator implement
* <p>
* {@inheritDoc}
*/
+ @Override
public void reset() {
SAMPLE = null;
generateRequest();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java Tue Nov 27 00:18:19 2012
@@ -171,6 +171,7 @@ public class TCLogParser implements LogP
*
* @param filter
*/
+ @Override
public void setFilter(Filter filter) {
FILTER = filter;
}
@@ -180,6 +181,7 @@ public class TCLogParser implements LogP
*
* @param source
*/
+ @Override
public void setSourceFile(String source) {
this.FILENAME = source;
}
@@ -230,6 +232,7 @@ public class TCLogParser implements LogP
* @param count
* @return lines parsed
*/
+ @Override
public int parseAndConfigure(int count, TestElement el) {
return this.parse(el, count);
}
@@ -555,6 +558,7 @@ public class TCLogParser implements LogP
return new StringTokenizer(line, delim);
}
+ @Override
public void close() {
try {
this.READER.close();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java?rev=1413957&r1=1413956&r2=1413957&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java Tue Nov 27 00:18:19 2012
@@ -137,6 +137,7 @@ public class RequestViewHTTP implements
/* (non-Javadoc)
* @see org.apache.jmeter.visualizers.request.RequestView#init()
*/
+ @Override
public void init() {
paneParsed = new JPanel(new BorderLayout(0, 5));
paneParsed.add(createRequestPane());
@@ -145,6 +146,7 @@ public class RequestViewHTTP implements
/* (non-Javadoc)
* @see org.apache.jmeter.visualizers.request.RequestView#clearData()
*/
+ @Override
public void clearData() {
requestModel.clearData();
paramsModel.clearData();
@@ -154,6 +156,7 @@ public class RequestViewHTTP implements
/* (non-Javadoc)
* @see org.apache.jmeter.visualizers.request.RequestView#setSamplerResult(java.lang.Object)
*/
+ @Override
public void setSamplerResult(Object objectResult) {
if (objectResult instanceof HTTPSampleResult) {
@@ -277,6 +280,7 @@ public class RequestViewHTTP implements
return null;
}
+ @Override
public JPanel getPanel() {
return paneParsed;
}
@@ -342,6 +346,7 @@ public class RequestViewHTTP implements
/* (non-Javadoc)
* @see org.apache.jmeter.visualizers.request.RequestView#getLabel()
*/
+ @Override
public String getLabel() {
return JMeterUtils.getResString(KEY_LABEL);
}