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:15:16 UTC
svn commit: r1413956 [1/3] - in /jmeter/trunk/src/core/org/apache/jmeter: ./
assertions/gui/ config/ config/gui/ control/ control/gui/ engine/
engine/util/ functions/ functions/gui/ gui/ gui/action/ gui/tree/ gui/util/
processor/gui/ reporters/ reporte...
Author: sebb
Date: Tue Nov 27 00:14:39 2012
New Revision: 1413956
URL: http://svn.apache.org/viewvc?rev=1413956&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/RunTimeGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java
jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/EscapeDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java
jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampler.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java
jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java
jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java
jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java
jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/TableSample.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Tue Nov 27 00:14:39 2012
@@ -302,6 +302,7 @@ public class JMeter implements JMeterPlu
}
Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ @Override
public void uncaughtException(Thread t, Throwable e) {
if (!(e instanceof ThreadDeath)) {
log.error("Uncaught exception: ", e);
@@ -929,6 +930,7 @@ public class JMeter implements JMeterPlu
this.engines=engines;
}
+ @Override
public void testEnded(String host) {
long now=System.currentTimeMillis();
log.info("Finished remote host: " + host + " ("+now+")");
@@ -938,6 +940,7 @@ public class JMeter implements JMeterPlu
}
}
+ @Override
public void testEnded() {
long now = System.currentTimeMillis();
println("Tidying up ... @ "+new Date(now)+" ("+now+")");
@@ -945,12 +948,14 @@ public class JMeter implements JMeterPlu
checkForRemainingThreads();
}
+ @Override
public void testStarted(String host) {
started.incrementAndGet();
long now=System.currentTimeMillis();
log.info("Started remote host: " + host + " ("+now+")");
}
+ @Override
public void testStarted() {
long now=System.currentTimeMillis();
log.info(JMeterUtils.getResString("running_test")+" ("+now+")");//$NON-NLS-1$
@@ -963,6 +968,7 @@ public class JMeter implements JMeterPlu
* been delivered. Should also improve performance of remote JMeter
* testing.
*/
+ @Override
public void run() {
long now = System.currentTimeMillis();
println("Tidying up remote @ "+new Date(now)+" ("+now+")");
@@ -1032,6 +1038,7 @@ public class JMeter implements JMeterPlu
{ "org.apache.jmeter.assertions.gui.AbstractAssertionGui", "org/apache/jmeter/images/question.gif"} //$NON-NLS-1$ $NON-NLS-2$
};
+ @Override
public String[][] getIconMappings() {
final String defaultIconProp = "org/apache/jmeter/images/icon.properties"; //$NON-NLS-1$
String iconProp = JMeterUtils.getPropDefault("jmeter.icons", defaultIconProp);//$NON-NLS-1$
@@ -1062,6 +1069,7 @@ public class JMeter implements JMeterPlu
return iconlist;
}
+ @Override
public String[][] getResourceBundles() {
return new String[0][];
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Tue Nov 27 00:14:39 2012
@@ -90,6 +90,7 @@ public final class NewDriver {
new File(jmDir + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
for (int a = 0; a < libDirs.length; a++) {
File[] libJars = libDirs[a].listFiles(new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {// only accept jar files
return name.endsWith(".jar");// $NON-NLS-1$
}
@@ -125,7 +126,8 @@ public final class NewDriver {
System.setProperty(JAVA_CLASS_PATH, initial_classpath + classpath.toString());
loader = AccessController.doPrivileged(
new java.security.PrivilegedAction<DynamicClassLoader>() {
- public DynamicClassLoader run() {
+ @Override
+ public DynamicClassLoader run() {
return new DynamicClassLoader(jars.toArray(new URL[jars.size()]));
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java Tue Nov 27 00:14:39 2012
@@ -47,6 +47,7 @@ public abstract class AbstractAssertionG
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.ASSERTIONS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java Tue Nov 27 00:14:39 2012
@@ -43,6 +43,7 @@ public class ConfigTestElement extends A
/**
* {@inheritDoc}
*/
+ @Override
public void addConfigElement(ConfigElement config) {
mergeIn((TestElement) config);
}
@@ -50,6 +51,7 @@ public class ConfigTestElement extends A
/**
* {@inheritDoc}
*/
+ @Override
public boolean expectsModification() {
return false;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java Tue Nov 27 00:14:39 2012
@@ -45,6 +45,7 @@ public abstract class AbstractConfigGui
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
return MenuFactory.getDefaultConfigElementMenu();
}
@@ -58,6 +59,7 @@ public abstract class AbstractConfigGui
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.CONFIG_ELEMENTS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Tue Nov 27 00:14:39 2012
@@ -201,11 +201,13 @@ public class ArgumentsPanel extends Abst
return null;
}
+ @Override
public String getLabelResource() {
return "user_defined_variables"; // $NON-NLS-1$
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
Arguments args = new Arguments();
modifyTestElement(args);
@@ -213,6 +215,7 @@ public class ArgumentsPanel extends Abst
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement args) {
GuiUtils.stopTableEditing(table);
Arguments arguments = null;
@@ -331,6 +334,7 @@ public class ArgumentsPanel extends Abst
* @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/core/org/apache/jmeter/config/gui/LoginConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java Tue Nov 27 00:14:39 2012
@@ -74,6 +74,7 @@ public class LoginConfigGui extends Abst
init();
}
+ @Override
public String getLabelResource() {
return "login_config_element"; // $NON-NLS-1$
}
@@ -95,6 +96,7 @@ public class LoginConfigGui extends Abst
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
ConfigTestElement element = new ConfigTestElement();
modifyTestElement(element);
@@ -102,6 +104,7 @@ public class LoginConfigGui extends Abst
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
element.setProperty(new StringProperty(ConfigTestElement.USERNAME, username.getText()));
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java Tue Nov 27 00:14:39 2012
@@ -50,21 +50,26 @@ public class ObsoleteGui extends Abstrac
add(obsoleteMessage,BorderLayout.WEST);
}
+ @Override
public String getLabelResource() {
return "obsolete_test_element"; // $NON-NLS-1$
}
+ @Override
public TestElement createTestElement() {
return new ConfigTestElement();
}
+ @Override
public void modifyTestElement(TestElement element) {
}
+ @Override
public JPopupMenu createPopupMenu() {
return null;
}
+ @Override
public Collection<String> getMenuCategories() {
return null;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Tue Nov 27 00:14:39 2012
@@ -99,6 +99,7 @@ public class RowDetailDialog extends JDi
*/
private static final long serialVersionUID = -8699034338969407625L;
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
}
@@ -110,6 +111,7 @@ public class RowDetailDialog extends JDi
*/
private static final long serialVersionUID = -1529005452976176873L;
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
doUpdate(actionEvent);
setVisible(false);
@@ -175,6 +177,7 @@ public class RowDetailDialog extends JDi
* Do search
* @param e {@link ActionEvent}
*/
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
if(action.equals(CLOSE)) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java Tue Nov 27 00:14:39 2012
@@ -102,6 +102,7 @@ public class SimpleConfigGui extends Abs
init();
}
+ @Override
public String getLabelResource() {
return "simple_config_element"; // $NON-NLS-1$
}
@@ -131,6 +132,7 @@ public class SimpleConfigGui extends Abs
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
TestElement el = new ConfigTestElement();
modifyTestElement(el);
@@ -144,6 +146,7 @@ public class SimpleConfigGui extends Abs
* @param el
* the TestElement to modify
*/
+ @Override
public void modifyTestElement(TestElement el) {
GuiUtils.stopTableEditing(table);
Data model = tableModel.getData();
@@ -179,6 +182,7 @@ public class SimpleConfigGui extends Abs
* @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/core/org/apache/jmeter/control/GenericController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Tue Nov 27 00:14:39 2012
@@ -93,6 +93,7 @@ public class GenericController extends A
public GenericController() {
}
+ @Override
public void initialize() {
resetCurrent();
resetIterCount();
@@ -150,6 +151,7 @@ public class GenericController extends A
*
* @return the next sampler or null
*/
+ @Override
public Sampler next() {
fireIterEvents();
if (log.isDebugEnabled()) {
@@ -181,6 +183,7 @@ public class GenericController extends A
/**
* @see org.apache.jmeter.control.Controller#isDone()
*/
+ @Override
public boolean isDone() {
return done;
}
@@ -251,6 +254,7 @@ public class GenericController extends A
/**
* {@inheritDoc}
*/
+ @Override
public void triggerEndOfLoop() {
reInitialize();
}
@@ -366,6 +370,7 @@ public class GenericController extends A
/**
* {@inheritDoc}
*/
+ @Override
public final boolean addTestElementOnce(TestElement child){
if (children.putIfAbsent(child, DUMMY) == null) {
addTestElement(child);
@@ -374,6 +379,7 @@ public class GenericController extends A
return false;
}
+ @Override
public void addIterationListener(LoopIterationListener lis) {
/*
* A little hack - add each listener to the start of the list - this
@@ -386,6 +392,7 @@ public class GenericController extends A
/**
* Remove listener
*/
+ @Override
public void removeIterationListener(LoopIterationListener iterationListener) {
for (Iterator<LoopIterationListener> iterator = iterationListeners.iterator(); iterator.hasNext();) {
LoopIterationListener listener = iterator.next();
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java Tue Nov 27 00:14:39 2012
@@ -255,6 +255,7 @@ public class TransactionController exten
}
}
+ @Override
public void sampleOccurred(SampleEvent se) {
if (!isParent()) {
// Check if we are still sampling our children
@@ -277,9 +278,11 @@ public class TransactionController exten
}
}
+ @Override
public void sampleStarted(SampleEvent e) {
}
+ @Override
public void sampleStopped(SampleEvent e) {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java Tue Nov 27 00:14:39 2012
@@ -80,6 +80,7 @@ public class TransactionSampler extends
/**
* One cannot sample the TransactionSampler directly.
*/
+ @Override
public SampleResult sample(Entry e) {
throw new RuntimeException("Cannot sample TransactionSampler directly");
// It is the JMeterThread which knows how to sample a real sampler
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public abstract class AbstractController
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
return MenuFactory.getDefaultControllerMenu();
}
@@ -57,6 +58,7 @@ public abstract class AbstractController
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.CONTROLLERS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java Tue Nov 27 00:14:39 2012
@@ -103,6 +103,7 @@ public class IfControllerPanel extends A
/**
* Implements JMeterGUIComponent.createTestElement()
*/
+ @Override
public TestElement createTestElement() {
IfController controller = new IfController();
modifyTestElement(controller);
@@ -112,6 +113,7 @@ public class IfControllerPanel extends A
/**
* Implements JMeterGUIComponent.modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement controller) {
configureTestElement(controller);
if (controller instanceof IfController) {
@@ -132,6 +134,7 @@ public class IfControllerPanel extends A
evaluateAll.setSelected(false);
}
+ @Override
public String getLabelResource() {
return "if_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java Tue Nov 27 00:14:39 2012
@@ -38,6 +38,7 @@ public class LogicControllerGui extends
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
GenericController lc = new GenericController();
configureTestElement(lc);
@@ -45,10 +46,12 @@ public class LogicControllerGui extends
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
}
+ @Override
public String getLabelResource() {
return "logic_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java Tue Nov 27 00:14:39 2012
@@ -111,6 +111,7 @@ public class LoopControlPanel extends Ab
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
LoopController lc = new LoopController();
modifyTestElement(lc);
@@ -118,6 +119,7 @@ public class LoopControlPanel extends Ab
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement lc) {
configureTestElement(lc);
if (lc instanceof LoopController) {
@@ -147,6 +149,7 @@ public class LoopControlPanel extends Ab
* @param event
* the event that has occurred
*/
+ @Override
public void actionPerformed(ActionEvent event) {
if (infinite.isSelected()) {
loops.setText(""); // $NON-NLS-1$
@@ -157,6 +160,7 @@ public class LoopControlPanel extends Ab
}
}
+ @Override
public String getLabelResource() {
return "loop_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/RunTimeGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/RunTimeGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/RunTimeGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/RunTimeGui.java Tue Nov 27 00:14:39 2012
@@ -97,6 +97,7 @@ public class RunTimeGui extends Abstract
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
RunTime lc = new RunTime();
modifyTestElement(lc);
@@ -104,6 +105,7 @@ public class RunTimeGui extends Abstract
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement lc) {
configureTestElement(lc);
if (lc instanceof RunTime) {
@@ -132,10 +134,12 @@ public class RunTimeGui extends Abstract
* @param event
* the event that has occurred
*/
+ @Override
public void actionPerformed(ActionEvent event) {
seconds.setEnabled(true);
}
+ @Override
public String getLabelResource() {
return "runtime_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java Tue Nov 27 00:14:39 2012
@@ -43,6 +43,7 @@ public class TestFragmentControllerGui e
/**
* Implements JMeterGUIComponent.createTestElement()
*/
+ @Override
public TestElement createTestElement() {
TestFragmentController controller = new TestFragmentController();
modifyTestElement(controller);
@@ -52,10 +53,12 @@ public class TestFragmentControllerGui e
/**
* Implements JMeterGUIComponent.modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement controller) {
configureTestElement(controller);
}
+ @Override
public String getLabelResource() {
return "test_fragment_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java Tue Nov 27 00:14:39 2012
@@ -86,6 +86,7 @@ public class TestPlanGui extends Abstrac
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
@@ -104,6 +105,7 @@ public class TestPlanGui extends Abstrac
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
TestPlan tp = new TestPlan();
modifyTestElement(tp);
@@ -111,6 +113,7 @@ public class TestPlanGui extends Abstrac
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement plan) {
super.configureTestElement(plan);
if (plan instanceof TestPlan) {
@@ -123,6 +126,7 @@ public class TestPlanGui extends Abstrac
}
}
+ @Override
public String getLabelResource() {
return "test_plan"; // $NON-NLS-1$
}
@@ -135,6 +139,7 @@ public class TestPlanGui extends Abstrac
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return null;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java Tue Nov 27 00:14:39 2012
@@ -45,6 +45,7 @@ public class TransactionControllerGui ex
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
TransactionController lc = new TransactionController();
configureTestElement(lc);
@@ -59,6 +60,7 @@ public class TransactionControllerGui ex
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement el) {
configureTestElement(el);
((TransactionController) el).setParent(parent.isSelected());
@@ -67,6 +69,7 @@ public class TransactionControllerGui ex
tc.setIncludeTimers(includeTimers.isSelected());
}
+ @Override
public String getLabelResource() {
return "transaction_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java Tue Nov 27 00:14:39 2012
@@ -71,6 +71,7 @@ public class WhileControllerGui extends
/**
* Implements JMeterGUIComponent.createTestElement()
*/
+ @Override
public TestElement createTestElement() {
WhileController controller = new WhileController();
modifyTestElement(controller);
@@ -80,6 +81,7 @@ public class WhileControllerGui extends
/**
* Implements JMeterGUIComponent.modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement controller) {
configureTestElement(controller);
if (controller instanceof WhileController) {
@@ -100,6 +102,7 @@ public class WhileControllerGui extends
theCondition.setText(""); // $NON-NLS-1$
}
+ @Override
public String getLabelResource() {
return "while_controller_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java Tue Nov 27 00:14:39 2012
@@ -55,11 +55,13 @@ public class WorkBenchGui extends Abstra
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return null;
}
/* Implements JMeterGUIComponent.createTestElement() */
+ @Override
public TestElement createTestElement() {
WorkBench wb = new WorkBench();
modifyTestElement(wb);
@@ -67,6 +69,7 @@ public class WorkBenchGui extends Abstra
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
+ @Override
public void modifyTestElement(TestElement wb) {
super.configureTestElement(wb);
}
@@ -81,6 +84,7 @@ public class WorkBenchGui extends Abstra
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
JPopupMenu menu = new JPopupMenu();
JMenu addMenu = MenuFactory.makeMenus(new String[] {
@@ -102,6 +106,7 @@ public class WorkBenchGui extends Abstra
return menu;
}
+ @Override
public String getLabelResource() {
return "workbench_title"; // $NON-NLS-1$
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java Tue Nov 27 00:14:39 2012
@@ -69,6 +69,7 @@ public class ClientJMeterEngine implemen
}
/** {@inheritDoc} */
+ @Override
public void configure(HashTree testTree) {
TreeCloner cloner = new TreeCloner(false);
testTree.traverse(cloner);
@@ -76,6 +77,7 @@ public class ClientJMeterEngine implemen
}
/** {@inheritDoc} */
+ @Override
public void stopTest(boolean now) {
log.info("about to "+(now ? "stop" : "shutdown")+" remote test on "+host);
try {
@@ -86,6 +88,7 @@ public class ClientJMeterEngine implemen
}
/** {@inheritDoc} */
+ @Override
public void reset() {
try {
try {
@@ -100,6 +103,7 @@ public class ClientJMeterEngine implemen
}
}
+ @Override
public void runTest() throws JMeterEngineException {
log.info("running clientengine run method");
HashTree testTree = test;
@@ -167,6 +171,7 @@ public class ClientJMeterEngine implemen
/** {@inheritDoc} */
// Called by JMeter ListenToTest if remoteStop is true
+ @Override
public void exit() {
log.info("about to exit remote server on "+host);
try {
@@ -178,11 +183,13 @@ public class ClientJMeterEngine implemen
private Properties savep;
/** {@inheritDoc} */
+ @Override
public void setProperties(Properties p) {
savep = p;
// Sent later
}
+ @Override
public boolean isActive() {
return true;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java Tue Nov 27 00:14:39 2012
@@ -48,6 +48,7 @@ public class ConvertListeners implements
/**
* {@inheritDoc}
*/
+ @Override
public void addNode(Object node, HashTree subTree) {
for (Object item : subTree.list()) {
if (item instanceof AbstractThreadGroup) {
@@ -82,12 +83,14 @@ public class ConvertListeners implements
/**
* {@inheritDoc}
*/
+ @Override
public void subtractNode() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void processPath() {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java Tue Nov 27 00:14:39 2012
@@ -59,6 +59,7 @@ public class PreCompiler implements Hash
}
/** {@inheritDoc} */
+ @Override
public void addNode(Object node, HashTree subTree) {
if(isRemote && node instanceof ResultCollector)
{
@@ -97,10 +98,12 @@ public class PreCompiler implements Hash
}
/** {@inheritDoc} */
+ @Override
public void subtractNode() {
}
/** {@inheritDoc} */
+ @Override
public void processPath() {
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java Tue Nov 27 00:14:39 2012
@@ -136,6 +136,7 @@ public final class RemoteJMeterEngineImp
* @param testTree
* the feature to be added to the ThreadGroup attribute
*/
+ @Override
public void rconfigure(HashTree testTree, String host, File jmxBase, String scriptName) throws RemoteException {
log.info("Creating JMeter engine on host "+host+" base '"+jmxBase+"'");
synchronized(LOCK) { // close window where another remote client might jump in
@@ -151,12 +152,14 @@ public final class RemoteJMeterEngineImp
FileServer.getFileServer().setBase(jmxBase);
}
+ @Override
public void rrunTest() throws RemoteException, JMeterEngineException, IllegalStateException {
log.info("Running test");
checkOwner("runTest");
backingEngine.runTest();
}
+ @Override
public void rreset() throws RemoteException, IllegalStateException {
// Mail on userlist reported NPE here - looks like only happens if there are network errors, but check anyway
if (backingEngine != null) {
@@ -168,6 +171,7 @@ public final class RemoteJMeterEngineImp
}
}
+ @Override
public void rstopTest(boolean now) throws RemoteException {
if (now) {
log.info("Stopping test ...");
@@ -182,6 +186,7 @@ public final class RemoteJMeterEngineImp
* Called by:
* - ClientJMeterEngine.exe() which is called on remoteStop
*/
+ @Override
public void rexit() throws RemoteException {
log.info("Exitting");
backingEngine.exit();
@@ -197,6 +202,7 @@ public final class RemoteJMeterEngineImp
JMeterUtils.helpGC();
}
+ @Override
public void rsetProperties(Properties p) throws RemoteException, IllegalStateException {
checkOwner("setProperties");
if(remotelySetProperties != null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Nov 27 00:14:39 2012
@@ -158,6 +158,7 @@ public class StandardJMeterEngine implem
engine = this;
}
+ @Override
public void configure(HashTree testTree) {
// Is testplan serialised?
SearchByClass<TestPlan> testPlan = new SearchByClass<TestPlan>(TestPlan.class);
@@ -173,6 +174,7 @@ public class StandardJMeterEngine implem
test = testTree;
}
+ @Override
public void runTest() throws JMeterEngineException {
if (host != null){
long now=System.currentTimeMillis();
@@ -241,6 +243,7 @@ public class StandardJMeterEngine implem
active=false;
}
+ @Override
public void reset() {
if (running) {
stopTest();
@@ -251,6 +254,7 @@ public class StandardJMeterEngine implem
stopTest(true);
}
+ @Override
public synchronized void stopTest(boolean now) {
shutdown = !now;
Thread stopThread = new Thread(new StopTest(now));
@@ -264,6 +268,7 @@ public class StandardJMeterEngine implem
now = b;
}
+ @Override
public void run() {
running = false;
engine = null;
@@ -294,6 +299,7 @@ public class StandardJMeterEngine implem
}
}
+ @Override
public void run() {
log.info("Running the test!");
running = true;
@@ -532,6 +538,7 @@ public class StandardJMeterEngine implem
// and by notifyTestListenersOfEnd() iff exitAfterTest is true;
// in turn that is called by the run() method and the StopTest class
// also called
+ @Override
public void exit() {
ClientJMeterEngine.tidyRMI(log); // This should be enough to allow server to exit.
if (REMOTE_SYSTEM_EXIT) { // default is false
@@ -557,11 +564,13 @@ public class StandardJMeterEngine implem
}
}
+ @Override
public void setProperties(Properties p) {
log.info("Applying properties "+p);
JMeterUtils.getJMeterProperties().putAll(p);
}
+ @Override
public boolean isActive() {
return active;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java Tue Nov 27 00:14:39 2012
@@ -59,6 +59,7 @@ public class TreeCloner implements HashT
* @param node
* @param subTree {@link HashTree}
*/
+ @Override
public final void addNode(Object node, HashTree subTree) {
node = addNodeToTree(node);
addLast(node);
@@ -89,6 +90,7 @@ public class TreeCloner implements HashT
objects.addLast(node);
}
+ @Override
public void subtractNode() {
objects.removeLast();
}
@@ -97,6 +99,7 @@ public class TreeCloner implements HashT
return newTree;
}
+ @Override
public void processPath() {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java Tue Nov 27 00:14:39 2012
@@ -31,6 +31,7 @@ public class TurnElementsOn implements H
/**
* {@inheritDoc}
*/
+ @Override
public void addNode(Object node, HashTree subTree) {
if (node instanceof TestElement && !(node instanceof TestPlan)) {
((TestElement) node).setRunningVersion(true);
@@ -41,12 +42,14 @@ public class TurnElementsOn implements H
/**
* {@inheritDoc}
*/
+ @Override
public void subtractNode() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void processPath() {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java Tue Nov 27 00:14:39 2012
@@ -30,6 +30,7 @@ abstract class AbstractTransformer imple
private Map<String, String> variables;
/** {@inheritDoc} */
+ @Override
public void setMasterFunction(CompoundVariable variable) {
masterFunction = variable;
}
@@ -43,6 +44,7 @@ abstract class AbstractTransformer imple
}
/** {@inheritDoc} */
+ @Override
public void setVariables(Map<String, String> map) {
variables = map;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java Tue Nov 27 00:14:39 2012
@@ -132,6 +132,7 @@ public class CompoundVariable implements
}
/** {@inheritDoc} */
+ @Override
public String execute(SampleResult previousResult, Sampler currentSampler) {
if (compiledComponents == null || compiledComponents.size() == 0) {
return ""; // $NON-NLS-1$
@@ -172,6 +173,7 @@ public class CompoundVariable implements
}
/** {@inheritDoc} */
+ @Override
public List<String> getArgumentDesc() {
return new LinkedList<String>();
}
@@ -223,11 +225,13 @@ public class CompoundVariable implements
// Dummy methods needed by Function interface
/** {@inheritDoc} */
+ @Override
public String getReferenceKey() {
return ""; // $NON-NLS-1$
}
/** {@inheritDoc} */
+ @Override
public void setParameters(Collection<CompoundVariable> parameters) throws InvalidVariableException {
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java Tue Nov 27 00:14:39 2012
@@ -65,6 +65,7 @@ public class ReplaceFunctionsWithStrings
this.regexMatch = regexMatch;
}
+ @Override
public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariableException {
PatternMatcher pm = JMeterUtils.getMatcher();
Pattern pattern = null;
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java Tue Nov 27 00:14:39 2012
@@ -34,6 +34,7 @@ public class ReplaceStringWithFunctions
setVariables(variables);
}
+ @Override
public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariableException {
JMeterProperty newValue = prop;
getMasterFunction().clear();
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java Tue Nov 27 00:14:39 2012
@@ -35,6 +35,7 @@ public class UndoVariableReplacement ext
setVariables(variables);
}
+ @Override
public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariableException {
String input = prop.getStringValue();
for (Map.Entry<String, String> entry : getVariables().entrySet()) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java Tue Nov 27 00:14:39 2012
@@ -39,6 +39,7 @@ public abstract class AbstractFunction i
* </b></p>
* @see Function#execute(SampleResult, Sampler)
*/
+ @Override
abstract public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException;
public String execute() throws InvalidVariableException {
@@ -60,11 +61,13 @@ public abstract class AbstractFunction i
* Note: This is always called even if no parameters are provided
* (versions of JMeter after 2.3.1)
*/
+ @Override
abstract public void setParameters(Collection<CompoundVariable> parameters) throws InvalidVariableException;
/**
* @see Function#getReferenceKey()
*/
+ @Override
abstract public String getReferenceKey();
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Tue Nov 27 00:14:39 2012
@@ -83,6 +83,7 @@ public class FunctionHelper extends JDia
*/
private static final long serialVersionUID = -4036804004190858925L;
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
}
@@ -119,6 +120,7 @@ public class FunctionHelper extends JDia
private void initializeFunctionList() {
String[] functionNames = CompoundVariable.getFunctionNames();
Arrays.sort(functionNames, new Comparator<String>() {
+ @Override
public int compare(String o1, String o2) {
return o1.compareToIgnoreCase(o2);
}
@@ -127,6 +129,7 @@ public class FunctionHelper extends JDia
functionList.addChangeListener(this);
}
+ @Override
public void stateChanged(ChangeEvent event) {
try {
Arguments args = new Arguments();
@@ -148,6 +151,7 @@ public class FunctionHelper extends JDia
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
StringBuilder functionCall = new StringBuilder("${");
functionCall.append(functionList.getText());
@@ -171,6 +175,7 @@ public class FunctionHelper extends JDia
}
private class HelpListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent e) {
String[] source = new String[] { Help.HELP_FUNCTIONS, functionList.getText() };
ActionEvent helpEvent = new ActionEvent(source, e.getID(), "help"); //$NON-NLS-1$
@@ -178,6 +183,7 @@ public class FunctionHelper extends JDia
}
}
+ @Override
public void localeChanged(LocaleChangeEvent event) {
setTitle(JMeterUtils.getResString("function_helper_title"));
this.getContentPane().removeAll(); // so we can add them again in init
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java Tue Nov 27 00:14:39 2012
@@ -187,6 +187,7 @@ public abstract class AbstractJMeterGuiC
* @param element
* the TestElement to configure
*/
+ @Override
public void configure(TestElement element) {
setName(element.getName());
if (element.getProperty(TestElement.ENABLED) instanceof NullProperty) {
@@ -203,6 +204,7 @@ public abstract class AbstractJMeterGuiC
* cleared, in which case you should override, clear the extra fields, and
* still call super.clearGui().
*/
+ @Override
public void clearGui() {
initGui();
enabled = true;
@@ -311,6 +313,7 @@ public abstract class AbstractJMeterGuiC
return pane;
}
+ @Override
public String getStaticLabel() {
return JMeterUtils.getResString(getLabelResource());
}
@@ -319,6 +322,7 @@ public abstract class AbstractJMeterGuiC
* Compute Anchor value to find reference in documentation for a particular component
* @return String anchor
*/
+ @Override
public String getDocAnchor() {
// Ensure we use default bundle
String label = JMeterUtils.getResString(getLabelResource(), new Locale("",""));
@@ -331,6 +335,7 @@ public abstract class AbstractJMeterGuiC
*
* @return this object
*/
+ @Override
public JComponent getPrintableComponent() {
return this;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java Tue Nov 27 00:14:39 2012
@@ -50,6 +50,7 @@ public abstract class AbstractScopedJMet
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
return MenuFactory.getDefaultAssertionMenu();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Tue Nov 27 00:14:39 2012
@@ -604,6 +604,7 @@ public final class GuiPackage implements
/**
* {@inheritDoc}
*/
+ @Override
public void localeChanged(LocaleChangeEvent event) {
// FIrst make sure we save the content of the current GUI (since we
// will flush it away):
@@ -698,6 +699,7 @@ public final class GuiPackage implements
return ;
}
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
JOptionPane.showMessageDialog(null,message,title,type);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Tue Nov 27 00:14:39 2012
@@ -74,12 +74,14 @@ public class LoggerPanel extends JPanel
/* (non-Javadoc)
* @see org.apache.log.LogTarget#processEvent(org.apache.log.LogEvent)
*/
+ @Override
public void processEvent(final LogEvent logEvent) {
if(!GuiPackage.getInstance().getMenuItemLoggerPanel().getModel().isSelected()) {
return;
}
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
synchronized (textArea) {
textArea.append(format.format(logEvent));
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Tue Nov 27 00:14:39 2012
@@ -351,6 +351,7 @@ public class MainFrame extends JFrame im
stoppingMessage.pack();
ComponentUtil.centerComponentInComponent(this, stoppingMessage);
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
if (stoppingMessage != null) {// TODO - how can this be null?
stoppingMessage.setVisible(true);
@@ -361,6 +362,7 @@ public class MainFrame extends JFrame im
public void updateCounts() {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
activeThreads.setText(Integer.toString(JMeterContextService.getNumberOfThreads()));
totalThreads.setText(Integer.toString(JMeterContextService.getTotalThreads()));
@@ -383,6 +385,7 @@ public class MainFrame extends JFrame im
* sets the running indicator and ensures that the menubar is enabled and in
* the running state.
*/
+ @Override
public void testStarted() {
testStarted(LOCAL);
menuBar.setEnabled(true);
@@ -396,6 +399,7 @@ public class MainFrame extends JFrame im
* @param host
* the host where the test is starting
*/
+ @Override
public void testStarted(String host) {
hosts.add(host);
runningIndicator.setIcon(runningIcon);
@@ -410,6 +414,7 @@ public class MainFrame extends JFrame im
* disables the menubar, stops the running indicator, and closes the
* stopping message dialog.
*/
+ @Override
public void testEnded() {
testEnded(LOCAL);
menuBar.setEnabled(false);
@@ -422,6 +427,7 @@ public class MainFrame extends JFrame im
* @param host
* the host where the test is ending
*/
+ @Override
public void testEnded(String host) {
hosts.remove(host);
if (hosts.size() == 0) {
@@ -676,14 +682,17 @@ public class MainFrame extends JFrame im
}
}
+ @Override
public void dragEnter(DropTargetDragEvent dtde) {
// NOOP
}
+ @Override
public void dragExit(DropTargetEvent dte) {
// NOOP
}
+ @Override
public void dragOver(DropTargetDragEvent dtde) {
// NOOP
}
@@ -691,6 +700,7 @@ public class MainFrame extends JFrame im
/**
* Handler of Top level Dnd
*/
+ @Override
public void drop(DropTargetDropEvent dtde) {
try {
Transferable tr = dtde.getTransferable();
@@ -728,6 +738,7 @@ public class MainFrame extends JFrame im
}
+ @Override
public void dropActionChanged(DropTargetDragEvent dtde) {
// NOOP
}
@@ -738,11 +749,13 @@ public class MainFrame extends JFrame im
public final class ErrorsAndFatalsCounterLogTarget implements LogTarget, Clearable {
public AtomicInteger errorOrFatal = new AtomicInteger(0);
+ @Override
public void processEvent(LogEvent event) {
if(event.getPriority().equals(Priority.ERROR) ||
event.getPriority().equals(Priority.FATAL_ERROR)) {
final int newValue = errorOrFatal.incrementAndGet();
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
errorsOrFatalsLabel.setText(Integer.toString(newValue));
}
@@ -750,9 +763,11 @@ public class MainFrame extends JFrame im
}
}
+ @Override
public void clearData() {
errorOrFatal.set(0);
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
errorsOrFatalsLabel.setText(Integer.toString(errorOrFatal.get()));
}
@@ -761,6 +776,7 @@ public class MainFrame extends JFrame im
}
+ @Override
public void clearData() {
logPanel.clear();
if(DISPLAY_ERROR_FATAL_COUNTER) {
@@ -771,6 +787,7 @@ public class MainFrame extends JFrame im
/**
* Handles click on warnIndicator
*/
+ @Override
public void actionPerformed(ActionEvent event) {
if(event.getSource()==warnIndicator) {
ActionRouter.getInstance().doActionNow(new ActionEvent(event.getSource(), event.getID(), ActionNames.LOGGER_PANEL_ENABLE_DISABLE));
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java Tue Nov 27 00:14:39 2012
@@ -60,6 +60,7 @@ public class NamePanel extends JPanel im
add(nameField, BorderLayout.CENTER);
}
+ @Override
public void clearGui() {
setName(getStaticLabel());
}
@@ -85,31 +86,37 @@ public class NamePanel extends JPanel im
}
/** {@inheritDoc} */
+ @Override
public void configure(TestElement testElement) {
setName(testElement.getName());
}
/** {@inheritDoc} */
+ @Override
public JPopupMenu createPopupMenu() {
return null;
}
/** {@inheritDoc} */
+ @Override
public String getStaticLabel() {
return JMeterUtils.getResString(getLabelResource());
}
/** {@inheritDoc} */
+ @Override
public String getLabelResource() {
return "root"; // $NON-NLS-1$
}
/** {@inheritDoc} */
+ @Override
public Collection<String> getMenuCategories() {
return null;
}
/** {@inheritDoc} */
+ @Override
public TestElement createTestElement() {
WorkBench wb = new WorkBench();
modifyTestElement(wb);
@@ -117,6 +124,7 @@ public class NamePanel extends JPanel im
}
/** {@inheritDoc} */
+ @Override
public void modifyTestElement(TestElement wb) {
wb.setName(getName());
wb.setProperty(new StringProperty(TestElement.GUI_CLASS, this.getClass().getName()));
@@ -126,6 +134,7 @@ public class NamePanel extends JPanel im
/**
* {@inheritDoc}
*/
+ @Override
public String getDocAnchor() {
return null;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Nov 27 00:14:39 2012
@@ -124,12 +124,14 @@ public class SavePropertyDialog extends
JButton exit = new JButton(JMeterUtils.getResString("done")); // $NON-NLS-1$
this.getContentPane().add(exit, BorderLayout.SOUTH);
exit.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
dispose();
}
});
}
+ @Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
Functor f = functors.get(action);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java Tue Nov 27 00:14:39 2012
@@ -63,6 +63,7 @@ public class AboutCommand implements Com
* dialog box. The Dialog Box is NOT modal, because those should be avoided
* if at all possible.
*/
+ @Override
public void doAction(ActionEvent e) {
if (e.getActionCommand().equals(ActionNames.ABOUT)) {
this.about();
@@ -72,6 +73,7 @@ public class AboutCommand implements Com
/**
* Provide the list of Action names that are available in this command.
*/
+ @Override
public Set<String> getActionNames() {
return AboutCommand.commandSet;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java Tue Nov 27 00:14:39 2012
@@ -34,12 +34,14 @@ public abstract class AbstractAction imp
/**
* @see Command#doAction(ActionEvent)
*/
+ @Override
public void doAction(ActionEvent e) {
}
/**
* @see Command#getActionNames()
*/
+ @Override
abstract public Set<String> getActionNames();
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Tue Nov 27 00:14:39 2012
@@ -55,8 +55,10 @@ public final class ActionRouter implemen
private ActionRouter() {
}
+ @Override
public void actionPerformed(final ActionEvent e) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
performAction(e);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public class AddParent implements Comman
public AddParent() {
}
+ @Override
public void doAction(ActionEvent e) {
String name = ((Component) e.getSource()).getName();
GuiPackage guiPackage = GuiPackage.getInstance();
@@ -57,6 +58,7 @@ public class AddParent implements Comman
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java Tue Nov 27 00:14:39 2012
@@ -54,6 +54,7 @@ public class AddToTree implements Comman
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commandSet;
}
@@ -61,6 +62,7 @@ public class AddToTree implements Comman
/**
* Adds the specified class to the current node of the tree.
*/
+ @Override
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
try {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java Tue Nov 27 00:14:39 2012
@@ -39,10 +39,12 @@ public class Analyze implements Command
public Analyze() {
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) {
FileReporter analyzer = new FileReporter();
final JFileChooser chooser = FileDialoger.promptToOpenFile(new String[] { ".jtl" }); //$NON-NLS-1$
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public class ChangeLanguage implements C
/**
* @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
*/
+ @Override
public void doAction(ActionEvent e) {
String locale = ((Component) e.getSource()).getName();
Locale loc;
@@ -65,6 +66,7 @@ public class ChangeLanguage implements C
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java Tue Nov 27 00:14:39 2012
@@ -47,6 +47,7 @@ public class ChangeParent implements Com
public ChangeParent() {
}
+ @Override
public void doAction(ActionEvent e) {
String name = ((Component) e.getSource()).getName();
GuiPackage guiPackage = GuiPackage.getInstance();
@@ -66,6 +67,7 @@ public class ChangeParent implements Com
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Tue Nov 27 00:14:39 2012
@@ -65,6 +65,7 @@ public class CheckDirty extends Abstract
ActionRouter.getInstance().addPreActionListener(ExitCommand.class, this);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals(ActionNames.EXIT)) {
doAction(e);
@@ -113,6 +114,7 @@ public class CheckDirty extends Abstract
* The tree traverses itself depth-first, calling processNode for each
* object it encounters as it goes.
*/
+ @Override
public void addNode(Object node, HashTree subTree) {
log.debug("Node is class:" + node.getClass());
JMeterTreeNode treeNode = (JMeterTreeNode) node;
@@ -138,6 +140,7 @@ public class CheckDirty extends Abstract
* Indicates traversal has moved up a step, and the visitor should remove
* the top node from it's stack structure.
*/
+ @Override
public void subtractNode() {
}
@@ -147,6 +150,7 @@ public class CheckDirty extends Abstract
* structure of nodes passed to it with addNode, and removing top items for
* every subtractNode() call.
*/
+ @Override
public void processPath() {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Tue Nov 27 00:14:39 2012
@@ -49,10 +49,12 @@ public class Clear implements Command {
public Clear() {
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
final String actionCommand = e.getActionCommand();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java Tue Nov 27 00:14:39 2012
@@ -53,6 +53,7 @@ public class Close implements Command {
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
@@ -63,6 +64,7 @@ public class Close implements Command {
* @param e
* the generic UI action event
*/
+ @Override
public void doAction(ActionEvent e) {
performAction(e);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java Tue Nov 27 00:14:39 2012
@@ -50,6 +50,7 @@ public class CollapseExpand implements C
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
@@ -60,6 +61,7 @@ public class CollapseExpand implements C
* @param e
* the generic UI action event
*/
+ @Override
public void doAction(ActionEvent e) {
boolean collapse=ActionNames.COLLAPSE_ALL.equals(e.getActionCommand());
GuiPackage guiInstance = GuiPackage.getInstance();