[jboss-cvs] JBossAS SVN: r105864 - in projects/jboss-cl/trunk: classloading/src/main/java/org/jboss/classloading/spi/dependency and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-06-09 08:59:31 -0400 (Wed, 09 Jun 2010)
New Revision: 105864

Modified:
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/ClassLoaderPolicy.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
Log:
Don't expose CLInfo.

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/ClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/ClassLoaderPolicy.java	2010-06-09 12:56:40 UTC (rev 105863)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/ClassLoaderPolicy.java	2010-06-09 12:59:31 UTC (rev 105864)
@@ -69,13 +69,31 @@
    /** Maps native library to its provider */
    private volatile List<NativeLibraryProvider> nativeLibraries;
 
-   @Override // TODO -- public?
-   public ClassLoaderInformation getInformation()
+   /**
+    * Add extra delegate loader.
+    *
+    * @param loader the new delegate
+    */
+   public void addExtraDelegate(DelegateLoader loader)
    {
-      return super.getInformation();
+      ClassLoaderInformation info = getInformation();
+      if (info != null)
+         info.addDelegate(loader);
    }
 
    /**
+    * Remove extra delegate loader.
+    *
+    * @param loader the old delegate
+    */
+   public void removeExtraDelegate(DelegateLoader loader)
+   {
+      ClassLoaderInformation info = getInformation();
+      if (info != null)
+         info.removeDelegate(loader);
+   }
+
+   /**
     * Add a native library provider.
     * @param provider The library file provider
     */

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-09 12:56:40 UTC (rev 105863)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-09 12:59:31 UTC (rev 105864)
@@ -32,7 +32,6 @@
 import org.jboss.classloader.spi.ClassLoaderPolicyFactory;
 import org.jboss.classloader.spi.DelegateLoader;
 import org.jboss.classloader.spi.ImportType;
-import org.jboss.classloader.spi.base.ClassLoaderInformation;
 import org.jboss.classloader.spi.filter.ClassFilter;
 import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
 import org.jboss.classloading.plugins.metadata.PackageRequirement;
@@ -90,9 +89,7 @@
             item.setLoader(loader);
 
             ClassLoaderPolicy policy = getPolicy();
-            ClassLoaderInformation info = policy.getInformation(); // public hack
-            if (info != null)
-               info.addDelegate(loader); // new method
+            policy.addExtraDelegate(loader);
 
             return loader;
          }
@@ -146,9 +143,7 @@
          if (loader != null)
          {
             ClassLoaderPolicy policy = getPolicy();
-            ClassLoaderInformation info = policy.getInformation();
-            if (info != null)
-               info.removeDelegate(loader);
+            policy.removeExtraDelegate(loader);
          }
 
          Object iDependOn = getIDependOn();