[jboss-cvs] JBossAS SVN: r91439 - 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: 2009-07-20 15:08:47 -0400 (Mon, 20 Jul 2009)
New Revision: 91439

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/graph/DefaultGraphComponentFactory.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/layout/DefaultGraphLayout.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java
Log:
Remove some consts #2.

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-20 19:03:24 UTC (rev 91438)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java	2009-07-20 19:08:47 UTC (rev 91439)
@@ -21,8 +21,6 @@
  */
 package org.jboss.mctools.grapher;
 
-import java.awt.*;
-
 import org.jboss.mctools.grapher.graph.GraphCreator;
 import org.jboss.mctools.grapher.layout.GraphLayout;
 import org.jboss.mctools.grapher.map.DefaultGraphCreatorMapper;
@@ -30,8 +28,6 @@
 import org.jboss.mctools.grapher.map.DefaultRendererMapper;
 import org.jboss.mctools.grapher.map.GraphComponentMapper;
 import org.jboss.mctools.grapher.render.Renderer;
-import org.jboss.mctools.grapher.routing.ParallelSplineRouter;
-import org.jgraph.graph.Edge;
 
 /**
  * Grapher constants.
@@ -55,10 +51,4 @@
 
    /** The default renderer mapper */
    public static final GraphComponentMapper<Renderer> RENDERER_MAPPER = new DefaultRendererMapper();
-
-   /** The edge routing */
-   public static final Edge.Routing ROUTING = ParallelSplineRouter.getInstance(); 
-
-   /** The vertex color */
-   public static final Color COLOR = Color.WHITE;
 }
\ No newline at end of file

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultGraphComponentFactory.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultGraphComponentFactory.java	2009-07-20 19:03:24 UTC (rev 91438)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultGraphComponentFactory.java	2009-07-20 19:08:47 UTC (rev 91439)
@@ -24,7 +24,7 @@
 import java.awt.*;
 
 import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.mctools.grapher.GrapherConstants;
+import org.jboss.mctools.grapher.routing.ParallelSplineRouter;
 import org.jgraph.graph.ConnectionSet;
 import org.jgraph.graph.DefaultGraphCell;
 import org.jgraph.graph.Edge;
@@ -38,6 +38,12 @@
  */
 public class DefaultGraphComponentFactory implements GraphComponentFactory
 {
+   /** The edge routing */
+   private final Edge.Routing routing = ParallelSplineRouter.getInstance();
+
+   /** The vertex color */
+   private final Color COLOR = Color.WHITE;
+
    /**
     * Create vertex.
     *
@@ -54,7 +60,7 @@
 
    public GraphCell createVertex(Object label)
    {
-      return createVertex(label, GrapherConstants.COLOR);
+      return createVertex(label, COLOR);
    }
 
    public GraphCell createVertex(ControllerContext context)
@@ -77,7 +83,7 @@
    public void enhanceVertex(GraphCell vertex, ControllerContext context)
    {
       Colorable colorable = Colorable.class.cast(vertex);
-      if (colorable.getColor() == GrapherConstants.COLOR)
+      if (colorable.getColor() == COLOR)
          colorable.setColor(mapContextToColor(context));
    }
 
@@ -92,7 +98,7 @@
       int arrow = GraphConstants.ARROW_CLASSIC;
       GraphConstants.setLineEnd(edge.getAttributes(), arrow);
       GraphConstants.setEndFill(edge.getAttributes(), true);
-      GraphConstants.setRouting(edge.getAttributes(), GrapherConstants.ROUTING);
+      GraphConstants.setRouting(edge.getAttributes(), routing);
 
       return edge;
    }

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/layout/DefaultGraphLayout.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/layout/DefaultGraphLayout.java	2009-07-20 19:03:24 UTC (rev 91438)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/layout/DefaultGraphLayout.java	2009-07-20 19:08:47 UTC (rev 91439)
@@ -30,7 +30,7 @@
  */
 public class DefaultGraphLayout implements GraphLayout
 {
-   private GraphLayout layout = new ReflectionGraphLayout("com.jgraph.layout.graph.JGraphMoenLayout");
+   private GraphLayout layout = new ReflectionGraphLayout("com.jgraph.layout.tree.JGraphMoenLayout");
    
    public void applyLayout(JGraph graph)
    {

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	2009-07-20 19:03:24 UTC (rev 91438)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java	2009-07-20 19:08:47 UTC (rev 91439)
@@ -52,7 +52,7 @@
       map.put("hierarchical", "com.jgraph.layout.hierarchical.JGrapHierarchicalhLayout");
       map.put("compound", "com.jgraph.layout.JGraphCompoundLayout");
       map.put("compact", "com.jgraph.layout.tree.JGraphCompactTreeLayout");
-      map.put("moen", "com.jgraph.layout.graph.JGraphMoenLayout");
+      map.put("moen", "com.jgraph.layout.tree.JGraphMoenLayout");
       map.put("radial", "com.jgraph.layout.graph.JGraphRadialTreeLayout");
       map.put("annealing", "com.jgraph.layout.graph.JGraphAnnealingLayout");
       map.put("fr", "com.jgraph.layout.graph.JGraphFRLayout");