Bug 485099: rename ClassRealmManager to RealmManager

4 files changed, 13 insertions, 13 deletions

diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
index 9c6b351..9f2f966 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
@@ -52,7 +52,6 @@ import org.eclipse.sisu.inject.DeferredProvider;
 import org.eclipse.sisu.inject.InjectorBindings;
 import org.eclipse.sisu.inject.MutableBeanLocator;
 import org.eclipse.sisu.inject.RankingFunction;
-import org.eclipse.sisu.plexus.ClassRealmManager;
 import org.eclipse.sisu.plexus.ComponentDescriptorBeanModule;
 import org.eclipse.sisu.plexus.DefaultPlexusBeanLocator;
 import org.eclipse.sisu.plexus.Hints;
@@ -66,6 +65,7 @@ import org.eclipse.sisu.plexus.PlexusDateTypeConverter;
 import org.eclipse.sisu.plexus.PlexusLifecycleManager;
 import org.eclipse.sisu.plexus.PlexusXmlBeanConverter;
 import org.eclipse.sisu.plexus.PlexusXmlBeanModule;
+import org.eclipse.sisu.plexus.RealmManager;
 import org.eclipse.sisu.space.BeanScanning;
 import org.eclipse.sisu.space.ClassSpace;
 import org.eclipse.sisu.space.LoadedClass;
@@ -131,7 +131,7 @@ public final class DefaultPlexusContainer
 
     final ClassRealm containerRealm;
 
-    final ClassRealmManager classRealmManager;
+    final RealmManager realmManager;
 
     final PlexusBeanLocator plexusBeanLocator;
 
@@ -180,8 +180,8 @@ public final class DefaultPlexusContainer
         variables = new ContextMapAdapter( context );
 
         containerRealm = lookupContainerRealm( configuration );
-        classRealmManager = new ClassRealmManager( this, qualifiedBeanLocator );
-        containerRealm.getWorld().addListener( classRealmManager );
+        realmManager = new RealmManager( this, qualifiedBeanLocator );
+        containerRealm.getWorld().addListener( realmManager );
 
         componentVisibility = configuration.getComponentVisibility();
         isAutoWiringEnabled = configuration.getAutoWiring();
@@ -448,7 +448,7 @@ public final class DefaultPlexusContainer
                 {
                     beanModules.add( new ComponentDescriptorBeanModule( space, descriptors ) );
                 }
-                if ( !classRealmManager.isManaged( realm ) )
+                if ( !realmManager.isManaged( realm ) )
                 {
                     beanModules.add( new PlexusXmlBeanModule( space, variables ) );
                     final BeanScanning local = BeanScanning.GLOBAL_INDEX == scanning ? BeanScanning.INDEX : scanning;
@@ -457,7 +457,7 @@ public final class DefaultPlexusContainer
             }
             if ( !beanModules.isEmpty() )
             {
-                classRealmManager.manage( realm, addPlexusInjector( beanModules, customModules ) );
+                realmManager.manage( realm, addPlexusInjector( beanModules, customModules ) );
             }
         }
         catch ( final RuntimeException e )
@@ -593,7 +593,7 @@ public final class DefaultPlexusContainer
 
         lookupRealm.remove();
 
-        containerRealm.getWorld().removeListener( classRealmManager );
+        containerRealm.getWorld().removeListener( realmManager );
     }
 
     // ----------------------------------------------------------------------
@@ -759,14 +759,14 @@ public final class DefaultPlexusContainer
         {
             visibleRealms.add( currentLookupRealm );
         }
-        final ClassRealm threadContextRealm = ClassRealmManager.contextRealm();
+        final ClassRealm threadContextRealm = RealmManager.contextRealm();
         if ( null != threadContextRealm )
         {
             visibleRealms.add( threadContextRealm );
         }
         if ( PlexusConstants.REALM_VISIBILITY.equalsIgnoreCase( componentVisibility ) )
         {
-            final Collection<String> realmNames = ClassRealmManager.visibleRealmNames( threadContextRealm );
+            final Collection<String> realmNames = RealmManager.visibleRealmNames( threadContextRealm );
             if ( null != realmNames && realmNames.size() > 0 )
             {
                 for ( int i = realms.length - 1; i >= 0; i-- )
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
index 9a591bd..8c68da8 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
@@ -181,7 +181,7 @@ public final class ComponentDescriptorBeanModule
                 ClassRealm contextRealm = container.getLookupRealm();
                 if ( null == contextRealm )
                 {
-                    contextRealm = ClassRealmManager.contextRealm();
+                    contextRealm = RealmManager.contextRealm();
                 }
                 if ( null == contextRealm )
                 {
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
index 5a58914..9fd76d9 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
@@ -46,7 +46,7 @@ final class RealmFilteredBeans<T>
 
     public Iterator<BeanEntry<Named, T>> iterator()
     {
-        final Set<String> realmNames = ClassRealmManager.visibleRealmNames( ClassRealmManager.contextRealm() );
+        final Set<String> realmNames = RealmManager.visibleRealmNames( RealmManager.contextRealm() );
         if ( null != realmNames && realmNames.size() > 0 )
         {
             return new FilteredItr( realmNames );
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmManager.java
index 034134e..865822b 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmManager.java
@@ -30,7 +30,7 @@ import com.google.inject.Injector;
 /**
  * Manages {@link ClassRealm} associated data for the Plexus container.
  */
-public final class ClassRealmManager
+public final class RealmManager
     implements ClassWorldListener
 {
     // ----------------------------------------------------------------------
@@ -79,7 +79,7 @@ public final class ClassRealmManager
     // Constructors
     // ----------------------------------------------------------------------
 
-    public ClassRealmManager( final MutablePlexusContainer plexusContainer, final MutableBeanLocator beanLocator )
+    public RealmManager( final MutablePlexusContainer plexusContainer, final MutableBeanLocator beanLocator )
     {
         this.plexusContainer = plexusContainer;
         this.beanLocator = beanLocator;