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

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

Author: alesj
Date: 2009-07-10 03:53:27 -0400 (Fri, 10 Jul 2009)
New Revision: 91050

Modified:
   projects/mc-tools/grapher/trunk/pom.xml
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java
   projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java
   projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
Log:
Apply layout to swing as well.
Add jgraphlayout as optional.

Modified: projects/mc-tools/grapher/trunk/pom.xml
===================================================================
--- projects/mc-tools/grapher/trunk/pom.xml	2009-07-10 06:55:05 UTC (rev 91049)
+++ projects/mc-tools/grapher/trunk/pom.xml	2009-07-10 07:53:27 UTC (rev 91050)
@@ -152,6 +152,15 @@
       <artifactId>jgraph</artifactId>
       <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>org.jboss</groupId>

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java	2009-07-10 06:55:05 UTC (rev 91049)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java	2009-07-10 07:53:27 UTC (rev 91050)
@@ -44,5 +44,5 @@
    public static final GraphCreatorMapper MAPPER = new DefaultGraphCreatorMapper();
 
    /** The default layout */
-   public static final GraphLayout LAYOUT = new ReflectionGraphLayout("com.jgraph.layout.organic.JGraphOrganicLayout");
+   public static final GraphLayout LAYOUT = new ReflectionGraphLayout("com.jgraph.layout.graph.JGraphFRLayout");
 }
\ No newline at end of file

Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java	2009-07-10 06:55:05 UTC (rev 91049)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java	2009-07-10 07:53:27 UTC (rev 91050)
@@ -25,6 +25,7 @@
 import org.jboss.test.kernel.junit.MicrocontainerTest;
 import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
 import org.jboss.test.mctools.grapher.render.test.AbstractRendererTest;
+import org.jboss.mctools.grapher.layout.GraphLayout;
 import org.jgraph.JGraph;
 
 /**
@@ -60,6 +61,8 @@
    public void testSwingView() throws Throwable
    {
       JGraph graph = delegate.createGraph();
+      GraphLayout layout = delegate.createLayout();
+      layout.applyLayout(graph);
       JGraphView view = new JGraphView(graph);
       view.view();
    }

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	2009-07-10 06:55:05 UTC (rev 91049)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java	2009-07-10 07:53:27 UTC (rev 91050)
@@ -59,7 +59,7 @@
       suffixes.put(PNGRenderer.class, ".png");
    }
 
-   protected GraphLayout createLayout()
+   public GraphLayout createLayout()
    {
       return GrapherConstants.LAYOUT;
    }