jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1413262 - in /jmeter/trunk/src: examples/org/apache/jmeter/examples/sampler/ examples/org/apache/jmeter/examples/sampler/gui/ examples/org/apache/jmeter/examples/testbeans/example1/ examples/org/apache/jmeter/examples/testbeans/example2/ e...
Date Sat, 24 Nov 2012 20:58:44 GMT
Author: pmouawad
Date: Sat Nov 24 20:58:40 2012
New Revision: 1413262

URL: http://svn.apache.org/viewvc?rev=1413262&view=rev
Log:
Bug 54199 - Move to Java 6
add @Override
Bugzilla Id: 54199

Modified:
    jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
    jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
    jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
    jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
    jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java
    jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
    jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java

Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java (original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java Sat Nov
24 20:58:40 2012
@@ -61,6 +61,7 @@ public class ExampleSampler extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public SampleResult sample(Entry e) {
         trace("sample()");
         SampleResult res = new SampleResult();

Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
(original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
Sat Nov 24 20:58:40 2012
@@ -56,6 +56,7 @@ public class ExampleSamplerGui extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getLabelResource() {
         return "example_title"; // $NON-NLS-1$
     }
@@ -72,6 +73,7 @@ public class ExampleSamplerGui extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public TestElement createTestElement() {
         ExampleSampler sampler = new ExampleSampler();
         modifyTestElement(sampler);
@@ -81,6 +83,7 @@ public class ExampleSamplerGui extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public void modifyTestElement(TestElement te) {
         te.clear();
         configureTestElement(te);

Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
(original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
Sat Nov 24 20:58:40 2012
@@ -35,6 +35,7 @@ public class Example1 extends AbstractSa
 
     private static final long serialVersionUID = 240L;
 
+    @Override
     public SampleResult sample(Entry e) {
         SampleResult res = new SampleResult();
         res.setSampleLabel(getName());

Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
(original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
Sat Nov 24 20:58:40 2012
@@ -35,6 +35,7 @@ public class Example2 extends AbstractSa
 
     private static final long serialVersionUID = 240L;
 
+    @Override
     public SampleResult sample(Entry e) {
         SampleResult res = new SampleResult();
         res.setSampleLabel(getName());

Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java
(original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java
Sat Nov 24 20:58:40 2012
@@ -43,6 +43,7 @@ public class Example3 extends AbstractSa
     private File myFile1;
     private String myFile2;
 
+    @Override
     public SampleResult sample(Entry ignored) {
         SampleResult res = new SampleResult();
         res.setSampleLabel(getName());

Modified: jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
(original)
+++ jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Sat Nov 24 20:58:40 2012
@@ -147,6 +147,7 @@ implements ChangeListener, ActionListene
         init();
     }
 
+    @Override
     public String getLabelResource()
     {
         return "junit_request"; //$NON-NLS-1$
@@ -261,6 +262,7 @@ implements ChangeListener, ActionListene
     }
 
     /** {@inheritDoc} */
+    @Override
     public TestElement createTestElement()
     {
         JUnitSampler sampler = new JUnitSampler();
@@ -269,6 +271,7 @@ implements ChangeListener, ActionListene
     }
 
     /** {@inheritDoc} */
+    @Override
     public void modifyTestElement(TestElement el)
     {
         JUnitSampler sampler = (JUnitSampler)el;
@@ -400,6 +403,7 @@ implements ChangeListener, ActionListene
      *
      * @param evt  the ActionEvent to be handled
      */
+    @Override
     public void actionPerformed(ActionEvent evt)
     {
         if (evt.getSource() == classnameCombo)
@@ -412,6 +416,7 @@ implements ChangeListener, ActionListene
      * Handle change events: currently handles events for the JUnit4
      * checkbox, and sets up the relevant class names.
      */
+    @Override
     public void itemStateChanged(ItemEvent event) {
         if (event.getItem() == junit4){
             setupClasslist();
@@ -422,6 +427,7 @@ implements ChangeListener, ActionListene
      * the current implementation checks to see if the source
      * of the event is the filterpkg field.
      */
+    @Override
     public void stateChanged(ChangeEvent event) {
         if ( event.getSource() == filterpkg) {
             setupClasslist();

Modified: jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java (original)
+++ jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java Sat Nov
24 20:58:40 2012
@@ -358,6 +358,7 @@ public class JUnitSampler extends Abstra
     }
 
     /** {@inheritDoc} */
+    @Override
     public SampleResult sample(Entry entry) {
         if(getCreateOneInstancePerSample()) {
             initializeTestObject();
@@ -616,12 +617,14 @@ public class JUnitSampler extends Abstra
         }
     }
 
+    @Override
     public void threadFinished() {
     }
 
     /**
      * Set up all variables that don't change between samples.
      */
+    @Override
     public void threadStarted() {
         testObject = null;
         testCase = null;
@@ -658,6 +661,7 @@ public class JUnitSampler extends Abstra
                 final AnnotatedTestCase at = new AnnotatedTestCase(m, expectedException,
timeout);
                 testCase = at;
                 protectable = new Protectable() {
+                    @Override
                     public void protect() throws Throwable {
                         at.runTest();
                     }
@@ -666,6 +670,7 @@ public class JUnitSampler extends Abstra
                 this.testCase = (TestCase) this.testObject;
                 final Object theClazz = this.testObject; // Must be final to create instance
                 protectable = new Protectable() {
+                    @Override
                     public void protect() throws Throwable {
                         try {
                             m.invoke(theClazz,new Object[0]);

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
Sat Nov 24 20:58:40 2012
@@ -209,6 +209,7 @@ public class MonitorAccumModel implement
      * clear listeners, subsequent "run" will not notify the gui of data
      * changes.
      */
+    @Override
     public void clearData() {
         for (List<MonitorModel> modelList : this.serverListMap.values()) {
             modelList.clear();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java Sat
Nov 24 20:58:40 2012
@@ -87,6 +87,7 @@ public class MonitorGraph extends JCompo
      * The method will first check to see if the graph is visible. If it is, it
      * will repaint the graph.
      */
+    @Override
     public void updateGui(final MonitorModel model) {
         if (this.isShowing()) {
             this.current = model;
@@ -130,6 +131,7 @@ public class MonitorGraph extends JCompo
     /**
      * updateGui() will call repaint
      */
+    @Override
     public void updateGui() {
         repaint();
     }
@@ -137,6 +139,7 @@ public class MonitorGraph extends JCompo
     /**
      * clear will repaint the graph
      */
+    @Override
     public void clearData() {
         paintComponent(getGraphics());
         this.repaint();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
Sat Nov 24 20:58:40 2012
@@ -113,6 +113,7 @@ public class MonitorHealthPanel extends 
      *
      * @param model
      */
+    @Override
     public void addSample(MonitorModel model) {
         if (serverPanelMap.containsKey(model.getURL())) {
             ServerPanel pane = null;
@@ -136,6 +137,7 @@ public class MonitorHealthPanel extends 
      * clear will clear the hashmap, remove all ServerPanels from the servers
      * pane, and update the ui.
      */
+    @Override
     public void clearData() {
         this.serverPanelMap.clear();
         this.servers.removeAll();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
Sat Nov 24 20:58:40 2012
@@ -95,6 +95,7 @@ public class MonitorHealthVisualizer ext
         model.setBufferSize(JMeterUtils.getPropDefault(BUFFER, 800));
     }
 
+    @Override
     public String getLabelResource() {
         return "monitor_health_title"; // $NON-NLS-1$
     }
@@ -104,6 +105,7 @@ public class MonitorHealthVisualizer ext
      * results differently than normal GUI components. A monitor should be able
      * to run for a very long time without eating up all the memory.
      */
+    @Override
     public void add(SampleResult res) {
         model.addSample(res);
         try {
@@ -114,6 +116,7 @@ public class MonitorHealthVisualizer ext
         }
     }
 
+    @Override
     public Image getImage() {
         Image result = graph.createImage(this.getWidth(), this.getHeight());
         Graphics image = result.getGraphics();
@@ -121,13 +124,16 @@ public class MonitorHealthVisualizer ext
         return result;
     }
 
+    @Override
     public void itemStateChanged(ItemEvent e) {
     }
 
+    @Override
     public synchronized void updateGui() {
         this.repaint();
     }
 
+    @Override
     public synchronized void updateGui(Sample s) {
         this.repaint();
     }
@@ -179,6 +185,7 @@ public class MonitorHealthVisualizer ext
     /**
      * Clears the MonitorAccumModel.
      */
+    @Override
     public void clearData() {
         this.model.clearData();
         this.healthPane.clearData();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java Sat
Nov 24 20:58:40 2012
@@ -101,6 +101,7 @@ public class MonitorModel implements Cle
     /**
      * clear will create a new MonitorStats object.
      */
+    @Override
     public void clearData() {
         current = new MonitorStats(0, 0, 0, 0, 0, "", "", "", System.currentTimeMillis());
     }

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
Sat Nov 24 20:58:40 2012
@@ -253,6 +253,7 @@ public class MonitorPerformancePanel ext
      * MonitorAccumModel will call this method to notify the component data has
      * changed.
      */
+    @Override
     public synchronized void addSample(MonitorModel model) {
         if (!SERVERMAP.containsKey(model.getURL())) {
             DefaultMutableTreeNode newnode = new DefaultMutableTreeNode(model);
@@ -275,6 +276,7 @@ public class MonitorPerformancePanel ext
      * node. From the node, we get the UserObject used to create the treenode in
      * the constructor.
      */
+    @Override
     public void valueChanged(TreeSelectionEvent e) {
         // we check to see if the lastSelectedPath is null
         // after we clear, it would return null
@@ -294,6 +296,7 @@ public class MonitorPerformancePanel ext
      * clear will remove all child nodes from the ROOTNODE, clear the HashMap,
      * update the graph and jpanel for the server tree.
      */
+    @Override
     public void clearData() {
         this.SERVERMAP.clear();
         ROOTNODE.removeAllChildren();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java Sat
Nov 24 20:58:40 2012
@@ -184,6 +184,7 @@ public class ServerPanel extends JPanel 
      * Method will update the ServerPanel's health, load, and timestamp. For
      * efficiency, it uses the static method to lookup the images.
      */
+    @Override
     public void updateGui(MonitorModel stat) {
         // this.DATA = null;
         // this.DATA = stat;
@@ -196,6 +197,7 @@ public class ServerPanel extends JPanel 
     /**
      * update the gui
      */
+    @Override
     public void updateGui() {
         this.repaint();
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java Sat
Nov 24 20:58:40 2012
@@ -36,34 +36,42 @@ public class ConnectorImpl implements Co
         super();
     }
 
+    @Override
     public ThreadInfo getThreadInfo() {
         return this.threadinfo;
     }
 
+    @Override
     public void setThreadInfo(ThreadInfo value) {
         this.threadinfo = value;
     }
 
+    @Override
     public RequestInfo getRequestInfo() {
         return this.requestinfo;
     }
 
+    @Override
     public void setRequestInfo(RequestInfo value) {
         this.requestinfo = value;
     }
 
+    @Override
     public Workers getWorkers() {
         return this.workers;
     }
 
+    @Override
     public void setWorkers(Workers value) {
         this.workers = value;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public void setName(String value) {
         this.name = value;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java Sat Nov 24
20:58:40 2012
@@ -31,11 +31,13 @@ public class JvmImpl implements Jvm {
     }
 
     /** {@inheritDoc} */
+    @Override
     public Memory getMemory() {
         return this.memory;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setMemory(Memory mem) {
         this.memory = mem;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java Sat Nov
24 20:58:40 2012
@@ -34,26 +34,32 @@ public class MemoryImpl implements Memor
         super();
     }
 
+    @Override
     public long getMax() {
         return this.max;
     }
 
+    @Override
     public void setMax(long value) {
         this.max = value;
     }
 
+    @Override
     public long getFree() {
         return this.free;
     }
 
+    @Override
     public void setFree(long value) {
         this.free = value;
     }
 
+    @Override
     public long getTotal() {
         return this.total;
     }
 
+    @Override
     public void setTotal(long value) {
         this.total = value;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java Sat
Nov 24 20:58:40 2012
@@ -40,50 +40,62 @@ public class RequestInfoImpl implements 
         super();
     }
 
+    @Override
     public long getBytesReceived() {
         return this.bytesReceived;
     }
 
+    @Override
     public void setBytesReceived(long value) {
         this.bytesReceived = value;
     }
 
+    @Override
     public long getBytesSent() {
         return this.bytesSent;
     }
 
+    @Override
     public void setBytesSent(long value) {
         this.bytesSent = value;
     }
 
+    @Override
     public long getRequestCount() {
         return requestCount;
     }
 
+    @Override
     public void setRequestCount(long value) {
         this.requestCount = value;
     }
 
+    @Override
     public long getErrorCount() {
         return this.errorCount;
     }
 
+    @Override
     public void setErrorCount(long value) {
         this.errorCount = value;
     }
 
+    @Override
     public int getMaxTime() {
         return this.maxTime;
     }
 
+    @Override
     public void setMaxTime(int value) {
         this.maxTime = value;
     }
 
+    @Override
     public int getProcessingTime() {
         return this.processingTime;
     }
 
+    @Override
     public void setProcessingTime(int value) {
         this.processingTime = value;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java Sat Nov
24 20:58:40 2012
@@ -39,28 +39,34 @@ public class StatusImpl implements Statu
     }
 
     /** {@inheritDoc} */
+    @Override
     public Jvm getJvm() {
         return jvm;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setJvm(Jvm vm) {
         this.jvm = vm;
     }
 
     /** {@inheritDoc} */
+    @Override
     public List<Connector> getConnector() {
         return this.connectors;
     }
 
+    @Override
     public void addConnector(Connector conn) {
         this.connectors.add(conn);
     }
 
+    @Override
     public void setConnectorPrefix(String prefix) {
         connectorPrefix = prefix;
     }
 
+    @Override
     public String getConnectorPrefix(){
         return connectorPrefix;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java Sat
Nov 24 20:58:40 2012
@@ -38,42 +38,52 @@ public class ThreadInfoImpl implements T
         super();
     }
 
+    @Override
     public int getMaxSpareThreads() {
         return this.maxSpareThreads;
     }
 
+    @Override
     public void setMaxSpareThreads(int value) {
         this.maxSpareThreads = value;
     }
 
+    @Override
     public int getMinSpareThreads() {
         return this.minSpareThreads;
     }
 
+    @Override
     public void setMinSpareThreads(int value) {
         this.minSpareThreads = value;
     }
 
+    @Override
     public int getMaxThreads() {
         return this.maxThreads;
     }
 
+    @Override
     public void setMaxThreads(int value) {
         this.maxThreads = value;
     }
 
+    @Override
     public int getCurrentThreadsBusy() {
         return this.currentThreadsBusy;
     }
 
+    @Override
     public void setCurrentThreadsBusy(int value) {
         this.currentThreadsBusy = value;
     }
 
+    @Override
     public int getCurrentThreadCount() {
         return this.currentThreadCount;
     }
 
+    @Override
     public void setCurrentThreadCount(int value) {
         this.currentThreadCount = value;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java Sat Nov
24 20:58:40 2012
@@ -47,82 +47,102 @@ public class WorkerImpl implements Worke
         super();
     }
 
+    @Override
     public int getRequestProcessingTime() {
         return this.requestProcessingTime;
     }
 
+    @Override
     public void setRequestProcessingTime(int value) {
         this.requestProcessingTime = value;
     }
 
+    @Override
     public long getRequestBytesSent() {
         return this.requestBytesSent;
     }
 
+    @Override
     public void setRequestBytesSent(long value) {
         this.requestBytesSent = value;
     }
 
+    @Override
     public String getCurrentQueryString() {
         return this.currentQueryString;
     }
 
+    @Override
     public void setCurrentQueryString(String value) {
         this.currentQueryString = value;
     }
 
+    @Override
     public String getRemoteAddr() {
         return this.remoteAddr;
     }
 
+    @Override
     public void setRemoteAddr(String value) {
         this.remoteAddr = value;
     }
 
+    @Override
     public String getCurrentUri() {
         return this.currentUri;
     }
 
+    @Override
     public void setCurrentUri(String value) {
         this.currentUri = value;
     }
 
+    @Override
     public String getStage() {
         return this.stage;
     }
 
+    @Override
     public void setStage(String value) {
         this.stage = value;
     }
 
+    @Override
     public String getVirtualHost() {
         return this.virtualHost;
     }
 
+    @Override
     public void setVirtualHost(String value) {
         this.virtualHost = value;
     }
 
+    @Override
     public String getProtocol() {
         return this.protocol;
     }
 
+    @Override
     public void setProtocol(String value) {
         this.protocol = value;
     }
 
+    @Override
     public long getRequestBytesReceived() {
         return this.requestBytesReceived;
     }
 
+    @Override
     public void setRequestBytesReceived(long value) {
         this.requestBytesReceived = value;
     }
 
+    @Override
     public String getMethod() {
         return this.method;
     }
 
+    @Override
     public void setMethod(String value) {
         this.method = value;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java Sat Nov
24 20:58:40 2012
@@ -34,6 +34,7 @@ public class WorkersImpl implements Work
         worker = new LinkedList<Worker>();
     }
 
+    @Override
     public List<Worker> getWorker() {
         return worker;
     }

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java?rev=1413262&r1=1413261&r2=1413262&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java Sat Nov
24 20:58:40 2012
@@ -70,6 +70,7 @@ public abstract class ParserImpl impleme
      * @param bytes
      * @return Status
      */
+    @Override
     public Status parseBytes(byte[] bytes) {
         try {
             InputSource is = new InputSource();
@@ -91,6 +92,7 @@ public abstract class ParserImpl impleme
      * @param content
      * @return Status
      */
+    @Override
     public Status parseString(String content) {
         try {
             InputSource is = new InputSource();
@@ -112,6 +114,7 @@ public abstract class ParserImpl impleme
      * @param result
      * @return Status
      */
+    @Override
     public Status parseSampleResult(SampleResult result) {
         return parseBytes(result.getResponseData());
     }



Mime
View raw message