You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2010/02/09 22:09:26 UTC
svn commit: r908219 [1/2] - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/assertions/
src/components/org/apache/jmeter/control/
src/components/org/apache/jmeter/control/gui/
src/components/org/apache/jmeter/modifiers/ src/components/org/ap...
Author: sebb
Date: Tue Feb 9 21:09:23 2010
New Revision: 908219
URL: http://svn.apache.org/viewvc?rev=908219&view=rev
Log:
Javadoc
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/RunTime.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/WhileController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultAction.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java Tue Feb 9 21:09:23 2010
@@ -73,10 +73,8 @@
return getPropertyAsBoolean(RESET_INTERPRETER);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.assertions.Assertion#getResult(org.apache.jmeter.samplers.SampleResult)
+ /**
+ * {@inheritDoc}
*/
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java Tue Feb 9 21:09:23 2010
@@ -84,10 +84,8 @@
return getPropertyAsBoolean(USE_SEPARATOR, true);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.Controller#isDone()
+ /**
+ * {@inheritDoc}
*/
@Override
public boolean isDone() {
@@ -144,10 +142,8 @@
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#nextIsNull()
+ /**
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsNull() throws NextIsNullException {
@@ -168,20 +164,16 @@
loopCount = 0;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#getIterCount()
+ /**
+ * {@inheritDoc}
*/
@Override
protected int getIterCount() {
return loopCount + 1;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#reInitialize()
+ /**
+ * {@inheritDoc}
*/
@Override
protected void reInitialize() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java Tue Feb 9 21:09:23 2010
@@ -47,10 +47,8 @@
public InterleaveControl() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#reInitialize()
+ /**
+ * {@inheritDoc}
*/
@Override
public void reInitialize() {
@@ -71,10 +69,8 @@
return getPropertyAsInt(STYLE);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.Controller#next()
+ /**
+ * {@inheritDoc}
*/
@Override
public Sampler next() {
@@ -85,10 +81,8 @@
return super.next();
}
- /*
- * (non-Javadoc)
- *
- * @see GenericController#nextIsAController(Controller)
+ /**
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsAController(Controller controller) throws NextIsNullException {
@@ -107,10 +101,8 @@
return sampler;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#nextIsASampler(Sampler)
+ /**
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsASampler(Sampler element) throws NextIsNullException {
@@ -122,8 +114,8 @@
/**
* If the current is null, reset and continue searching. The searchStart
* attribute will break us off when we start a repeat.
- *
- * @see org.apache.jmeter.control.GenericController#nextIsNull()
+ * <p>
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsNull() {
@@ -131,10 +123,8 @@
return next();
}
- /*
- * (non-Javadoc)
- *
- * @see GenericController#setCurrentElement(TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
protected void setCurrentElement(TestElement currentElement) throws NextIsNullException {
@@ -150,10 +140,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see GenericController#currentReturnedNull(Controller)
+ /**
+ * {@inheritDoc}
*/
@Override
protected void currentReturnedNull(Controller c) {
@@ -164,24 +152,16 @@
}
}
- /**
- * @return skipNext
- */
protected boolean isSkipNext() {
return skipNext;
}
- /**
- * @param skipNext
- */
protected void setSkipNext(boolean skipNext) {
this.skipNext = skipNext;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#incrementCurrent()
+ /**
+ * {@inheritDoc}
*/
@Override
protected void incrementCurrent() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java Tue Feb 9 21:09:23 2010
@@ -65,16 +65,14 @@
return super.next();
}
- /*
- * (non-Javadoc)
- *
+ /**
* incrementCurrent is called when the current child (whether sampler or controller)
* has been processed.
- *
+ * <p>
* Setting it to int.max marks the controller as having processed all its
* children. Thus the controller processes one child per iteration.
- *
- * @see org.apache.jmeter.control.GenericController#incrementCurrent()
+ * <p>
+ * {@inheritDoc}
*/
@Override
protected void incrementCurrent() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java Tue Feb 9 21:09:23 2010
@@ -49,10 +49,8 @@
return "include_controller";//$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#configure(TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
public void configure(TestElement el) {
@@ -61,10 +59,8 @@
this.includePanel.setFilename(controller.getIncludePath());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+ /**
+ * {@inheritDoc}
*/
public TestElement createTestElement() {
IncludeController mc = new IncludeController();
@@ -72,10 +68,8 @@
return mc;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+ /**
+ * {@inheritDoc}
*/
public void modifyTestElement(TestElement element) {
configureTestElement(element);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java Tue Feb 9 21:09:23 2010
@@ -32,10 +32,8 @@
return "random_order_control_title"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+ /**
+ * {@inheritDoc}
*/
@Override
public TestElement createTestElement() {
@@ -44,10 +42,8 @@
return ic;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
public void modifyTestElement(TestElement ic) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java Tue Feb 9 21:09:23 2010
@@ -178,10 +178,8 @@
return up;
}
- /*
- * (non-Javadoc)
- *
- * @see AbstractTestElement#mergeIn(TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
protected void mergeIn(TestElement element) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Tue Feb 9 21:09:23 2010
@@ -57,10 +57,8 @@
super();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+ /**
+ * {@inheritDoc}
*/
public SampleResult sample(Entry e) {
JMeterContext context = JMeterContextService.getContext();
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java Tue Feb 9 21:09:23 2010
@@ -41,10 +41,8 @@
return INIT_FILE;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.timers.Timer#delay()
+ /**
+ * {@inheritDoc}
*/
public long delay() {
String ret="0";
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Tue Feb 9 21:09:23 2010
@@ -221,8 +221,8 @@
/**
* Get the timer ready to compute delays for a new test.
- *
- * @see org.apache.jmeter.testelement.TestListener#testStarted()
+ * <p>
+ * {@inheritDoc}
*/
public void testStarted()
{
@@ -230,35 +230,27 @@
reset();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testEnded()
+ /**
+ * {@inheritDoc}
*/
public void testEnded() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testStarted(java.lang.String)
+ /**
+ * {@inheritDoc}
*/
public void testStarted(String host) {
testStarted();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testEnded(java.lang.String)
+ /**
+ * {@inheritDoc}
*/
public void testEnded(String host) {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void testIterationStart(LoopIterationEvent event) {
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Tue Feb 9 21:09:23 2010
@@ -65,10 +65,8 @@
this.groupSize = numThreads;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.timers.Timer#delay()
+ /**
+ * {@inheritDoc}
*/
public long delay() {
synchronized (sync) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java Tue Feb 9 21:09:23 2010
@@ -120,10 +120,8 @@
add(delayPanel);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui()
+ /**
+ * {@inheritDoc}
*/
@Override
public void clearGui() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java Tue Feb 9 21:09:23 2010
@@ -157,10 +157,8 @@
new FocusRequester(rangeField);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui()
+ /**
+ * {@inheritDoc}
*/
@Override
public void clearGui() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java Tue Feb 9 21:09:23 2010
@@ -156,10 +156,8 @@
new FocusRequester(rangeField);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui()
+ /**
+ * {@inheritDoc}
*/
@Override
public void clearGui() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java Tue Feb 9 21:09:23 2010
@@ -125,10 +125,8 @@
}
private class Selector implements TreeSelectionListener {
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
+ /**
+ * {@inheritDoc}
*/
public void valueChanged(TreeSelectionEvent e) {
try {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java Tue Feb 9 21:09:23 2010
@@ -311,10 +311,8 @@
return model;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
public void modifyTestElement(TestElement c) {
@@ -365,10 +363,8 @@
JOptionPane.showMessageDialog(null, message, isError ? "Error" : "Information", type);
}
- /*
- * (non-Javadoc)
- *
- * @see ChangeListener#stateChanged(ChangeEvent)
+ /**
+ * {@inheritDoc}
*/
@Override
public void stateChanged(ChangeEvent e) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/ConfigTestElement.java Tue Feb 9 21:09:23 2010
@@ -40,19 +40,15 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.config.ConfigElement#addConfigElement(org.apache.jmeter.config.ConfigElement)
+ /**
+ * {@inheritDoc}
*/
public void addConfigElement(ConfigElement config) {
mergeIn((TestElement) config);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.config.ConfigElement#expectsModification()
+ /**
+ * {@inheritDoc}
*/
public boolean expectsModification() {
return false;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java Tue Feb 9 21:09:23 2010
@@ -94,10 +94,8 @@
return getPropertyAsBoolean(CONTINUE_FOREVER);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.Controller#next()
+ /**
+ * {@inheritDoc}
*/
@Override
public Sampler next() {
@@ -115,10 +113,8 @@
return (loops > -1) && (loopCount >= loops);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#nextIsNull()
+ /**
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsNull() throws NextIsNullException {
@@ -142,20 +138,16 @@
loopCount = 0;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#getIterCount()
+ /**
+ * {@inheritDoc}
*/
@Override
protected int getIterCount() {
return loopCount + 1;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#reInitialize()
+ /**
+ * {@inheritDoc}
*/
@Override
protected void reInitialize() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/RunTime.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/RunTime.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/RunTime.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/RunTime.java Tue Feb 9 21:09:23 2010
@@ -57,10 +57,8 @@
return getPropertyAsString(SECONDS);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.Controller#isDone()
+ /**
+ * {@inheritDoc}
*/
@Override
public boolean isDone() {
@@ -87,10 +85,8 @@
return super.next();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.GenericController#nextIsNull()
+ /**
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsNull() throws NextIsNullException {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/WhileController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/WhileController.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/WhileController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/WhileController.java Tue Feb 9 21:09:23 2010
@@ -68,10 +68,10 @@
return res;
}
- /*
- * (non-Javadoc) Only called at End of Loop
- *
- * @see org.apache.jmeter.control.GenericController#nextIsNull()
+ /**
+ * Only called at End of Loop
+ * <p>
+ * {@inheritDoc}
*/
@Override
protected Sampler nextIsNull() throws NextIsNullException {
@@ -82,8 +82,10 @@
return next();
}
- /*
+ /**
* This skips controller entirely if the condition is false on first entry.
+ * <p>
+ * {@inheritDoc}
*/
@Override
public Sampler next(){
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java Tue Feb 9 21:09:23 2010
@@ -46,10 +46,8 @@
public class ConvertListeners implements HashTreeTraverser {
private static final Logger log = LoggingManager.getLoggerForClass();
- /*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#addNode(Object, HashTree)
+ /**
+ * {@inheritDoc}
*/
public void addNode(Object node, HashTree subTree) {
Iterator<?> iter = subTree.list().iterator();
@@ -84,18 +82,14 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#subtractNode()
+ /**
+ * {@inheritDoc}
*/
public void subtractNode() {
}
- /*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#processPath()
+ /**
+ * {@inheritDoc}
*/
public void processPath() {
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TurnElementsOn.java Tue Feb 9 21:09:23 2010
@@ -25,11 +25,8 @@
public class TurnElementsOn implements HashTreeTraverser {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jorphan.collections.HashTreeTraverser#addNode(java.lang.Object,
- * org.apache.jorphan.collections.HashTree)
+ /**
+ * {@inheritDoc}
*/
public void addNode(Object node, HashTree subTree) {
if (node instanceof TestElement && !(node instanceof TestPlan)) {
@@ -38,18 +35,14 @@
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jorphan.collections.HashTreeTraverser#subtractNode()
+ /**
+ * {@inheritDoc}
*/
public void subtractNode() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jorphan.collections.HashTreeTraverser#processPath()
+ /**
+ * {@inheritDoc}
*/
public void processPath() {
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Tue Feb 9 21:09:23 2010
@@ -564,10 +564,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.util.LocaleChangeListener#localeChanged(org.apache.jmeter.util.LocaleChangeEvent)
+ /**
+ * {@inheritDoc}
*/
public void localeChanged(LocaleChangeEvent event) {
// FIrst make sure we save the content of the current GUI (since we
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java Tue Feb 9 21:09:23 2010
@@ -173,10 +173,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getDocAnchor()
+ /**
+ * {@inheritDoc}
*/
public String getDocAnchor() {
return null;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Feb 9 21:09:23 2010
@@ -91,10 +91,8 @@
return count;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.JDialog#dialogInit()
+ /**
+ * {@inheritDoc}
*/
@Override
protected void dialogInit() {
@@ -136,10 +134,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ /**
+ * {@inheritDoc}
*/
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java Tue Feb 9 21:09:23 2010
@@ -56,10 +56,8 @@
this.verticalAlign = verticalAlign;
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.Container#add(java.awt.Component)
+ /**
+ * {@inheritDoc}
*/
@Override
public Component add(Component c) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java Tue Feb 9 21:09:23 2010
@@ -58,10 +58,8 @@
this.horizontalAlign = horizontalAlign;
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.Container#add(java.awt.Component)
+ /**
+ * {@inheritDoc}
*/
@Override
public Component add(Component c) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultAction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultAction.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultAction.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultAction.java Tue Feb 9 21:09:23 2010
@@ -71,19 +71,15 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.samplers.SampleListener#sampleStarted(org.apache.jmeter.samplers.SampleEvent)
+ /**
+ * {@inheritDoc}
*/
public void sampleStarted(SampleEvent e) {
// not used
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.samplers.SampleListener#sampleStopped(org.apache.jmeter.samplers.SampleEvent)
+ /**
+ * {@inheritDoc}
*/
public void sampleStopped(SampleEvent e) {
// not used
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue Feb 9 21:09:23 2010
@@ -550,10 +550,8 @@
files.clear();
}
- /*
- * (non-Javadoc)
- *
- * @see TestListener#testIterationStart(LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void testIterationStart(LoopIterationEvent event) {
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java Tue Feb 9 21:09:23 2010
@@ -198,19 +198,15 @@
return sb.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.samplers.SampleListener#sampleStarted(org.apache.jmeter.samplers.SampleEvent)
+ /**
+ * {@inheritDoc}
*/
public void sampleStarted(SampleEvent e) {
// not used
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.samplers.SampleListener#sampleStopped(org.apache.jmeter.samplers.SampleEvent)
+ /**
+ * {@inheritDoc}
*/
public void sampleStopped(SampleEvent e) {
// not used
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Tue Feb 9 21:09:23 2010
@@ -296,20 +296,17 @@
testEnded("local");
}
- /*
- * (non-Javadoc)
- *
+ /**
* Called once for each Summariser in the test plan.
* There may be more than one summariser with the same name,
* however they will all be called before the test proper starts.
- *
+ * <p>
* However, note that this applies to a single test only.
* When running in client-server mode, testStarted() may be
* invoked after sampleOccurred().
- *
- * @see org.apache.jmeter.testelement.TestListener#testStarted(java.lang.String)
+ * <p>
+ * {@inheritDoc}
*/
- /** {@inheritDoc} */
public void testStarted(String host) {
synchronized (accumulators) {
myName = getName();
@@ -322,13 +319,12 @@
}
}
- /*
- * (non-Javadoc)
+ /**
* Called from a different thread as testStarted() but using the same instance.
* So synch is needed to fetch the accumulator, and the myName field will already be set up.
- * @see org.apache.jmeter.testelement.TestListener#testEnded(java.lang.String)
+ * <p>
+ * {@inheritDoc}
*/
- /** {@inheritDoc} */
public void testEnded(String host) {
Set<Entry<String, Totals>> totals = null;
synchronized (accumulators) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java Tue Feb 9 21:09:23 2010
@@ -126,10 +126,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see TestListener#testIterationStart(LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void testIterationStart(LoopIterationEvent event) {
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java Tue Feb 9 21:09:23 2010
@@ -79,10 +79,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see TestListener#testIterationStart(LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void testIterationStart(LoopIterationEvent event) {
//listener.testIterationStart(event);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java Tue Feb 9 21:09:23 2010
@@ -52,22 +52,16 @@
this.classMapper = classMapper;
}
- /*
- * (non-Javadoc)
- *
- * @see com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
+ /**
+ * {@inheritDoc}
*/
@SuppressWarnings("unchecked") // superclass is not typed
public boolean canConvert(Class arg0) {
return arg0.equals(ScriptWrapper.class);
}
- /*
- * (non-Javadoc)
- *
- * @see com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
+ /**
+ * {@inheritDoc}
*/
public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingContext context) {
ScriptWrapper wrap = (ScriptWrapper) arg0;
@@ -80,11 +74,8 @@
writer.endNode();
}
- /*
- * (non-Javadoc)
- *
- * @see com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
+ /**
+ * {@inheritDoc}
*/
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
ScriptWrapper wrap = new ScriptWrapper();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java Tue Feb 9 21:09:23 2010
@@ -45,64 +45,50 @@
return new BeanInfo[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getBeanDescriptor()
+ /**
+ * {@inheritDoc}
*/
public BeanDescriptor getBeanDescriptor() {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultEventIndex()
+ /**
+ * {@inheritDoc}
*/
public int getDefaultEventIndex() {
return 0;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultPropertyIndex()
+ /**
+ * {@inheritDoc}
*/
public int getDefaultPropertyIndex() {
return 0;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getEventSetDescriptors()
+ /**
+ * {@inheritDoc}
*/
public EventSetDescriptor[] getEventSetDescriptors() {
return new EventSetDescriptor[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getIcon(int)
+ /**
+ * {@inheritDoc}
*/
public Image getIcon(int iconKind) {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getMethodDescriptors()
+ /**
+ * {@inheritDoc}
*/
public MethodDescriptor[] getMethodDescriptors() {
return new MethodDescriptor[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getPropertyDescriptors()
+ /**
+ * {@inheritDoc}
*/
public PropertyDescriptor[] getPropertyDescriptors() {
return new PropertyDescriptor[0];
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java Tue Feb 9 21:09:23 2010
@@ -97,40 +97,32 @@
combo.setEditable(false);
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#supportsCustomEditor()
+ /**
+ * {@inheritDoc}
*/
@Override
public boolean supportsCustomEditor() {
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getCustomEditor()
+ /**
+ * {@inheritDoc}
*/
@Override
public Component getCustomEditor() {
return combo;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getValue()
+ /**
+ * {@inheritDoc}
*/
@Override
public Object getValue() {
return getAsText();
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getAsText()
+ /**
+ * {@inheritDoc}
*/
@Override
public String getAsText() {
@@ -142,20 +134,16 @@
return (String) value;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#setValue()
+ /**
+ * {@inheritDoc}
*/
@Override
public void setValue(Object value) {
setAsText((String) value);
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#setAsText()
+ /**
+ * {@inheritDoc}
*/
@Override
public void setAsText(String value) {
@@ -172,10 +160,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
+ /**
+ * {@inheritDoc}
*/
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -227,6 +213,9 @@
return noUndefined;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String[] getTags() {
return tags;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java Tue Feb 9 21:09:23 2010
@@ -85,18 +85,16 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getCustomEditor()
+ /**
+ * {@inheritDoc}
*/
@Override
public Component getCustomEditor() {
return textField;
}
- /*
- * (non-Javadoc) Avoid needlessly firing PropertyChanged events.
+ /**
+ * {@inheritDoc}
*/
@Override
public void firePropertyChange() {
@@ -110,27 +108,21 @@
super.firePropertyChange();
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ /**
+ * {@inheritDoc}
*/
public void actionPerformed(ActionEvent e) {
firePropertyChange();
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
+ /**
+ * {@inheritDoc}
*/
public void focusGained(FocusEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent)
+ /**
+ * {@inheritDoc}
*/
public void focusLost(FocusEvent e) {
firePropertyChange();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Tue Feb 9 21:09:23 2010
@@ -68,10 +68,8 @@
panel.add(button, BorderLayout.EAST);
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ /**
+ * {@inheritDoc}
*/
public void actionPerformed(ActionEvent e) {
JFileChooser chooser = FileDialoger.promptToOpenFile();
@@ -170,29 +168,28 @@
}
private static class SimpleFileEditor extends PropertyEditorSupport {
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getAsText()
+
+ /**
+ * {@inheritDoc}
*/
@Override
public String getAsText() {
return ((File) super.getValue()).getPath();
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#setAsText(java.lang.String)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setAsText(String text) throws IllegalArgumentException {
super.setValue(new File(text));
}
- /*
- * Oh, I forgot: JMeter doesn't support File properties yet. Need to
+ /**
+ * JMeter doesn't support File properties yet. Need to
* work on this as a String :-(
+ * <p>
+ * {@inheritDoc}
*/
@Override
public Object getValue() {
@@ -200,7 +197,9 @@
}
/**
- * Tsk, tsk... I need to handle Strings when setting too.
+ * I need to handle Strings when setting too.
+ * <p>
+ * {@inheritDoc}
*/
@Override
public void setValue(Object file) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java Tue Feb 9 21:09:23 2010
@@ -76,10 +76,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getCustomEditor()
+ /**
+ * {@inheritDoc}
*/
@Override
public Component getCustomEditor() {
@@ -91,8 +89,10 @@
return true;
}
- /*
- * (non-Javadoc) Avoid needlessly firing PropertyChanged events.
+ /**
+ * Avoid needlessly firing PropertyChanged events.
+ * <p>
+ * {@inheritDoc}
*/
@Override
public void firePropertyChange() {
@@ -106,27 +106,21 @@
super.firePropertyChange();
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ /**
+ * {@inheritDoc}
*/
public void actionPerformed(ActionEvent e) {
firePropertyChange();
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
+ /**
+ * {@inheritDoc}
*/
public void focusGained(FocusEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent)
+ /**
+ * {@inheritDoc}
*/
public void focusLost(FocusEvent e) {
firePropertyChange();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Feb 9 21:09:23 2010
@@ -187,10 +187,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
+ /**
+ * {@inheritDoc}
*/
@Override
public String getStaticLabel() {
@@ -200,12 +198,10 @@
return beanInfo.getBeanDescriptor().getDisplayName();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+ /**
+ * {@inheritDoc}
*/
- public TestElement createTestElement() {
+ public TestElement createTestElement() {
try {
TestElement element = (TestElement) testBeanClass.newInstance();
// configure(element);
@@ -224,11 +220,9 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
- */
+ /**
+ * {@inheritDoc}
+ */
public void modifyTestElement(TestElement element) {
// Fetch data from screen fields
if (customizer instanceof GenericTestBeanCustomizer) {
@@ -266,10 +260,8 @@
element.setProperty(jprop);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#createPopupMenu()
+ /**
+ * {@inheritDoc}
*/
public JPopupMenu createPopupMenu() {
if (Timer.class.isAssignableFrom(testBeanClass))
@@ -307,10 +299,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#configure(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
@Override
public void configure(TestElement element) {
@@ -426,20 +416,16 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource()
+ /**
+ * {@inheritDoc}
*/
public String getLabelResource() {
// @see getStaticLabel
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui()
+ /**
+ * {@inheritDoc}
*/
@Override
public void clearGui() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Tue Feb 9 21:09:23 2010
@@ -79,14 +79,23 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public void clear() {
propMap.clear();
}
+ /**
+ * {@inheritDoc}
+ */
public void removeProperty(String key) {
propMap.remove(key);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object o) {
if (o instanceof AbstractTestElement) {
@@ -98,18 +107,20 @@
// TODO temporary hack to avoid unnecessary bug reports for subclasses
+ /**
+ * {@inheritDoc}
+ */
@Override
public int hashCode(){
return System.identityHashCode(this);
}
+
/*
* URGENT: TODO - sort out equals and hashCode() - at present equal
* instances can/will have different hashcodes - problem is, when a proper
* hashcode is used, tests stop working, e.g. listener data disappears when
* switching views... This presumably means that instances currently
- * regarded as equal, aren't really equal...
- *
- * (non-Javadoc)
+ * regarded as equal, aren't really equal.
*
* @see java.lang.Object#hashCode()
*/
@@ -118,6 +129,10 @@
// {
// return propMap.hashCode();
// }
+
+ /**
+ * {@inheritDoc}
+ */
public void addTestElement(TestElement el) {
mergeIn(el);
}
@@ -396,10 +411,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestElement#isTemporary(org.apache.jmeter.testelement.property.JMeterProperty)
+ /**
+ * {@inheritDoc}
*/
public boolean isTemporary(JMeterProperty property) {
if (temporaryProperties == null) {
@@ -409,10 +422,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestElement#setTemporary(org.apache.jmeter.testelement.property.JMeterProperty)
+ /**
+ * {@inheritDoc}
*/
public void setTemporary(JMeterProperty property) {
if (temporaryProperties == null) {
@@ -481,11 +492,17 @@
super();
}
+ /**
+ * {@inheritDoc}
+ */
// Default implementation
public boolean canRemove() {
return true;
}
+ /**
+ * {@inheritDoc}
+ */
// Moved from JMeter class
public boolean isEnabled() {
return getProperty(TestElement.ENABLED) instanceof NullProperty || getPropertyAsBoolean(TestElement.ENABLED);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java Tue Feb 9 21:09:23 2010
@@ -45,64 +45,50 @@
return new BeanInfo[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getBeanDescriptor()
+ /**
+ * {@inheritDoc}
*/
public BeanDescriptor getBeanDescriptor() {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultEventIndex()
+ /**
+ * {@inheritDoc}
*/
public int getDefaultEventIndex() {
return 0;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultPropertyIndex()
+ /**
+ * {@inheritDoc}
*/
public int getDefaultPropertyIndex() {
return 0;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getEventSetDescriptors()
+ /**
+ * {@inheritDoc}
*/
public EventSetDescriptor[] getEventSetDescriptors() {
return new EventSetDescriptor[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getIcon(int)
+ /**
+ * {@inheritDoc}
*/
public Image getIcon(int iconKind) {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getMethodDescriptors()
+ /**
+ * {@inheritDoc}
*/
public MethodDescriptor[] getMethodDescriptors() {
return new MethodDescriptor[0];
}
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getPropertyDescriptors()
+ /**
+ * {@inheritDoc}
*/
public PropertyDescriptor[] getPropertyDescriptors() {
return new PropertyDescriptor[0];
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java Tue Feb 9 21:09:23 2010
@@ -271,10 +271,8 @@
threadGroups.add(group);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testEnded()
+ /**
+ * {@inheritDoc}
*/
public void testEnded() {
try {
@@ -284,28 +282,22 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testEnded(java.lang.String)
+ /**
+ * {@inheritDoc}
*/
public void testEnded(String host) {
testEnded();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void testIterationStart(LoopIterationEvent event) {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testStarted()
+ /**
+ * {@inheritDoc}
*/
public void testStarted() {
if (getBasedir() != null && getBasedir().length() > 0) {
@@ -323,10 +315,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.TestListener#testStarted(java.lang.String)
+ /**
+ * {@inheritDoc}
*/
public void testStarted(String host) {
testStarted();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java Tue Feb 9 21:09:23 2010
@@ -48,14 +48,14 @@
}
/**
- * @see JMeterProperty#getStringValue()
+ * {@inheritDoc}
*/
public String getStringValue() {
return Boolean.toString(value);
}
/**
- * @see JMeterProperty#getObjectValue()
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return Boolean.valueOf(value);
@@ -69,17 +69,15 @@
}
/**
- * @see JMeterProperty#getBooleanValue()
+ * {@inheritDoc}
*/
@Override
public boolean getBooleanValue() {
return value;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -87,10 +85,8 @@
super.setRunningVersion(runningVersion);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
value = savedValue;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java Tue Feb 9 21:09:23 2010
@@ -91,6 +91,9 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public void setObjectValue(Object v) {
if (v instanceof Collection<?>) {
setCollection((Collection<?>) v);
@@ -98,24 +101,23 @@
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public PropertyIterator iterator() {
return getIterator(value);
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#getStringValue()
+ /**
+ * {@inheritDoc}
*/
public String getStringValue() {
return value.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#getObjectValue()
+ /**
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return value;
@@ -125,10 +127,8 @@
return value.size();
}
- /*
- * (non-Javadoc)
- *
- * @see Object#clone()
+ /**
+ * {@inheritDoc}
*/
@Override
public Object clone() {
@@ -155,15 +155,16 @@
value = normalizeList(coll);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void clear() {
value.clear();
}
/**
- * Easy way to add properties to the list.
- *
- * @param prop
+ * {@inheritDoc}
*/
@Override
public void addProperty(JMeterProperty prop) {
@@ -188,10 +189,8 @@
return NullProperty.class;
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#recoverRunningVersion(TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
if (savedValue != null) {
@@ -200,10 +199,8 @@
recoverRunningVersionOfSubElements(owner);
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean running) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java Tue Feb 9 21:09:23 2010
@@ -42,30 +42,39 @@
this.value = value;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(Number n) {
value = n.doubleValue();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(String n) throws NumberFormatException {
value = Double.parseDouble(n);
}
/**
- * @see JMeterProperty#getStringValue()
+ * {@inheritDoc}
*/
public String getStringValue() {
return Double.toString(value);
}
/**
- * @see JMeterProperty#getObjectValue()
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return new Double(value);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object clone() {
DoubleProperty prop = (DoubleProperty) super.clone();
@@ -74,7 +83,7 @@
}
/**
- * @see JMeterProperty#getBooleanValue()
+ * {@inheritDoc}
*/
@Override
public boolean getBooleanValue() {
@@ -82,7 +91,7 @@
}
/**
- * @see JMeterProperty#getDoubleValue()
+ * {@inheritDoc}
*/
@Override
public double getDoubleValue() {
@@ -90,7 +99,7 @@
}
/**
- * @see JMeterProperty#getFloatValue()
+ * {@inheritDoc}
*/
@Override
public float getFloatValue() {
@@ -98,7 +107,7 @@
}
/**
- * @see JMeterProperty#getIntValue()
+ * {@inheritDoc}
*/
@Override
public int getIntValue() {
@@ -113,10 +122,8 @@
return (long) value;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -124,10 +131,8 @@
super.setRunningVersion(runningVersion);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
value = savedValue;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java Tue Feb 9 21:09:23 2010
@@ -38,10 +38,8 @@
public FloatProperty() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -49,10 +47,8 @@
super.setRunningVersion(runningVersion);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
value = savedValue;
@@ -62,30 +58,39 @@
this.value = value;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(Number n) {
value = n.floatValue();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(String n) throws NumberFormatException {
value = Float.parseFloat(n);
}
/**
- * @see JMeterProperty#getStringValue()
+ * {@inheritDoc}
*/
public String getStringValue() {
return Float.toString(value);
}
/**
- * @see JMeterProperty#getObjectValue()
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return new Float(value);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object clone() {
FloatProperty prop = (FloatProperty) super.clone();
@@ -94,7 +99,7 @@
}
/**
- * @see JMeterProperty#getBooleanValue()
+ * {@inheritDoc}
*/
@Override
public boolean getBooleanValue() {
@@ -102,7 +107,7 @@
}
/**
- * @see JMeterProperty#getDoubleValue()
+ * {@inheritDoc}
*/
@Override
public double getDoubleValue() {
@@ -110,7 +115,7 @@
}
/**
- * @see JMeterProperty#getFloatValue()
+ * {@inheritDoc}
*/
@Override
public float getFloatValue() {
@@ -118,7 +123,7 @@
}
/**
- * @see JMeterProperty#getIntValue()
+ * {@inheritDoc}
*/
@Override
public int getIntValue() {
@@ -126,7 +131,7 @@
}
/**
- * @see JMeterProperty#getLongValue()
+ * {@inheritDoc}
*/
@Override
public long getLongValue() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java Tue Feb 9 21:09:23 2010
@@ -35,10 +35,8 @@
this.value = value;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -46,10 +44,8 @@
super.setRunningVersion(runningVersion);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
value = savedValue;
@@ -67,11 +63,17 @@
this.value = value;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(Number n) {
value = n.intValue();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(String n) throws NumberFormatException {
value = Integer.parseInt(n);
@@ -91,6 +93,9 @@
return new Integer(value);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object clone() {
IntegerProperty prop = (IntegerProperty) super.clone();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java Tue Feb 9 21:09:23 2010
@@ -39,10 +39,8 @@
super();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -50,10 +48,8 @@
super.setRunningVersion(runningVersion);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
value = savedValue;
@@ -63,11 +59,17 @@
this.value = value;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(Number n) {
value = n.longValue();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void setNumberValue(String n) throws NumberFormatException {
value = Long.parseLong(n);
@@ -87,6 +89,9 @@
return new Long(value);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object clone() {
LongProperty prop = (LongProperty) super.clone();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java Tue Feb 9 21:09:23 2010
@@ -30,10 +30,8 @@
private Object savedValue;
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
if (savedValue != null) {
@@ -41,6 +39,9 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setRunningVersion(boolean runningVersion) {
super.setRunningVersion(runningVersion);
@@ -51,10 +52,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
+ /**
+ * {@inheritDoc}
*/
@Override
public Object clone() {
@@ -83,28 +82,22 @@
value = p;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#getStringValue()
+ /**
+ * {@inheritDoc}
*/
public String getStringValue() {
return value.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#getObjectValue()
+ /**
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return value;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.testelement.property.JMeterProperty#setObjectValue(java.lang.Object)
+ /**
+ * {@inheritDoc}
*/
public void setObjectValue(Object value) {
this.value = value;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java Tue Feb 9 21:09:23 2010
@@ -52,6 +52,9 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public void setObjectValue(Object v) {
value = v.toString();
}
@@ -70,6 +73,9 @@
return value;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object clone() {
StringProperty prop = (StringProperty) super.clone();
@@ -87,10 +93,8 @@
this.value = value;
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#recoverRunningVersion(TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
if (savedValue != null) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java Tue Feb 9 21:09:23 2010
@@ -60,21 +60,24 @@
return value == null ? 0 : value.hashCode();
}
- /*
- * (non-Javadoc) #getStringValue()
+ /**
+ * {@inheritDoc}
*/
public String getStringValue() {
return value.toString();
}
+ /**
+ * {@inheritDoc}
+ */
public void setObjectValue(Object v) {
if (v instanceof TestElement) {
value = (TestElement) v;
}
}
- /*
- * (non-Javadoc) #getObjectValue()
+ /**
+ * {@inheritDoc}
*/
public Object getObjectValue() {
return value;
@@ -88,10 +91,8 @@
value = el;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
+ /**
+ * {@inheritDoc}
*/
@Override
public Object clone() {
@@ -100,8 +101,8 @@
return prop;
}
- /*
- * (non-Javadoc) #mergeIn(JMeterProperty)
+ /**
+ * {@inheritDoc}
*/
@Override
public void mergeIn(JMeterProperty prop) {
@@ -110,8 +111,8 @@
}
}
- /*
- * (non-Javadoc) #recoverRunningVersion(TestElement)
+ /**
+ * {@inheritDoc}
*/
public void recoverRunningVersion(TestElement owner) {
if (savedValue != null) {
@@ -120,8 +121,8 @@
value.recoverRunningVersion();
}
- /*
- * (non-Javadoc) #setRunningVersion(boolean)
+ /**
+ * {@inheritDoc}
*/
@Override
public void setRunningVersion(boolean runningVersion) {
@@ -134,20 +135,16 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see MultiProperty#addProperty(JMeterProperty)
+ /**
+ * {@inheritDoc}
*/
@Override
public void addProperty(JMeterProperty prop) {
value.setProperty(prop);
}
- /*
- * (non-Javadoc)
- *
- * @see MultiProperty#clear()
+ /**
+ * {@inheritDoc}
*/
@Override
public void clear() {
@@ -155,10 +152,8 @@
}
- /*
- * (non-Javadoc)
- *
- * @see MultiProperty#iterator()
+ /**
+ * {@inheritDoc}
*/
@Override
public PropertyIterator iterator() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Tue Feb 9 21:09:23 2010
@@ -717,10 +717,8 @@
}
private class IterationListener implements LoopIterationListener {
- /*
- * (non-Javadoc)
- *
- * @see LoopIterationListener#iterationStart(LoopIterationEvent)
+ /**
+ * {@inheritDoc}
*/
public void iterationStart(LoopIterationEvent iterEvent) {
notifyTestListeners();
Modified: jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java (original)
+++ jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java Tue Feb 9 21:09:23 2010
@@ -56,10 +56,8 @@
trace("ExampleSampler()");
}
- /*
- * (non-Javadoc) Performs the sample, and returns the result
- *
- * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+ /**
+ * {@inheritDoc}
*/
public SampleResult sample(Entry e) {
trace("sample()");
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org