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/05 11:51:20 UTC
svn commit: r1088947 -
/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/
Author: simonetripodi
Date: Tue Apr 5 09:51:19 2011
New Revision: 1088947
URL: http://svn.apache.org/viewvc?rev=1088947&view=rev
Log:
minor code format
Modified:
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/DiscoveryException.java
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/ResourceClassDiscover.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassIterator.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceDiscover.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceIterator.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameDiscover.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameIterator.java
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/DiscoveryException.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/DiscoveryException.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/DiscoveryException.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/DiscoveryException.java Tue Apr 5 09:51:19 2011
@@ -16,7 +16,6 @@
*/
package org.apache.commons.discovery;
-
/**
* An exception that is thrown only if a suitable service
* instance cannot be created by {@code ServiceFactory}.
@@ -25,7 +24,6 @@ package org.apache.commons.discovery;
*/
public class DiscoveryException extends RuntimeException {
-
/**
*
*/
@@ -66,4 +64,5 @@ public class DiscoveryException extends
public DiscoveryException(String message, Throwable cause) {
super(message, cause);
}
+
}
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=1088947&r1=1088946&r2=1088947&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 Tue Apr 5 09:51:19 2011
@@ -22,7 +22,6 @@ import java.net.URL;
import java.util.LinkedList;
import java.util.List;
-
/**
* 'Resource' located by discovery.
* Naming of methods becomes a real pain ('getClass()')
@@ -30,10 +29,12 @@ import java.util.List;
*
* I think it works well as it will give users a point-of-reference.
*/
-public class Resource
-{
+public class Resource {
+
protected final String name;
+
protected final URL resource;
+
protected final ClassLoader loader;
/**
@@ -109,4 +110,5 @@ public class Resource
return resources;
}
+
}
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=1088947&r1=1088946&r2=1088947&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 Tue Apr 5 09:51:19 2011
@@ -23,7 +23,6 @@ import java.security.PrivilegedAction;
import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
-
/**
* 'Resource' located by discovery.
* Naming of methods becomes a real pain ('getClass()')
@@ -33,8 +32,8 @@ import org.apache.commons.logging.Log;
*
* @param <T> The SPI type
*/
-public class ResourceClass<T> extends Resource
-{
+public class ResourceClass<T> extends Resource {
+
private static Log log = DiscoveryLogFactory.newLog(ResourceClass.class);
/**
@@ -45,6 +44,7 @@ public class ResourceClass<T> extends Re
public static void setLog(Log _log) {
log = _log;
}
+
protected Class<? extends T> resourceClass;
/**
@@ -119,4 +119,5 @@ public class ResourceClass<T> extends Re
public String toString() {
return "ResourceClass[" + getName() + ", " + getResource() + ", " + getClassLoader() + "]";
}
+
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassDiscover.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassDiscover.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassDiscover.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClassDiscover.java Tue Apr 5 09:51:19 2011
@@ -16,14 +16,13 @@
*/
package org.apache.commons.discovery;
-
/**
* SPI Discovery.
*
* @param <T> The SPI type
*/
-public interface ResourceClassDiscover<T> extends ResourceDiscover
-{
+public interface ResourceClassDiscover<T> extends ResourceDiscover {
+
/**
* Locate class resources that are bound to {@code className}.
*
@@ -39,4 +38,5 @@ public interface ResourceClassDiscover<T
* @return The iterator over the located classes
*/
ResourceClassIterator<T> findResourceClasses(ResourceNameIterator classNames);
+
}
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=1088947&r1=1088946&r2=1088947&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 Tue Apr 5 09:51:19 2011
@@ -16,14 +16,13 @@
*/
package org.apache.commons.discovery;
-
/**
* Iterator over discovered SPI type.
*
* @param <T> The SPI type
*/
-public abstract class ResourceClassIterator<T> extends ResourceIterator
-{
+public abstract class ResourceClassIterator<T> extends ResourceIterator {
+
/**
* Returns the next SPI Class in the iteration.
*
@@ -47,4 +46,5 @@ public abstract class ResourceClassItera
public String nextResourceName() {
return nextResourceClass().getName();
}
+
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceDiscover.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceDiscover.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceDiscover.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceDiscover.java Tue Apr 5 09:51:19 2011
@@ -16,14 +16,13 @@
*/
package org.apache.commons.discovery;
-
/**
* Interface representing a mapping
* from a set of source resource names
* to a resultant set of resource.
*/
-public interface ResourceDiscover extends ResourceNameDiscover
-{
+public interface ResourceDiscover extends ResourceNameDiscover {
+
/**
* Locate resources that are bound to {@code resourceName}.
*
@@ -39,4 +38,5 @@ public interface ResourceDiscover extend
* @return The bound resources iterator
*/
ResourceIterator findResources(ResourceNameIterator resourceNames);
+
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceIterator.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceIterator.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceIterator.java Tue Apr 5 09:51:19 2011
@@ -16,12 +16,11 @@
*/
package org.apache.commons.discovery;
-
/**
* Iterator over discovered {@link Resource}.
*/
-public abstract class ResourceIterator implements ResourceNameIterator
-{
+public abstract class ResourceIterator implements ResourceNameIterator {
+
/**
* Returns the next {@link Resource} in the iteration.
*
@@ -37,4 +36,5 @@ public abstract class ResourceIterator i
public String nextResourceName() {
return nextResource().getName();
}
+
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameDiscover.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameDiscover.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameDiscover.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameDiscover.java Tue Apr 5 09:51:19 2011
@@ -16,14 +16,13 @@
*/
package org.apache.commons.discovery;
-
/**
* Interface representing a mapping
* from a set of source resource names
* to a resultant set of resource names.
*/
-public interface ResourceNameDiscover
-{
+public interface ResourceNameDiscover {
+
/**
* Locate names of resources that are bound to {@code resourceName}.
*
@@ -39,4 +38,5 @@ public interface ResourceNameDiscover
* @return The bound resources name iterator
*/
ResourceNameIterator findResourceNames(ResourceNameIterator resourceNames);
+
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameIterator.java?rev=1088947&r1=1088946&r2=1088947&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameIterator.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceNameIterator.java Tue Apr 5 09:51:19 2011
@@ -16,7 +16,6 @@
*/
package org.apache.commons.discovery;
-
/**
* Iterate over resource names.
* The semantics are somewhat unusual, for better or worse.
@@ -27,8 +26,8 @@ package org.apache.commons.discovery;
*
* TODO: FIX iterator logic/semantics, possibly add 'currentResourceName()'.
*/
-public interface ResourceNameIterator
-{
+public interface ResourceNameIterator {
+
/**
* Returns true if the iteration has more elements.
*