You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/04/03 19:45:12 UTC
svn commit: r1088348 - in
/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery: ./
jdk/ resource/ resource/classes/ resource/names/
Author: simonetripodi
Date: Sun Apr 3 17:45:12 2011
New Revision: 1088348
URL: http://svn.apache.org/viewvc?rev=1088348&view=rev
Log:
added missing @Override annotation
Modified:
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/Resource.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK11Hooks.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/PsuedoSystemClassLoader.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/Resource.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/Resource.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/Resource.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/Resource.java Sun Apr 3 17:45:12 2011
@@ -98,6 +98,7 @@ public class Resource
// this.loader = loader;
// }
+ @Override
public String toString() {
return "Resource[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java Sun Apr 3 17:45:12 2011
@@ -90,6 +90,7 @@ public class ResourceClass<T> extends Re
return returned;
}
+ @Override
public String toString() {
return "ResourceClass[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java Sun Apr 3 17:45:12 2011
@@ -26,10 +26,12 @@ public abstract class ResourceClassItera
*/
public abstract <S extends T> ResourceClass<S> nextResourceClass();
+ @Override
public Resource nextResource() {
return nextResourceClass();
}
+ @Override
public String nextResourceName() {
return nextResourceClass().getName();
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK11Hooks.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK11Hooks.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK11Hooks.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK11Hooks.java Sun Apr 3 17:45:12 2011
@@ -34,6 +34,7 @@ public class JDK11Hooks extends JDKHooks
* @param propName name of the property
* @return value of the property
*/
+ @Override
public String getSystemProperty(final String propName) {
return System.getProperty(propName);
}
@@ -45,6 +46,7 @@ public class JDK11Hooks extends JDKHooks
* @return The thread context class loader, if available.
* Otherwise return null.
*/
+ @Override
public ClassLoader getThreadContextClassLoader() {
return null;
}
@@ -56,6 +58,7 @@ public class JDK11Hooks extends JDKHooks
* @return The system class loader, if available.
* Otherwise return null.
*/
+ @Override
public ClassLoader getSystemClassLoader() {
return systemClassLoader;
}
@@ -67,6 +70,7 @@ public class JDK11Hooks extends JDKHooks
* using introspection and doing the lookup ourself, using the list
* of URLs, via getURLs().
*/
+ @Override
public Enumeration<URL> getResources(ClassLoader loader,
String resourceName)
throws IOException
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java Sun Apr 3 17:45:12 2011
@@ -53,6 +53,7 @@ public class JDK12Hooks extends JDKHooks
* @param propName name of the property
* @return value of the property
*/
+ @Override
public String getSystemProperty(final String propName) {
return
java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<String>() {
@@ -73,6 +74,7 @@ public class JDK12Hooks extends JDKHooks
* @return The thread context class loader, if available.
* Otherwise return null.
*/
+ @Override
public ClassLoader getThreadContextClassLoader() {
ClassLoader classLoader;
@@ -104,6 +106,7 @@ public class JDK12Hooks extends JDKHooks
* @return The system class loader, if available.
* Otherwise return null.
*/
+ @Override
public ClassLoader getSystemClassLoader() {
return systemClassLoader;
}
@@ -111,6 +114,7 @@ public class JDK12Hooks extends JDKHooks
/**
* Implement ClassLoader.getResources for JDK 1.2
*/
+ @Override
public Enumeration<URL> getResources(ClassLoader loader,
String resourceName)
throws IOException
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/PsuedoSystemClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/PsuedoSystemClassLoader.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/PsuedoSystemClassLoader.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/PsuedoSystemClassLoader.java Sun Apr 3 17:45:12 2011
@@ -26,16 +26,19 @@ import java.net.URL;
* in 1.1.x, but this should be a good work around...
*/
class PsuedoSystemClassLoader extends ClassLoader {
+ @Override
protected Class<?> loadClass(String className, boolean resolve)
throws ClassNotFoundException
{
return findSystemClass(className);
}
+ @Override
public URL getResource(String resName) {
return getSystemResource(resName);
}
+ @Override
public InputStream getResourceAsStream(String resName) {
return getSystemResourceAsStream(resName);
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java Sun Apr 3 17:45:12 2011
@@ -60,6 +60,7 @@ public class DiscoverResources
/**
* @return ResourceIterator
*/
+ @Override
public ResourceIterator findResources(final String resourceName) {
if (log.isDebugEnabled())
log.debug("find: resourceName='" + resourceName + "'");
@@ -77,6 +78,7 @@ public class DiscoverResources
return resource != null;
}
+ @Override
public Resource nextResource() {
Resource element = resource;
resource = null;
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/ResourceDiscoverImpl.java Sun Apr 3 17:45:12 2011
@@ -76,6 +76,7 @@ public abstract class ResourceDiscoverIm
*
* @return ResourceNameIterator
*/
+ @Override
public ResourceNameIterator findResourceNames(String resourceName) {
return findResources(resourceName);
}
@@ -85,6 +86,7 @@ public abstract class ResourceDiscoverIm
*
* @return ResourceNameIterator
*/
+ @Override
public ResourceNameIterator findResourceNames(ResourceNameIterator resourceNames) {
return findResources(resourceNames);
}
@@ -113,6 +115,7 @@ public abstract class ResourceDiscoverIm
return resource != null;
}
+ @Override
public Resource nextResource() {
Resource rsrc = resource;
resource = null;
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java Sun Apr 3 17:45:12 2011
@@ -57,6 +57,7 @@ public class DiscoverClasses<T>
super(classLoaders);
}
+ @Override
public ResourceClassIterator<T> findResourceClasses(final String className) {
final String resourceName = className.replace('.','/') + ".class";
@@ -75,6 +76,7 @@ public class DiscoverClasses<T>
return resource != null;
}
+ @Override
public ResourceClass<T> nextResourceClass() {
ResourceClass<T> element = resource;
resource = null;
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/ResourceClassDiscoverImpl.java Sun Apr 3 17:45:12 2011
@@ -52,6 +52,7 @@ public abstract class ResourceClassDisco
*
* @return ResourceNameIterator
*/
+ @Override
public ResourceNameIterator findResourceNames(String resourceName) {
return findResourceClasses(resourceName);
}
@@ -61,6 +62,7 @@ public abstract class ResourceClassDisco
*
* @return ResourceNameIterator
*/
+ @Override
public ResourceNameIterator findResourceNames(ResourceNameIterator resourceNames) {
return findResourceClasses(resourceNames);
}
@@ -70,6 +72,7 @@ public abstract class ResourceClassDisco
*
* @return ResourceIterator
*/
+ @Override
public ResourceIterator findResources(String resourceName) {
return findResourceClasses(resourceName);
}
@@ -79,6 +82,7 @@ public abstract class ResourceClassDisco
*
* @return ResourceIterator
*/
+ @Override
public ResourceIterator findResources(ResourceNameIterator resourceNames) {
return findResourceClasses(resourceNames);
}
@@ -108,6 +112,7 @@ public abstract class ResourceClassDisco
return resource != null;
}
+ @Override
public ResourceClass<T> nextResourceClass() {
ResourceClass<T> rsrc = resource;
resource = null;
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java Sun Apr 3 17:45:12 2011
@@ -64,6 +64,7 @@ public class DiscoverMappedNames
/**
* @return Enumeration of ResourceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
if (log.isDebugEnabled()) {
log.debug("find: resourceName='" + resourceName + "', mapping to constants");
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java Sun Apr 3 17:45:12 2011
@@ -63,6 +63,7 @@ public class DiscoverNamesInAlternateMan
/**
* @return Enumeration of ResourceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
final String mappedName = mapping.get(resourceName);
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java Sun Apr 3 17:45:12 2011
@@ -79,6 +79,7 @@ public class DiscoverNamesInDictionary
/**
* @return Enumeration of ResourceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
if (log.isDebugEnabled())
log.debug("find: resourceName='" + resourceName + "'");
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java Sun Apr 3 17:45:12 2011
@@ -136,6 +136,7 @@ public class DiscoverNamesInFile
/**
* @return Enumeration of ServiceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String serviceName) {
String fileName;
if (_prefix != null && _prefix.length() > 0) {
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java Sun Apr 3 17:45:12 2011
@@ -59,6 +59,7 @@ public class DiscoverNamesInManagedPrope
/**
* @return Enumeration of ResourceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
String name;
if (_prefix != null && _prefix.length() > 0) {
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java Sun Apr 3 17:45:12 2011
@@ -44,6 +44,7 @@ public class DiscoverNamesInSystemProper
/**
* @return Enumeration of ResourceInfo
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
if (log.isDebugEnabled())
log.debug("find: resourceName='" + resourceName + "'");
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java?rev=1088348&r1=1088347&r2=1088348&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java Sun Apr 3 17:45:12 2011
@@ -73,6 +73,7 @@ public class NameDiscoverers
*
* @return ResourceIterator
*/
+ @Override
public ResourceNameIterator findResourceNames(final String resourceName) {
if (log.isDebugEnabled())
log.debug("find: resourceName='" + resourceName + "'");