[jboss-cvs] JBossAS SVN: r91438 - 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:03:24 -0400 (Mon, 20 Jul 2009)
New Revision: 91438

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/AbstractGraphCreator.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:
Remove some consts.

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 18:54:45 UTC (rev 91437)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java	2009-07-20 19:03:24 UTC (rev 91438)
@@ -23,10 +23,7 @@
 
 import java.awt.*;
 
-import org.jboss.mctools.grapher.graph.DefaultGraphComponentFactory;
-import org.jboss.mctools.grapher.graph.GraphComponentFactory;
 import org.jboss.mctools.grapher.graph.GraphCreator;
-import org.jboss.mctools.grapher.layout.DefaultGraphLayout;
 import org.jboss.mctools.grapher.layout.GraphLayout;
 import org.jboss.mctools.grapher.map.DefaultGraphCreatorMapper;
 import org.jboss.mctools.grapher.map.DefaultGraphLayoutMapper;
@@ -53,9 +50,6 @@
    /** The default creator mapper */
    public static final GraphComponentMapper<GraphCreator> CREATOR_MAPPER = new DefaultGraphCreatorMapper();
 
-   /** The default layout */
-   public static final GraphLayout LAYOUT = new DefaultGraphLayout();
-
    /** The default layout mapper */
    public static final GraphComponentMapper<GraphLayout> LAYOUT_MAPPER = new DefaultGraphLayoutMapper();
 
@@ -67,7 +61,4 @@
 
    /** The vertex color */
    public static final Color COLOR = Color.WHITE;
-
-   /** The graph component factory */
-   public static final GraphComponentFactory COMPONENT_FACTORY = new DefaultGraphComponentFactory();
 }
\ No newline at end of file

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java	2009-07-20 18:54:45 UTC (rev 91437)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java	2009-07-20 19:03:24 UTC (rev 91438)
@@ -35,7 +35,6 @@
 import org.jboss.dependency.spi.DependencyItem;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.logging.Logger;
-import org.jboss.mctools.grapher.GrapherConstants;
 import org.jgraph.JGraph;
 import org.jgraph.graph.AttributeMap;
 import org.jgraph.graph.ConnectionSet;
@@ -54,7 +53,7 @@
    protected Logger log = Logger.getLogger(getClass());
 
    /** The graph component factory */
-   private static GraphComponentFactory factory = GrapherConstants.COMPONENT_FACTORY;
+   private static GraphComponentFactory factory = new DefaultGraphComponentFactory();
 
    public JGraph createGraph(KernelController controller, Class<? extends ControllerContext>... excludedTypes)
    {

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 18:54:45 UTC (rev 91437)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphLayoutMapper.java	2009-07-20 19:03:24 UTC (rev 91438)
@@ -21,10 +21,10 @@
  */
 package org.jboss.mctools.grapher.map;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
-import org.jboss.mctools.grapher.GrapherConstants;
+import org.jboss.mctools.grapher.layout.DefaultGraphLayout;
 import org.jboss.mctools.grapher.layout.GraphLayout;
 import org.jboss.mctools.grapher.layout.ReflectionGraphLayout;
 
@@ -35,6 +35,9 @@
  */
 public final class DefaultGraphLayoutMapper extends AbstractGraphComponentMapper<GraphLayout>
 {
+   /** The default layout */
+   public static final GraphLayout LAYOUT = new DefaultGraphLayout();
+
    private static final Map<String, String> map = new HashMap<String, String>();
 
    static
@@ -84,11 +87,11 @@
    static GraphLayout getLayout(String key)
    {
       if (key == null)
-         return GrapherConstants.LAYOUT;
+         return LAYOUT;
 
       String className = map.get(key);
       if (className == null)
-         return GrapherConstants.LAYOUT;
+         return LAYOUT;
 
       // treat simple differently
       if (key.startsWith("simple"))

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-20 18:54:45 UTC (rev 91437)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java	2009-07-20 19:03:24 UTC (rev 91438)
@@ -24,11 +24,10 @@
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.swing.*;
 
-import org.jboss.mctools.grapher.GrapherConstants;
 import org.jboss.mctools.grapher.layout.GraphLayout;
+import org.jboss.mctools.grapher.map.DefaultGraphLayoutMapper;
 import org.jboss.mctools.grapher.render.GIFRenderer;
 import org.jboss.mctools.grapher.render.JPGRenderer;
 import org.jboss.mctools.grapher.render.PNGRenderer;
@@ -93,7 +92,7 @@
 
    public GraphLayout createLayout()
    {
-      return GrapherConstants.LAYOUT;
+      return DefaultGraphLayoutMapper.LAYOUT;
    }
 
    protected abstract T createOutputStream(String suffix) throws Throwable;