[jboss-cvs] JBossAS SVN: r91383 - in projects/mc-tools/grapher/trunk: src/main/java/org/jboss/mctools/grapher/graph and 1 other directories.

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

Author: alesj
Date: 2009-07-17 15:25:29 -0400 (Fri, 17 Jul 2009)
New Revision: 91383

Modified:
   projects/mc-tools/grapher/trunk/pom.xml
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java
Log:
Optinal recursion.

Modified: projects/mc-tools/grapher/trunk/pom.xml
===================================================================
--- projects/mc-tools/grapher/trunk/pom.xml	2009-07-17 18:33:37 UTC (rev 91382)
+++ projects/mc-tools/grapher/trunk/pom.xml	2009-07-17 19:25:29 UTC (rev 91383)
@@ -153,14 +153,12 @@
       <version>5.12.4</version>
     </dependency>
     <!-- Uncomment this + place JGraphLayout in your local repo -->
-<!--
     <dependency>
       <groupId>com.jgraph</groupId>
       <artifactId>jgraphlayout</artifactId>
       <version>1.4.3</version>
       <optional>true</optional>
     </dependency>
--->
 
     <dependency>
        <groupId>jboss.web</groupId>

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java	2009-07-17 18:33:37 UTC (rev 91382)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java	2009-07-17 19:25:29 UTC (rev 91383)
@@ -47,10 +47,17 @@
 {
    private String folder;
    private String deploymentName;
+   private boolean recurse;
+
    private Set<Object> visited;
 
    public DeploymentGraphCreator(String folder, String deploymentName)
    {
+      this(folder, deploymentName, false);
+   }
+
+   public DeploymentGraphCreator(String folder, String deploymentName, boolean recurse)
+   {
       if (folder == null)
          throw new IllegalArgumentException("Null folder");
       if (deploymentName == null)
@@ -58,6 +65,8 @@
 
       this.folder = folder;
       this.deploymentName = deploymentName;
+      this.recurse = recurse;
+
       visited = new HashSet<Object>();
    }
 
@@ -69,13 +78,8 @@
 
       try
       {
-         String uriString = "${jboss.server.home.url}" + folder + "/" + deploymentName;
-         uriString = StringPropertyReplacer.replaceProperties(uriString);
-         URI uri = new URI(uriString);
-         VirtualFile root = VFS.getRoot(uri);
-
          MainDeployerStructure structure = MainDeployerStructure.class.cast(structureCC.getTarget());
-         DeploymentUnit unit = structure.getDeploymentUnit(root.toURI().toString());
+         DeploymentUnit unit = structure.getDeploymentUnit(generateName());
          handleDeploymentUnit(unit, controller, cells, objects, attributes, cs, excludedTypes);
       }
       catch (Exception e)
@@ -85,6 +89,21 @@
    }
 
    /**
+    * Generate deployment name.
+    *
+    * @return full deployment name
+    * @throws Exception for any error
+    */
+   protected String generateName() throws Exception
+   {
+      String uriString = "${jboss.server.home.url}" + folder + "/" + deploymentName;
+      uriString = StringPropertyReplacer.replaceProperties(uriString);
+      URI uri = new URI(uriString);
+      VirtualFile root = VFS.getRoot(uri);
+      return root.toURI().toString();
+   }
+
+   /**
     * Handle deployment unit.
     *
     * @param unit the deployment unit
@@ -140,6 +159,9 @@
    @Override
    protected boolean doRecurse(ControllerContext context)
    {
+      if (recurse == false)
+         return false;
+      
       Object name = context.getName();
       return visited.add(name);
    }

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java	2009-07-17 18:33:37 UTC (rev 91382)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java	2009-07-17 19:25:29 UTC (rev 91383)
@@ -48,11 +48,11 @@
       String deployment = request.getParameter("deployment");
       if (deployment != null)
       {
-         String type = request.getParameter("deploymentFolder");
+         String type = request.getParameter("folder");
          if (type == null)
             type = "deploy";
          
-         return new DeploymentGraphCreator(type, deployment);
+         return new DeploymentGraphCreator(type, deployment, Boolean.valueOf(request.getParameter("recurse")));
       }
 
       return ALL;