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 [2/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...

Modified: jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java Tue Feb  9 21:09:23 2010
@@ -53,19 +53,15 @@
         init();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
+    /**
+     * {@inheritDoc}
      */
     public String getLabelResource() {
         return "example_title"; // $NON-NLS-1$
     }
 
-    /*
-     * (non-Javadoc) Copy the data from the test element to the GUI
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#configure(org.apache.jmeter.testelement.TestElement)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void configure(TestElement element) {
@@ -73,10 +69,8 @@
         super.configure(element);
     }
 
-    /*
-     * (non-Javadoc) Create the corresponding Test Element and set up its data
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+    /**
+     * {@inheritDoc}
      */
     public TestElement createTestElement() {
         ExampleSampler sampler = new ExampleSampler();
@@ -84,11 +78,8 @@
         return sampler;
     }
 
-    /*
-     * (non-Javadoc) Modifies a given TestElement to mirror the data in the gui
-     * components.
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+    /**
+     * {@inheritDoc}
      */
     public void modifyTestElement(TestElement te) {
         te.clear();
@@ -128,6 +119,9 @@
         return dataPanel;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void clearGui() {
         super.clearGui();

Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java Tue Feb  9 21:09:23 2010
@@ -75,28 +75,30 @@
         return this.rootNode;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jorphan.gui.TreeTableModel#getValueAt(java.lang.Object, int)
+    /**
+     * {@inheritDoc}
      */
     public Object getValueAt(Object node, int col) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jorphan.gui.TreeTableModel#isCellEditable(java.lang.Object, int)
+    /**
+     * {@inheritDoc}
      */
     public boolean isCellEditable(Object node, int col) {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jorphan.gui.TreeTableModel#setValueAt(java.lang.Object, java.lang.Object, int)
+    /**
+     * {@inheritDoc}
      */
     public void setValueAt(Object val, Object node, int column) {
     }
 
     /**
      * The implementation is exactly the same as ObjectTableModel.getColumnCount.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public int getColumnCount() {
@@ -105,6 +107,8 @@
 
     /**
      * The implementation is exactly the same as ObjectTableModel.getRowCount.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public int getRowCount() {
@@ -117,12 +121,17 @@
     /**
      * By default the abstract class returns true. It is up to subclasses
      * to override the implementation.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
         return true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Class<?> getColumnClass(int arg0) {
         return classes.get(arg0);
@@ -131,6 +140,8 @@
     /**
      * Subclasses need to implement the logic for the method and
      * return the value at the specific cell.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
@@ -138,7 +149,7 @@
     }
 
     /**
-     *
+     * {@inheritDoc}
      */
     @Override
     public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
@@ -146,7 +157,7 @@
     }
 
     /**
-     *
+     * {@inheritDoc}
      */
     @Override
     public String getColumnName(int columnIndex) {
@@ -176,7 +187,7 @@
     }
 
     /**
-     *
+     * {@inheritDoc}
      */
     @Override
     public void addTableModelListener(TableModelListener l) {
@@ -184,7 +195,7 @@
     }
 
     /**
-     *
+     * {@inheritDoc}
      */
     @Override
     public void removeTableModelListener(TableModelListener l) {

Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java Tue Feb  9 21:09:23 2010
@@ -131,19 +131,15 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jorphan.gui.JLabeledField#setLabel(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setLabel(String pLabel) {
         this.mLabel.setText(pLabel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jorphan.gui.JLabeledField#addChangeListener(javax.swing.event.ChangeListener)
+    /**
+     * {@inheritDoc}
      */
     public void addChangeListener(ChangeListener pChangeListener) {
         this.mChangeListeners.add(pChangeListener);

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java Tue Feb  9 21:09:23 2010
@@ -90,10 +90,8 @@
         return filesPanel;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.config.gui.UrlConfigGui#clear()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void clear() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java Tue Feb  9 21:09:23 2010
@@ -58,6 +58,9 @@
         init();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void configure(TestElement element) {
         super.configure(element);
@@ -69,6 +72,9 @@
         embeddedRE.setText(samplerBase.getEmbeddedUrlRE());
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public TestElement createTestElement() {
         HTTPSamplerBase sampler = HTTPSamplerFactory.newInstance();// create default sampler
         modifyTestElement(sampler);
@@ -77,8 +83,8 @@
 
     /**
      * Modifies a given TestElement to mirror the data in the gui components.
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+     * <p>
+     * {@inheritDoc}
      */
     public void modifyTestElement(TestElement sampler) {
         sampler.clear();
@@ -97,6 +103,9 @@
         this.configureTestElement(sampler);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public String getLabelResource() {
         return "web_testing_title"; // $NON-NLS-1$
     }
@@ -140,15 +149,16 @@
         return optionalTasksPanel;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Dimension getPreferredSize() {
         return getMinimumSize();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void clearGui() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java Tue Feb  9 21:09:23 2010
@@ -41,6 +41,9 @@
         super();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public TestElement createTestElement() {
         HTTPSamplerBase sampler = HTTPSamplerFactory.newInstance(HTTPSamplerFactory.HTTP_SAMPLER_APACHE);
@@ -48,18 +51,27 @@
         return sampler;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     // Use this instead of getLabelResource() otherwise getDocAnchor() below does not work
     @Override
     public String getStaticLabel() {
         return JMeterUtils.getResString("web_testing2_title"); //$NON-NLS-1$
     }
 
+    /**
+     * {@inheritDoc}
+     */
     // Documentation is shared with our parent
     @Override
     public String getDocAnchor() {
         return super.getStaticLabel().replace(' ', '_'); // $NON-NLS-1$  // $NON-NLS-2$
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     protected JPanel createOptionalTasksPanel() {
         JPanel optionalTasksPanel = super.createOptionalTasksPanel();
@@ -71,8 +83,8 @@
         return optionalTasksPanel;
     }
     
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui#clearGui()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void clearGui() {
@@ -80,8 +92,8 @@
         sourceIpAddr.setText(""); // $NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui#configure(org.apache.jmeter.testelement.TestElement)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void configure(TestElement element) {
@@ -90,8 +102,8 @@
         sourceIpAddr.setText(samplerBase.getIpSource());
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui#modifyTestElement(org.apache.jmeter.testelement.TestElement)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void modifyTestElement(TestElement sampler) {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java Tue Feb  9 21:09:23 2010
@@ -55,10 +55,8 @@
         return "soap_sampler_title"; //$NON-NLS-1$
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+    /**
+     * {@inheritDoc}
      */
     public TestElement createTestElement() {
         SoapSampler sampler = new SoapSampler();
@@ -150,6 +148,9 @@
         add(mainPanel, BorderLayout.CENTER);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void configure(TestElement el) {
         super.configure(el);
@@ -162,6 +163,9 @@
         useKeepAlive.setSelected(sampler.getUseKeepAlive());
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Dimension getPreferredSize() {
         return getMinimumSize();

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java Tue Feb  9 21:09:23 2010
@@ -77,10 +77,8 @@
         add(mainPanel, BorderLayout.CENTER);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+    /**
+     * {@inheritDoc}
      */
     public TestElement createTestElement() {
         URLRewritingModifier modifier = new URLRewritingModifier();
@@ -90,8 +88,8 @@
 
     /**
      * Modifies a given TestElement to mirror the data in the gui components.
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+     * <p>
+     * {@inheritDoc}
      */
     public void modifyTestElement(TestElement modifier) {
         this.configureTestElement(modifier);
@@ -104,7 +102,7 @@
     }
 
     /**
-     * Implements JMeterGUIComponent.clearGui
+     * {@inheritDoc}
      */
     @Override
     public void clearGui() {
@@ -117,6 +115,9 @@
         shouldCache.setSelected(false);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void configure(TestElement el) {
         URLRewritingModifier rewritingModifier = ((URLRewritingModifier) el);

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java Tue Feb  9 21:09:23 2010
@@ -61,11 +61,8 @@
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.parser.HtmlParser#getEmbeddedResourceURLs(byte[],
-     *      java.net.URL)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(byte[] html, URL baseUrl, URLCollection urls) throws HTMLParseException {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java Tue Feb  9 21:09:23 2010
@@ -49,11 +49,8 @@
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.parser.HTMLParser#getEmbeddedResourceURLs(byte[],
-     *      java.net.URL)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(byte[] html, URL baseUrl, URLCollection urls) throws HTMLParseException {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java Tue Feb  9 21:09:23 2010
@@ -123,6 +123,9 @@
         }
     };
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     protected boolean isReusable() {
         return true;
@@ -135,11 +138,8 @@
         super();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.parser.HtmlParser#getEmbeddedResourceURLs(byte[],
-     *      java.net.URL)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(byte[] html, URL baseUrl, URLCollection urls) {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java Tue Feb  9 21:09:23 2010
@@ -289,10 +289,8 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#clone()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Object clone() {
@@ -322,10 +320,8 @@
         return s;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.testelement.TestListener#testEnded()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void testEnded() {
@@ -337,10 +333,8 @@
         super.testEnded();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.testelement.TestListener#testStarted()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void testStarted() {
@@ -348,8 +342,8 @@
         super.testStarted();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.testelement.AbstractTestElement#threadFinished()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void threadFinished() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Tue Feb  9 21:09:23 2010
@@ -105,11 +105,10 @@
         return false;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * Overrides version in Sampler data to provide more details
-     *
-     * @see org.apache.jmeter.samplers.SampleResult#getSamplerData()
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public String getSamplerData() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Tue Feb  9 21:09:23 2010
@@ -1143,36 +1143,28 @@
         return JOrphanUtils.replaceAllChars(path, ' ', "%20"); // $NON-NLS-1$
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.testelement.TestListener#testEnded()
+    /**
+     * {@inheritDoc}
      */
     public void testEnded() {
         dynamicPath = false;
     }
 
-    /*
-     * (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() {
         JMeterProperty pathP = getProperty(PATH);
@@ -1189,19 +1181,15 @@
         log.debug("path ending value = " + pathP.getStringValue());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.testelement.TestListener#testStarted(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void testStarted(String host) {
         testStarted();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#clone()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Object clone() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java Tue Feb  9 21:09:23 2010
@@ -417,10 +417,8 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#reset()
+    /**
+     * {@inheritDoc}
      */
     public void reset() {
 

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java Tue Feb  9 21:09:23 2010
@@ -74,15 +74,16 @@
         return matcher.getMatch().group(0);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#reset()
+    /**
+     * {@inheritDoc}
      */
     public void reset() {
         cookieManagers.clear();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Object clone() {
         if(cookieManagers == null)
@@ -105,51 +106,39 @@
     public SessionFilter() {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#excludeFiles(java.lang.String[])
+    /**
+     * {@inheritDoc}
      */
     public void excludeFiles(String[] filenames) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#excludePattern(java.lang.String[])
+    /**
+     * {@inheritDoc}
      */
     public void excludePattern(String[] regexp) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#filter(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public String filter(String text) {
         return text;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#includeFiles(java.lang.String[])
+    /**
+     * {@inheritDoc}
      */
     public void includeFiles(String[] filenames) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#includePattern(java.lang.String[])
+    /**
+     * {@inheritDoc}
      */
     public void includePattern(String[] regexp) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#isFiltered(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public boolean isFiltered(String path,TestElement sampler) {
         String ipAddr = getIpAddress(path);
@@ -201,17 +190,14 @@
         return cm;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Filter#setReplaceExtension(java.lang.String,
-     *      java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setReplaceExtension(String oldextension, String newextension) {
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.testelement.ThreadListener#threadFinished()
+    /**
+     * {@inheritDoc}
      */
     public void threadFinished() {
         synchronized(managersInUse)
@@ -221,11 +207,9 @@
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.testelement.ThreadListener#threadStarted()
+    /**
+     * {@inheritDoc}
      */
     public void threadStarted() {
-        // TODO Auto-generated method stub
-
     }
 }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java Tue Feb  9 21:09:23 2010
@@ -34,8 +34,8 @@
         super(source);
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#clone()
+    /**
+     * {@inheritDoc}
      */
     @Override
     public Object clone() {
@@ -45,8 +45,8 @@
         return parser;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.util.accesslog.TCLogParser#parse(org.apache.jmeter.testelement.TestElement, int)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public int parse(TestElement el, int parseCount) {
@@ -99,6 +99,9 @@
         return actualCount;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void close() {
         try {
@@ -108,6 +111,4 @@
         }
     }
 
-
-
 }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java Tue Feb  9 21:09:23 2010
@@ -116,47 +116,37 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#close()
+    /**
+     * {@inheritDoc}
      */
     public void close() {
         JOrphanUtils.closeQuietly(OUTPUT);
         JOrphanUtils.closeQuietly(WRITER);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setHost(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setHost(String host) {
         SAMPLE.setDomain(host);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setLabel(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setLabel(String label) {
 
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setMethod(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setMethod(String post_get) {
         SAMPLE.setMethod(post_get);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setParams(org.apache.jmeter.protocol.http.util.accesslog.NVPair[])
+    /**
+     * {@inheritDoc}
      */
     public void setParams(NVPair[] params) {
         for (int idx = 0; idx < params.length; idx++) {
@@ -164,53 +154,41 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setPath(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setPath(String path) {
         SAMPLE.setPath(path);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setPort(int)
+    /**
+     * {@inheritDoc}
      */
     public void setPort(int port) {
         SAMPLE.setPort(port);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setQueryString(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setQueryString(String querystring) {
         SAMPLE.parseArguments(querystring);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setSourceLogs(java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void setSourceLogs(String sourcefile) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#setTarget(java.lang.Object)
+    /**
+     * {@inheritDoc}
      */
     public void setTarget(Object target) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#generateRequest()
+    /**
+     * {@inheritDoc}
      */
     public Object generateRequest() {
         SAMPLE = HTTPSamplerFactory.newInstance();
@@ -231,11 +209,11 @@
 
     /**
      * Reset the HTTPSampler to make sure it is a new instance.
+     * <p>
+     * {@inheritDoc}
      */
     public void reset() {
         SAMPLE = null;
         generateRequest();
     }
-
-    // TODO write some tests
 }

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Tue Feb  9 21:09:23 2010
@@ -67,10 +67,8 @@
     public BaseJMSSampler() {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+    /**
+     * {@inheritDoc}
      */
     public SampleResult sample(Entry e) {
         return this.sample();

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java Tue Feb  9 21:09:23 2010
@@ -75,10 +75,8 @@
         this.useReqMsgIdAsCorrelId = useReqMsgIdAsCorrelId;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.jms.sampler.QueueExecutor#sendAndReceive(javax.jms.Message)
+    /**
+     * {@inheritDoc}
      */
     public Message sendAndReceive(Message request) throws JMSException {
         String id = request.getJMSCorrelationID();

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Tue Feb  9 21:09:23 2010
@@ -121,10 +121,8 @@
 
     private transient Receiver receiverThread = null;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+    /**
+     * {@inheritDoc}
      */
     public SampleResult sample(Entry entry) {
         SampleResult res = new SampleResult();
@@ -438,10 +436,8 @@
         return getPropertyAsString(TIMEOUT, DEFAULT_TIMEOUT_STRING);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.testelement.TestElement#threadFinished()
+    /**
+     * {@inheritDoc}
      */
     public void threadFinished() {
         LOGGER.debug("Thread ended " + new Date());

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Tue Feb  9 21:09:23 2010
@@ -79,14 +79,15 @@
         ClientPool.clearClient();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see junit.framework.TestListener#startTest(junit.framework.Test)
+    /**
+     * {@inheritDoc}
      */
     public void testStarted() {
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public void testIterationStart(LoopIterationEvent event) {
     }
 

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java Tue Feb  9 21:09:23 2010
@@ -50,10 +50,8 @@
         requestor = new QueueRequestor(session, destination);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.jms.sampler.QueueExecutor#sendAndReceive(javax.jms.Message)
+    /**
+     * {@inheritDoc}
      */
     public Message sendAndReceive(Message request) throws JMSException {
         return requestor.request(request);

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Tue Feb  9 21:09:23 2010
@@ -77,10 +77,8 @@
         setDeleteMessages(false);
     }
 
-    /*
-     * (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) {
         SampleResult parent = new SampleResult();

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Tue Feb  9 21:09:23 2010
@@ -107,10 +107,8 @@
         return "mail_reader_title"; // $NON-NLS-1$
     }
 
-    /*
-     * (non-Javadoc) Copy the data from the test element to the GUI
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#configure(org.apache.jmeter.testelement.TestElement)
+    /**
+     * {@inheritDoc}
      */
     @Override
     public void configure(TestElement element) {
@@ -144,10 +142,8 @@
         super.configure(element);
     }
 
-    /*
-     * (non-Javadoc) Create the corresponding Test Element and set up its data
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+    /**
+     * {@inheritDoc}
      */
     public TestElement createTestElement() {
         MailReaderSampler sampler = new MailReaderSampler();
@@ -155,11 +151,8 @@
         return sampler;
     }
 
-    /*
-     * (non-Javadoc) Modifies a given TestElement to mirror the data in the gui
-     * components.
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+    /**
+     * {@inheritDoc}
      */
     public void modifyTestElement(TestElement te) {
         te.clear();

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java Tue Feb  9 21:09:23 2010
@@ -26,15 +26,15 @@
     protected byte eolByte;
     protected boolean useEolByte = false;
     
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#getEolByte()
+    /**
+     * {@inheritDoc}
      */
     public byte getEolByte() {
         return eolByte;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#setEolByte(int)
+    /**
+     * {@inheritDoc}
      */
     public void setEolByte(int eolInt) {
         if (eolInt >= Byte.MIN_VALUE && eolInt <= Byte.MAX_VALUE) {
@@ -45,14 +45,14 @@
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#setupTest()
+    /**
+     * {@inheritDoc}
      */
     public void setupTest() {
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#teardownTest()
+    /**
+     * {@inheritDoc}
      */
     public void teardownTest() {
     }

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java Tue Feb  9 21:09:23 2010
@@ -104,12 +104,8 @@
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream
-     * , java.io.InputStream)
+    /**
+     * {@inheritDoc}
      */
     public void write(OutputStream os, InputStream is) {
         throw new UnsupportedOperationException(

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java Tue Feb  9 21:09:23 2010
@@ -54,12 +54,8 @@
     }
 
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream
-     * , java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void write(OutputStream os, String s) {
         try {
@@ -72,23 +68,15 @@
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream
-     * , java.io.InputStream)
+    /**
+     * {@inheritDoc}
      */
     public void write(OutputStream os, InputStream is) {
         this.tcpClient.write(os, is);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.jmeter.protocol.tcp.sampler.TCPClient#read(java.io.InputStream
-     * )
+    /**
+     * {@inheritDoc}
      */
     public String read(InputStream is) {
         byte[] msg = new byte[0];
@@ -118,8 +106,8 @@
 
     /**
      * Not useful, as the byte is never used.
-     * 
-     * @return Returns the eolByte.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public byte getEolByte() {
@@ -127,8 +115,7 @@
     }
 
     /**
-     * @param eolInt
-     *            The eolByte to set.
+     * {@inheritDoc}
      */
     @Override
     public void setEolByte(int eolInt) {

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java Tue Feb  9 21:09:23 2010
@@ -58,11 +58,8 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream,
-     *      java.lang.String)
+    /**
+     * {@inheritDoc}
      */
     public void write(OutputStream os, String s) {
         try {
@@ -75,11 +72,8 @@
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream,
-     *      java.io.InputStream)
+    /**
+     * {@inheritDoc}
      */
     public void write(OutputStream os, InputStream is) {
         byte buff[]=new byte[512];

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java?rev=908219&r1=908218&r2=908219&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java Tue Feb  9 21:09:23 2010
@@ -36,10 +36,8 @@
 
     private long samples = 0; // number of samples taken
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+    /**
+     * {@inheritDoc}
      */
     public SampleResult sample(Entry e) {
         if (wait > 0) {



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org