[jboss-cvs] JBossAS SVN: r64306 - projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort.

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

Author: adrian at jboss.org
Date: 2007-07-26 11:02:19 -0400 (Thu, 26 Jul 2007)
New Revision: 64306

Modified:
   projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoDeployerSorter.java
   projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
Log:
Fix the error message so it makes sense

Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoDeployerSorter.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoDeployerSorter.java	2007-07-26 14:58:14 UTC (rev 64305)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoDeployerSorter.java	2007-07-26 15:02:19 UTC (rev 64306)
@@ -42,7 +42,7 @@
       dominoes.add(new DeployerDomino(newDeployer));
 
       DominoOrdering<DeployerDomino> sorter = new DominoOrdering<DeployerDomino>("Cannot add %1s it will cause a loop\n");
-      dominoes = sorter.orderDominoes(dominoes);
+      dominoes = sorter.orderDominoes(dominoes, newDeployer);
 
       List<Deployer> deployers = new ArrayList<Deployer>(capacity);
       for (DeployerDomino domino : dominoes)

Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java	2007-07-26 14:58:14 UTC (rev 64305)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java	2007-07-26 15:02:19 UTC (rev 64306)
@@ -86,14 +86,14 @@
       }
    }
 
-   public List<T> orderDominoes(List<T> dominoes)
+   public List<T> orderDominoes(List<T> dominoes, Object cause)
    {
       // prepare initial transitions
       init(dominoes);
       // do transitive closure
       int cycle = fillTransitions(true);
       if (cycle >= 0)
-         throwCycleException(cycle);
+         throwCycleException(cause);
       // name compare on 'uncomparable'
       fillCompareNames();
 
@@ -178,10 +178,10 @@
       }
    }
 
-   protected void throwCycleException(int index)
+   protected void throwCycleException(Object cause)
    {
       StringBuilder builder = new StringBuilder();
-      builder.append(String.format(message, dominoes.get(index)));
+      builder.append(String.format(message, cause));
       for (T d : dominoes)
          builder.append(d.getInfo());
       throw new IllegalStateException(builder.toString());