diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-04-03 17:17:43 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-04-03 17:17:43 +0200 |
commit | 1144331b32d3c9065af161227f40fc0cac9338a0 (patch) | |
tree | f29b22f4ccfa1a90c0e6a8b0bb4490358bd71b40 | |
parent | 6b4eade2b153832c139cb1e8372fe09489c348d4 (diff) | |
download | sonarqube-1144331b32d3c9065af161227f40fc0cac9338a0.tar.gz sonarqube-1144331b32d3c9065af161227f40fc0cac9338a0.zip |
Fix compatibility with Java 5 compiler : remove @Override annotations on methods implementing interfaces
9 files changed, 0 insertions, 12 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationsDecorator.java index e17ca8784da..eb4ade51a18 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationsDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationsDecorator.java @@ -57,7 +57,6 @@ public class ViolationsDecorator implements Decorator { CoreMetrics.INFO_VIOLATIONS); } - @Override public void decorate(Resource resource, DecoratorContext context) { if (shouldDecorateResource(resource)) { computeTotalViolations(context); diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/ViolationPair.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/ViolationPair.java index 92200326cb1..39c8de0809d 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/ViolationPair.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/ViolationPair.java @@ -45,7 +45,6 @@ public class ViolationPair { } public static final Comparator<ViolationPair> COMPARATOR = new Comparator<ViolationPair>() { - @Override public int compare(ViolationPair o1, ViolationPair o2) { return o2.weight - o1.weight; } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/HashedSequenceComparator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/HashedSequenceComparator.java index f7a88a4596e..0c312e1d147 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/HashedSequenceComparator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/HashedSequenceComparator.java @@ -30,12 +30,10 @@ public class HashedSequenceComparator<S extends Sequence> implements SequenceCom this.cmp = cmp; } - @Override public boolean equals(HashedSequence<S> a, int ai, HashedSequence<S> b, int bi) { return a.hashes[ai] == b.hashes[bi] && cmp.equals(a.base, ai, b.base, bi); } - @Override public int hash(HashedSequence<S> seq, int i) { return seq.hashes[i]; } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringText.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringText.java index 69937031fae..ad0253739ca 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringText.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringText.java @@ -40,7 +40,6 @@ public class StringText implements Sequence { this.lines = lineMap(content, 0, content.length()); } - @Override public int length() { return lines.size() - 2; } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparator.java index 3c4430add31..bd6ffb50a6a 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparator.java @@ -29,7 +29,6 @@ public abstract class StringTextComparator implements SequenceComparator<StringT */ public static final StringTextComparator IGNORE_WHITESPACE = new StringTextComparator() { - @Override public boolean equals(StringText a, int ai, StringText b, int bi) { ai++; bi++; @@ -73,7 +72,6 @@ public abstract class StringTextComparator implements SequenceComparator<StringT }; - @Override public int hash(StringText seq, int line) { final int begin = seq.lines.get(line + 1); final int end = seq.lines.get(line + 2); diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/decorators/FileComplexityDistributionDecorator.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/decorators/FileComplexityDistributionDecorator.java index 2ac235dcd69..f1b049068a8 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/decorators/FileComplexityDistributionDecorator.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/decorators/FileComplexityDistributionDecorator.java @@ -54,7 +54,6 @@ public class FileComplexityDistributionDecorator implements Decorator { return Scopes.isFile(resource) && context.getMeasure(CoreMetrics.COMPLEXITY) != null; } - @Override public void decorate(Resource resource, DecoratorContext context) { if (shouldExecuteOn(resource, context)) { RangeDistributionBuilder builder = new RangeDistributionBuilder(CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION, LIMITS); diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ApplicationDeployer.java b/sonar-server/src/main/java/org/sonar/server/plugins/ApplicationDeployer.java index e3b9599ed50..e73ddb5e6aa 100644 --- a/sonar-server/src/main/java/org/sonar/server/plugins/ApplicationDeployer.java +++ b/sonar-server/src/main/java/org/sonar/server/plugins/ApplicationDeployer.java @@ -83,7 +83,6 @@ public class ApplicationDeployer { LOG.info("Deploy app: " + pluginKey); File appDir = new File(appsDir, pluginKey); ClassLoaderUtils.copyResources(appClassLoader, pathToRubyInitFile(pluginKey), appDir, new Function<String, String>() { - @Override public String apply(@Nullable String relativePath) { // Relocate the deployed files : // relativePath format is: org/sonar/ror/sqale/app/controllers/foo_controller.rb diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java index 21c9df014bd..9896957f62e 100644 --- a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java +++ b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java @@ -72,7 +72,6 @@ public final class ClassLoaderUtils { */ public static Collection<String> listFiles(ClassLoader classLoader, String rootPath) { return listResources(classLoader, rootPath, new Predicate<String>() { - @Override public boolean apply(@Nullable String path) { return !StringUtils.endsWith(path, "/"); } diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/ClassLoaderUtilsTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ClassLoaderUtilsTest.java index 26358983818..d164c0460a4 100644 --- a/sonar-server/src/test/java/org/sonar/server/plugins/ClassLoaderUtilsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/plugins/ClassLoaderUtilsTest.java @@ -87,7 +87,6 @@ public class ClassLoaderUtilsTest { @Test public void listResources_use_predicate() { Collection<String> strings = ClassLoaderUtils.listResources(classLoader, "org/sonar/sqale", new Predicate<String>() { - @Override public boolean apply(@Nullable String s) { return StringUtils.endsWith(s, "md"); } @@ -119,7 +118,6 @@ public class ClassLoaderUtilsTest { public void copyRubyRailsApp_relocate_files() { File toDir = temp.newFolder("dest"); ClassLoaderUtils.copyResources(classLoader, "org/sonar/sqale", toDir, new Function<String, String>() { - @Override public String apply(@Nullable String path) { return "foo/" + FilenameUtils.getName(path); } |