You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by ge...@apache.org on 2010/05/10 07:17:21 UTC
svn commit: r942661 - in
/geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util:
BundleClassFinder.java BundleResourceFinder.java
Author: genspring
Date: Mon May 10 05:17:20 2010
New Revision: 942661
URL: http://svn.apache.org/viewvc?rev=942661&view=rev
Log:
Remove the redundant @override annotations on method implementations of an interface.
Modified:
geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleClassFinder.java
geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
Modified: geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleClassFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleClassFinder.java?rev=942661&r1=942660&r2=942661&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleClassFinder.java (original)
+++ geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleClassFinder.java Mon May 10 05:17:20 2010
@@ -335,22 +335,22 @@ public class BundleClassFinder {
public static class DummyDiscoveryFilter implements ClassDiscoveryFilter {
- @Override
+
public boolean directoryDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
return true;
}
- @Override
+
public boolean jarFileDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean packageDiscoveryRequired(String packageName) {
return true;
}
@@ -358,22 +358,22 @@ public class BundleClassFinder {
public static class NonImportedPackageDiscoveryFilter implements ClassDiscoveryFilter {
- @Override
+
public boolean directoryDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean jarFileDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean packageDiscoveryRequired(String packageName) {
return true;
}
- @Override
+
public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
return !discoveryRange.equals(DiscoveryRange.IMPORT_PACKAGES);
}
@@ -387,22 +387,22 @@ public class BundleClassFinder {
this.expectedPckageName = expectedPckageName;
}
- @Override
+
public boolean directoryDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean jarFileDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean packageDiscoveryRequired(String packageName) {
return expectedPckageName.equals(packageName);
}
- @Override
+
public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
return !discoveryRange.equals(DiscoveryRange.IMPORT_PACKAGES);
}
@@ -419,22 +419,22 @@ public class BundleClassFinder {
this.acceptedPackageNames = acceptedPackageNames;
}
- @Override
+
public boolean directoryDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean jarFileDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean packageDiscoveryRequired(String packageName) {
return acceptedPackageNames.contains(packageName) && classDiscoveryFilter.packageDiscoveryRequired(packageName);
}
- @Override
+
public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
return !discoveryRange.equals(DiscoveryRange.IMPORT_PACKAGES);
}
Modified: geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java?rev=942661&r1=942660&r2=942661&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java (original)
+++ geronimo/xbean/trunk/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/BundleResourceFinder.java Mon May 10 05:17:20 2010
@@ -210,17 +210,17 @@ public class BundleResourceFinder {
public static class DummyDiscoveryFilter implements ResourceDiscoveryFilter {
- @Override
+
public boolean directoryDiscoveryRequired(String url) {
return true;
}
- @Override
+
public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
return true;
}
- @Override
+
public boolean zipFileDiscoveryRequired(String url) {
return true;
}