aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-04-03 17:17:43 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2012-04-03 17:17:43 +0200
commit1144331b32d3c9065af161227f40fc0cac9338a0 (patch)
treef29b22f4ccfa1a90c0e6a8b0bb4490358bd71b40 /sonar-server
parent6b4eade2b153832c139cb1e8372fe09489c348d4 (diff)
downloadsonarqube-1144331b32d3c9065af161227f40fc0cac9338a0.tar.gz
sonarqube-1144331b32d3c9065af161227f40fc0cac9338a0.zip
Fix compatibility with Java 5 compiler : remove @Override annotations on methods implementing interfaces
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/plugins/ApplicationDeployer.java1
-rw-r--r--sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java1
-rw-r--r--sonar-server/src/test/java/org/sonar/server/plugins/ClassLoaderUtilsTest.java2
3 files changed, 0 insertions, 4 deletions
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);
}