[jboss-cvs] JBossAS SVN: r91118 - projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi.

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

Author: kabir.khan at jboss.com
Date: 2009-07-10 17:01:41 -0400 (Fri, 10 Jul 2009)
New Revision: 91118

Modified:
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/IncompleteDeployments.java
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingDependency.java
Log:
[JBDEPLOY-204] Handle display of missing dependencies in Missing(Asynchronous)Dependency

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/IncompleteDeployments.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/IncompleteDeployments.java	2009-07-10 20:49:57 UTC (rev 91117)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/IncompleteDeployments.java	2009-07-10 21:01:41 UTC (rev 91118)
@@ -274,18 +274,7 @@
             buffer.append(String.format("  Deployment \"%s\" is missing the following dependencies:\n", name));
             for (MissingDependency dependency : entry.getValue())
             {
-               if (dependency instanceof MissingAsynchronousDependency)
-               {
-                  buffer.append(String.format("    Dependency \"%s\" (is currently being installed in a background thread)\n",
-                           dependency.getDependency()));
-               }
-               else
-               {
-                  buffer.append(String.format("    Dependency \"%s\" (should be in state \"%s\", but is actually in state \"%s\")\n",
-                          dependency.getDependency(),
-                          dependency.getRequiredState(),
-                          dependency.getActualState()));
-               }
+               buffer.append(dependency.display());
             }
 
             // It is not a root cause if it has missing dependencies

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java	2009-07-10 20:49:57 UTC (rev 91117)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingAsynchronousDependency.java	2009-07-10 21:01:41 UTC (rev 91118)
@@ -49,5 +49,11 @@
    {
       super(name, dependency, requiredState, actualState);
    }
-
+   
+   @Override
+   String display()
+   {
+      return String.format("    Dependency \"%s\" (is currently being installed in a background thread)\n",
+            super.getDependency());
+   }
 }

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingDependency.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingDependency.java	2009-07-10 20:49:57 UTC (rev 91117)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/java/org/jboss/deployers/client/spi/MissingDependency.java	2009-07-10 21:01:41 UTC (rev 91118)
@@ -108,4 +108,16 @@
    {
       return requiredState;
    }
+
+   /**
+    * Return a string containing the missing dependency for use in IncompleteDeployments
+    * @return The formatted missing dependency
+    */
+   String display()
+   {
+      return String.format("    Dependency \"%s\" (should be in state \"%s\", but is actually in state \"%s\")\n",
+            dependency,
+            requiredState,
+            actualState);
+   }
 }