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

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

Author: alesj
Date: 2010-07-19 09:51:24 -0400 (Mon, 19 Jul 2010)
New Revision: 106816

Modified:
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/GrapherEdge.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java
   projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
Log:
Test analysis, fix edge, noop layout.

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java	2010-07-19 13:37:38 UTC (rev 106815)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java	2010-07-19 13:51:24 UTC (rev 106816)
@@ -68,19 +68,28 @@
          }
       }
 
-      int i = 0;
+      int i = 1;
       for (Set<Vertex> sv : groups)
       {
          writer.write(("<ul>Group #" + (i++)).getBytes());
          List<Vertex> roots = new ArrayList<Vertex>();
          for (Vertex v : sv)
          {
-            if (v.getIncomingEdgeCount() == 0)
+            if (v.getOutgoingEdgeCount() == 0)
                roots.add(v);
 
             writer.write(("<li>" + v + "</li>").getBytes());
          }
-         writer.write(("</ul>Roots: " + roots.size()).getBytes());
+         writer.write("</ul>".getBytes());
+         if (sv.size() > 1)
+         {
+            writer.write(("<ul>Roots: ").getBytes());
+            for (Vertex rv : roots)
+            {
+               writer.write(("<li>" + rv + "</li>").getBytes());
+            }
+            writer.write("</ul><p/>----------------<p/><p/>".getBytes());
+         }
       }
    }
 

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/GrapherEdge.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/GrapherEdge.java	2010-07-19 13:37:38 UTC (rev 106815)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/GrapherEdge.java	2010-07-19 13:51:24 UTC (rev 106816)
@@ -47,5 +47,7 @@
    void setEdge(Vertex<String> from, Vertex<String> to)
    {
       edge = new Edge<String>(from, to);
+      from.addEdge(edge);
+      to.addEdge(edge);
    }
 }
\ No newline at end of file

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java	2010-07-19 13:37:38 UTC (rev 106815)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java	2010-07-19 13:51:24 UTC (rev 106816)
@@ -26,6 +26,7 @@
 
 import org.jboss.mctools.grapher.layout.DefaultGraphLayout;
 import org.jboss.mctools.grapher.layout.GraphLayout;
+import org.jboss.mctools.grapher.layout.NoopGraphLayout;
 import org.jboss.mctools.grapher.layout.ReflectionGraphLayout;
 
 /**
@@ -38,6 +39,9 @@
    /** The default layout */
    public static final GraphLayout LAYOUT = new DefaultGraphLayout();
 
+   /** The noop layout */
+   public static final GraphLayout NOOP = new NoopGraphLayout();
+
    private static final Map<String, String> map = new HashMap<String, String>();
 
    static
@@ -61,8 +65,6 @@
       map.put("isom", "com.jgraph.layout.graph.JGraphISOMLayout");
       map.put("org", "com.jgraph.layout.tree.OrganizationalChart");
       map.put("grid", "com.jgraph.layout.simpl.SimpleGridLayout");
-
-      map.put("noop", "org.jboss.mctools.grapher.layout.NoopGraphLayout");
    }
 
    protected String getKey()
@@ -92,6 +94,9 @@
       if (key == null)
          return LAYOUT;
 
+      if ("noop".equalsIgnoreCase(key))
+         return NOOP;
+
       String className = map.get(key);
       if (className == null)
          return LAYOUT;

Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java	2010-07-19 13:37:38 UTC (rev 106815)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java	2010-07-19 13:51:24 UTC (rev 106816)
@@ -26,6 +26,7 @@
 import java.util.Map;
 import javax.swing.*;
 
+import org.jboss.mctools.grapher.analysis.SubGraphRenderer;
 import org.jboss.mctools.grapher.layout.GraphLayout;
 import org.jboss.mctools.grapher.map.DefaultGraphLayoutMapper;
 import org.jboss.mctools.grapher.render.GIFRenderer;
@@ -153,4 +154,9 @@
    {
       testRenderer(new PNGRenderer());
    }
+
+   public void testSubGraph() throws Throwable
+   {
+      testRenderer(new SubGraphRenderer());
+   }
 }
\ No newline at end of file