[jboss-cvs] JBossAS SVN: r108103 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda.

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

Author: flavia.rainone at jboss.com
Date: 2010-09-10 10:40:05 -0400 (Fri, 10 Sep 2010)
New Revision: 108103

Modified:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/ClasspathFactory.java
Log:
[JBAS-8250] Rename methods of ClasspathFactory to more appropriate names

Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/ClasspathFactory.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/ClasspathFactory.java	2010-09-10 10:36:35 UTC (rev 108102)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/ClasspathFactory.java	2010-09-10 14:40:05 UTC (rev 108103)
@@ -84,11 +84,10 @@
       {
          domain = system.getDomain(module.getDeterminedDomainName());
       }
-      return getClasspath(classLoader, domain);
+      return getClasspath(domain);
    }
-   
-   // FIXME: remove classLoader parameter!
-   private Classpath getClasspath(ClassLoader cl, Loader domain)
+
+   private Classpath getClasspath(Loader domain)
    {
       if (domain == null || domain == DEFAULT_DOMAIN)
       {
@@ -96,7 +95,7 @@
       }
       synchronized(domain)
       {
-         Classpath classpath = getClasspath(domain);
+         Classpath classpath = getCachedClasspath(domain);
          if (classpath == null)
          {
             if (domain instanceof ClassLoaderToLoaderAdapter)
@@ -118,7 +117,7 @@
                if (domain instanceof ClassLoaderDomain)
                {
                   ClassLoaderDomain clDomain = (ClassLoaderDomain) domain;
-                  Classpath parentClasspath = getClasspath(null, clDomain.getParent());
+                  Classpath parentClasspath = getClasspath(clDomain.getParent());
                   classpath = new NoDuplicatesClasspath(clDomain.getName(), parentClasspath);
                }
                else
@@ -126,14 +125,13 @@
                   throw new RuntimeException("Domain is of unexpected type: " + domain + " - " + domain.getClass());
                }
             }
-            addClasspath(domain, classpath);
+            addClasspathToCache(domain, classpath);
          }
          return classpath;
       }
    }
 
-   // FIXME: getCachedClassPath
-   private Classpath getClasspath(Loader domain)
+   private Classpath getCachedClasspath(Loader domain)
    {
       WeakReference<Classpath> ref = domainToClasspath.get(domain);
       if (ref == null)
@@ -142,9 +140,8 @@
       }
       return ref.get();
    }
-   
-   // FIXME addClasspathToCache
-   private void addClasspath(Loader domain, Classpath domainClasspath)
+
+   private void addClasspathToCache(Loader domain, Classpath domainClasspath)
    {
       domainToClasspath.put(domain, new WeakReference<Classpath>(domainClasspath));
    }