[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Gavin King]

  User: gavin   
  Date: 07/03/07 16:57:21

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  fix ordering bug
  
  Revision  Changes    Path
  1.160     +7 -7      jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.159
  retrieving revision 1.160
  diff -u -b -r1.159 -r1.160
  --- Initialization.java	7 Mar 2007 18:16:23 -0000	1.159
  +++ Initialization.java	7 Mar 2007 21:57:21 -0000	1.160
  @@ -61,7 +61,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.159 $
  + * @version $Revision: 1.160 $
    */
   public class Initialization
   {
  @@ -72,7 +72,7 @@
      private Map<String, Conversions.PropertyValue> properties = new HashMap<String, Conversions.PropertyValue>();
      private Map<String, SortedSet<ComponentDescriptor>> componentDescriptors = new HashMap<String, SortedSet<ComponentDescriptor>>();
      private List<FactoryDescriptor> factoryDescriptors = new ArrayList<FactoryDescriptor>();
  -   private Set<Class> installedComponents = new HashSet<Class>();
  +   private Set<Class> installedComponentClasses = new HashSet<Class>();
      private Set<String> importedPackages = new HashSet<String>();
      private Map<String, NamespaceDescriptor> namespaceMap = new HashMap<String, NamespaceDescriptor>();
      private final Map<String, EventListenerDescriptor> eventListenerDescriptors = new HashMap<String, EventListenerDescriptor>();
  @@ -357,7 +357,7 @@
   
            ComponentDescriptor descriptor = new ComponentDescriptor(name, clazz, scope, autoCreate, jndiName, installed, precedence);
            addComponentDescriptor(descriptor);
  -         installedComponents.add(clazz);
  +         installedComponentClasses.add(clazz);
         }
         else if (name == null)
         {
  @@ -795,7 +795,7 @@
               for (ComponentDescriptor componentDescriptor: descriptors)
               {
                  String compName = componentDescriptor.getName() + COMPONENT_SUFFIX;
  -               if ( !context.isSet(compName) && dependenciesMet(context, componentDescriptor) )
  +               if ( !context.isSet(compName) && dependenciesMet(componentDescriptor) )
                  {
                     addComponent(componentDescriptor, context);
                     
  @@ -851,7 +851,7 @@
         }
      }
   
  -   protected boolean dependenciesMet(Context context, ComponentDescriptor descriptor)
  +   protected boolean dependenciesMet(ComponentDescriptor descriptor)
      {
         if ( !descriptor.isInstalled() ) return false;
         
  @@ -860,7 +860,7 @@
         {
            for (String dependency: dependencies)
            {
  -            if ( !context.isSet(dependency + COMPONENT_SUFFIX) )
  +            if ( !componentDescriptors.containsKey(dependency) ) //TODO: call && descriptor.isInstalled() recursively
               {
                  return false;
               }
  @@ -871,7 +871,7 @@
         {
            for (Class genericDependency: genericDependencies)
            {
  -            if ( !installedComponents.contains(genericDependency) )
  +            if ( !installedComponentClasses.contains(genericDependency) )
               {
                  return false;
               }