Return-Path: 
 <commits-return-17161-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 69596 invoked from network); 2 Apr 2011 18:44:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 2 Apr 2011 18:44:51 -0000
Received: (qmail 34968 invoked by uid 500); 2 Apr 2011 18:44:51 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 34904 invoked by uid 500); 2 Apr 2011 18:44:51 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 34897 invoked by uid 99); 2 Apr 2011 18:44:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 18:44:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 18:44:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 081252388A66; Sat,  2 Apr 2011 18:44:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1088080 - in
 /commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes:
 DiscoverClasses.java ResourceClassDiscoverImpl.java
Date: Sat, 02 Apr 2011 18:44:26 -0000
To: commits@commons.apache.org
From: simonetripodi@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110402184427.081252388A66@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: simonetripodi
Date: Sat Apr  2 18:44:26 2011
New Revision: 1088080

URL: http://svn.apache.org/viewvc?rev=1088080&view=rev
Log:
switched to generics

Modified:
    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

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=1088080&r1=1088079&r2=1088080&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 Sat Apr  2 18:44:26 2011
@@ -17,7 +17,8 @@
 package org.apache.commons.discovery.resource.classes;
 
 import java.net.URL;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.discovery.ResourceClass;
 import org.apache.commons.discovery.ResourceClassDiscover;
@@ -35,9 +36,9 @@ import org.apache.commons.logging.Log;
  * @author Costin Manolache
  * @author James Strachan
  */
-public class DiscoverClasses
-    extends ResourceClassDiscoverImpl
-    implements ResourceClassDiscover
+public class DiscoverClasses<T>
+    extends ResourceClassDiscoverImpl<T>
+    implements ResourceClassDiscover<T>
 {
     private static Log log = DiscoveryLogFactory.newLog(DiscoverClasses.class);
     public static void setLog(Log _log) {
@@ -56,16 +57,16 @@ public class DiscoverClasses
         super(classLoaders);
     }
     
-    public ResourceClassIterator findResourceClasses(final String className) {
+    public ResourceClassIterator<T> findResourceClasses(final String className) {
         final String resourceName = className.replace('.','/') + ".class";
         
         if (log.isDebugEnabled())
             log.debug("find: className='" + className + "'");
 
-        return new ResourceClassIterator() {
-            private Vector history = new Vector();
+        return new ResourceClassIterator<T>() {
+            private List<URL> history = new ArrayList<URL>();
             private int idx = 0;
-            private ResourceClass resource = null;
+            private ResourceClass<T> resource = null;
             
             public boolean hasNext() {
                 if (resource == null) {
@@ -74,24 +75,24 @@ public class DiscoverClasses
                 return resource != null;
             }
             
-            public ResourceClass nextResourceClass() {
-                ResourceClass element = resource;
+            public ResourceClass<T> nextResourceClass() {
+                ResourceClass<T> element = resource;
                 resource = null;
                 return element;
             }
             
-            private ResourceClass getNextClass() {
+            private ResourceClass<T> getNextClass() {
                 while (idx < getClassLoaders().size()) {
                     ClassLoader loader = getClassLoaders().get(idx++);
                     URL url = loader.getResource(resourceName);
                     if (url != null) {
                         if (!history.contains(url)) {
-                            history.addElement(url);
+                            history.add(url);
     
                             if (log.isDebugEnabled())
                                 log.debug("getNextClass: next URL='" + url + "'");
     
-                            return new ResourceClass(className, url, loader);
+                            return new ResourceClass<T>(className, url, loader);
                         }
                         if (log.isDebugEnabled())
                             log.debug("getNextClass: duplicate URL='" + url + "'");

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=1088080&r1=1088079&r2=1088080&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 Sat Apr  2 18:44:26 2011
@@ -28,9 +28,9 @@ import org.apache.commons.discovery.reso
 /**
  * @author Richard A. Sitze
  */
-public abstract class ResourceClassDiscoverImpl
+public abstract class ResourceClassDiscoverImpl<T>
     extends ResourceDiscoverImpl
-    implements ResourceClassDiscover
+    implements ResourceClassDiscover<T>
 {
     /**
      * Construct a new resource discoverer
@@ -89,17 +89,17 @@ public abstract class ResourceClassDisco
      * 
      * @return ResourceClassIterator
      */
-    public abstract ResourceClassIterator findResourceClasses(String className);
+    public abstract ResourceClassIterator<T> findResourceClasses(String className);
 
     /**
      * Locate class resources that are bound to <code>resourceNames</code>.
      * 
      * @return ResourceIterator
      */
-    public ResourceClassIterator findResourceClasses(final ResourceNameIterator inputNames) {
-        return new ResourceClassIterator() {
-            private ResourceClassIterator classes = null;
-            private ResourceClass resource = null;
+    public ResourceClassIterator<T> findResourceClasses(final ResourceNameIterator inputNames) {
+        return new ResourceClassIterator<T>() {
+            private ResourceClassIterator<T> classes = null;
+            private ResourceClass<T> resource = null;
             
             public boolean hasNext() {
                 if (resource == null) {
@@ -108,13 +108,13 @@ public abstract class ResourceClassDisco
                 return resource != null;
             }
             
-            public ResourceClass nextResourceClass() {
-                ResourceClass rsrc = resource;
+            public ResourceClass<T> nextResourceClass() {
+                ResourceClass<T> rsrc = resource;
                 resource = null;
                 return rsrc;
             }
             
-            private ResourceClass getNextResource() {
+            private ResourceClass<T> getNextResource() {
                 while (inputNames.hasNext() &&
                        (classes == null  ||  !classes.hasNext())) {
                     classes =