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

[Gavin King]

  User: gavin   
  Date: 07/03/12 02:12:22

  Modified:    src/main/org/jboss/seam/init   DependencyManager.java
                        Initialization.java
  Log:
  make order of the log work again
  
  Revision  Changes    Path
  1.2       +12 -2     jboss-seam/src/main/org/jboss/seam/init/DependencyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DependencyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/DependencyManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DependencyManager.java	10 Mar 2007 05:50:40 -0000	1.1
  +++ DependencyManager.java	12 Mar 2007 06:12:22 -0000	1.2
  @@ -1,6 +1,11 @@
   package org.jboss.seam.init;
   
  -import java.util.*;
  +import java.util.Comparator;
  +import java.util.HashMap;
  +import java.util.HashSet;
  +import java.util.Map;
  +import java.util.Set;
  +import java.util.TreeSet;
   
   public class DependencyManager {
       private Map<String, Set<ComponentDescriptor>> componentDescriptors;
  @@ -17,8 +22,13 @@
           return installedSet;        
       }
           
  +    private static final Comparator<ComponentDescriptor> ORDER = new Comparator<ComponentDescriptor>() 
  +    { 
  +       public int compare(ComponentDescriptor x, ComponentDescriptor y) { return x.getName().compareTo( y.getName() ); } 
  +    };
  +        
       private void computeInstallSet() {
  -        installedSet = new HashSet<ComponentDescriptor>();
  +        installedSet = new TreeSet<ComponentDescriptor>(ORDER);
           Set<String> keys = componentDescriptors.keySet();
           for (String key: keys) {
               currentTestSet = new HashSet<ComponentDescriptor>();            
  
  
  
  1.164     +2 -4      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.163
  retrieving revision 1.164
  diff -u -b -r1.163 -r1.164
  --- Initialization.java	10 Mar 2007 06:20:22 -0000	1.163
  +++ Initialization.java	12 Mar 2007 06:12:22 -0000	1.164
  @@ -19,9 +19,7 @@
   import java.util.Map;
   import java.util.Properties;
   import java.util.Set;
  -import java.util.SortedSet;
   import java.util.StringTokenizer;
  -import java.util.TreeMap;
   import java.util.TreeSet;
   
   import javax.servlet.ServletContext;
  @@ -59,7 +57,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.163 $
  + * @version $Revision: 1.164 $
    */
   public class Initialization
   {
  @@ -68,7 +66,7 @@
   
      private ServletContext servletContext;
      private Map<String, Conversions.PropertyValue> properties = new HashMap<String, Conversions.PropertyValue>();
  -   private Map<String, Set<ComponentDescriptor>> componentDescriptors = new TreeMap<String, Set<ComponentDescriptor>>();
  +   private Map<String, Set<ComponentDescriptor>> componentDescriptors = new HashMap<String, Set<ComponentDescriptor>>();
      private List<FactoryDescriptor> factoryDescriptors = new ArrayList<FactoryDescriptor>();
      private Set<Class> installedComponentClasses = new HashSet<Class>();
      private Set<String> importedPackages = new HashSet<String>();