Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1088078 -
 /commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java
Date: Sat, 02 Apr 2011 18:42:19 -0000
To: commits@commons.apache.org
From: simonetripodi@apache.org
Message-Id: <20110402184219.9B3102388A1C@eris.apache.org>

Author: simonetripodi
Date: Sat Apr  2 18:42:19 2011
New Revision: 1088078

URL: http://svn.apache.org/viewvc?rev=1088078&view=rev
Log:
added generics

Modified:
    commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java

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=1088078&r1=1088077&r2=1088078&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 Sat Apr  2 18:42:19 2011
@@ -33,15 +33,15 @@ import org.apache.commons.logging.Log;
  * 
  * @author Richard A. Sitze
  */
-public class ResourceClass extends Resource
+public class ResourceClass<T> extends Resource
 {
     private static Log log = DiscoveryLogFactory.newLog(ResourceClass.class);
     public static void setLog(Log _log) {
         log = _log;
     }
-    protected Class       resourceClass;
+    protected Class<? extends T>       resourceClass;
 
-    public ResourceClass(Class resourceClass, URL resource) {
+    public <S extends T> ResourceClass(Class<S> resourceClass, URL resource) {
         super(resourceClass.getName(), resource, resourceClass.getClassLoader());
         this.resourceClass = resourceClass;
     }
@@ -66,23 +66,28 @@ public class ResourceClass extends Resou
      *
      * @return value of resourceClass.
      */
-    public Class loadClass() {
+    public <S extends T> Class<S> loadClass() {
         if (resourceClass == null  &&  getClassLoader() != null) {
             if (log.isDebugEnabled())
                 log.debug("loadClass: Loading class '" + getName() + "' with " + getClassLoader());
 
-            resourceClass = (Class)AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
+            resourceClass = AccessController.doPrivileged(
+                new PrivilegedAction<Class<? extends T>>() {
+                    public Class<? extends T> run() {
                         try {
-                            return getClassLoader().loadClass(getName());
+                            @SuppressWarnings("unchecked") // this can raise a ClassCastException at runtime
+                            Class<S> returned = (Class<S>)  (Class<S>) getClassLoader().loadClass(getName());
+                            return returned;
                         } catch (ClassNotFoundException e) {
                             return null;
                         }
                     }
                 });
         }
-        return resourceClass;
+
+        @SuppressWarnings("unchecked") // this is assumed by default, see the ctor
+        Class<S> returned = (Class<S>) resourceClass;
+        return returned;
     }
     
     public String toString() {