[jboss-cvs] JBossAS SVN: r76846 - in projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency: spi and 1 other directories.

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

Author: alesj
Date: 2008-08-08 15:47:06 -0400 (Fri, 08 Aug 2008)
New Revision: 76846

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ScopeInfo.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/helpers/UnmodifiableScopeInfo.java
Log:
Move public init method to interface.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java	2008-08-08 19:28:03 UTC (rev 76845)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java	2008-08-08 19:47:06 UTC (rev 76846)
@@ -112,6 +112,7 @@
    {
       if (repository == null)
          return null;
+      
       return repository.getMetaData(getScope());
    }
 
@@ -120,7 +121,7 @@
       this.repository = repository;
       ScopeKey scope = getMutableScope();
       MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(scope);
-      MutableMetaDataLoader mutable = null;
+      MutableMetaDataLoader mutable;
       if (retrieval == null)
       {
          mutable = initMutableMetaDataRetrieval(repository, context, scope);
@@ -181,6 +182,12 @@
       
    }
 
+   /**
+    * Get mutable metadata loader.
+    *
+    * @param retrieval current metadata retrieval
+    * @return found mutable metadata loader instance, null otherwise
+    */
    protected MutableMetaDataLoader getMutableMetaDataLoader(MetaDataRetrieval retrieval)
    {
       if (retrieval == null)
@@ -206,11 +213,6 @@
       return null;
    }
 
-   public MutableMetaDataLoader initMutableMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context, ScopeKey scopeKey)
-   {
-      return new MemoryMetaDataLoader(scopeKey);
-   }
-
    public MetaDataRetrieval initMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context, Scope scope)
    {
       // Nothing
@@ -243,6 +245,11 @@
       return metaDataRetrieval;
    }
    
+   public MutableMetaDataLoader initMutableMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context, ScopeKey scopeKey)
+   {
+      return new MemoryMetaDataLoader(scopeKey);
+   }
+
    public ScopeKey getScope()
    {
       return scopeKey;
@@ -252,6 +259,7 @@
    {
       if (key == null)
          throw new IllegalArgumentException("Null scope key");
+
       this.scopeKey = key;
    }
 
@@ -264,6 +272,7 @@
    {
       if (key == null)
          throw new IllegalArgumentException("Null scope key");
+
       this.mutableScopeKey = key;
    }
 

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ScopeInfo.java	2008-08-08 19:28:03 UTC (rev 76845)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ScopeInfo.java	2008-08-08 19:47:06 UTC (rev 76846)
@@ -22,6 +22,7 @@
 package org.jboss.dependency.spi;
 
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.Scope;
@@ -78,6 +79,16 @@
    MetaDataRetrieval initMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context);
 
    /**
+    * Initialise the main mutable metadata retrieval.
+    *
+    * @param repository the mutable metadata repository
+    * @param context the controller context
+    * @param scopeKey the scope key
+    * @return new mutable metadata loader instance
+    */
+   MutableMetaDataLoader initMutableMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context, ScopeKey scopeKey);
+
+   /**
     * Get the scope
     * 
     * @return the scope

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/helpers/UnmodifiableScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/helpers/UnmodifiableScopeInfo.java	2008-08-08 19:28:03 UTC (rev 76845)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/helpers/UnmodifiableScopeInfo.java	2008-08-08 19:47:06 UTC (rev 76846)
@@ -24,6 +24,7 @@
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.Scope;
@@ -72,6 +73,11 @@
       throw new UnsupportedOperationException("Cannot modify immutable");
    }
 
+   public MutableMetaDataLoader initMutableMetaDataRetrieval(MutableMetaDataRepository repository, ControllerContext context, ScopeKey scopeKey)
+   {
+      throw new UnsupportedOperationException("Cannot modify immutable");
+   }
+
    public MetaData getMetaData()
    {
       return delegate.getMetaData();