Author: sebb
Date: Tue Nov 27 00:10:41 2012
New Revision: 1413953
URL: http://svn.apache.org/viewvc?rev=1413953&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java
Modified: jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java Tue Nov 27
00:10:41 2012
@@ -49,6 +49,7 @@ public class TestLoad extends JMeterTest
}
private static final FilenameFilter jmxFilter = new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.endsWith(".jmx");
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java Tue
Nov 27 00:10:41 2012
@@ -39,6 +39,7 @@ public class TestSampler extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public SampleResult sample(Entry e) {
if (wait > 0) {
try {
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
(original)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
Tue Nov 27 00:10:41 2012
@@ -279,6 +279,7 @@ public class TestHTMLParser extends JMet
// Convert both to Sets
expected = new TreeSet<String>(getFile(resultFile)).iterator();
TreeSet<URL> temp = new TreeSet<URL>(new Comparator<Object>() {
+ @Override
public int compare(Object o1, Object o2) {
return (o1.toString().compareTo(o2.toString()));
}
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
(original)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
Tue Nov 27 00:10:41 2012
@@ -33,6 +33,7 @@ class HTTPSampler3 extends HTTPSamplerBa
hc = new HTTPHC4Impl(this);
}
+ @Override
public boolean interrupt() {
return hc.interrupt();
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Tue Nov
27 00:10:41 2012
@@ -231,7 +231,8 @@ public class PackageTest extends TestCas
public static final String[] getResources(File srcFiledir) {
Set<String> set = new TreeSet<String>();
findFile(srcFiledir, set, new FilenameFilter() {
- public boolean accept(File dir, String name) {
+ @Override
+ public boolean accept(File dir, String name) {
return new File(dir, name).isDirectory()
|| (
name.equals("messages.properties") ||
Modified: jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java Tue Nov
27 00:10:41 2012
@@ -27,6 +27,7 @@ public class NullSampler extends Abstrac
private static final long serialVersionUID = 240L;
+ @Override
public SampleResult sample(Entry e) {
return new SampleResult();
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java Tue
Nov 27 00:10:41 2012
@@ -50,6 +50,7 @@ public class TestTestCompiler extends ju
class TestSampler extends AbstractSampler {
private static final long serialVersionUID = 240L;
+ @Override
public SampleResult sample(org.apache.jmeter.samplers.Entry e) {
return null;
}
Modified:
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Tue Nov 27 00:10:41 2012
@@ -72,6 +72,7 @@ public class GenerateTreeGui extends Abs
init();
}
+ @Override
public String getLabelResource() {
new Throwable().printStackTrace();
return "test_plan"; // $NON-NLS-1$
@@ -94,6 +95,7 @@ public class GenerateTreeGui extends Abs
return Arrays.asList(new String[] { MenuFactory.NON_TEST_ELEMENTS });
}
+ @Override
public void actionPerformed(ActionEvent action) {
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeModel treeModel = guiPackage.getTreeModel();
@@ -128,12 +130,14 @@ public class GenerateTreeGui extends Abs
}
}
+ @Override
public TestElement createTestElement() {
TestElement el = new ConfigTestElement();
modifyTestElement(el);
return el;
}
+ @Override
public void modifyTestElement(TestElement element) {
configureTestElement(element);
}
@@ -205,6 +209,7 @@ public class GenerateTreeGui extends Abs
volatile JMeterTreeNode newNode;
+ @Override
public void run() {
try {
newNode = model.addComponent(testElement, node);
Modified: jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java?rev=1413953&r1=1413952&r2=1413953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java (original)
+++ jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java Tue Nov
27 00:10:41 2012
@@ -47,6 +47,7 @@ public class TestFunctor extends JMeterT
public Test1(String s){
name=s;
}
+ @Override
public String getName(){
return name;
}
@@ -74,9 +75,11 @@ public class TestFunctor extends JMeterT
public Test2(String s){
name=s;
}
+ @Override
public String getName(){
return name;
}
+ @Override
public String getString(String s){
return s;
}
