[jboss-cvs] JBossAS SVN: r91441 - 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-20 15:39:33 -0400 (Mon, 20 Jul 2009)
New Revision: 91441

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/routing/ParallelSplineRouter.java
Log:
Change default format.

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:22:05 UTC (rev 91440)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherConstants.java	2009-07-20 19:39:33 UTC (rev 91441)
@@ -41,7 +41,7 @@
    }
 
    /** The default format */
-   public static final String FORMAT = "gif";
+   public static final String FORMAT = "png";
 
    /** The default creator mapper */
    public static final GraphComponentMapper<GraphCreator> CREATOR_MAPPER = new DefaultGraphCreatorMapper();

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:22:05 UTC (rev 91440)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultGraphComponentFactory.java	2009-07-20 19:39:33 UTC (rev 91441)
@@ -39,7 +39,7 @@
 public class DefaultGraphComponentFactory implements GraphComponentFactory
 {
    /** The edge routing */
-   private final Edge.Routing routing = ParallelSplineRouter.getInstance();
+   private final Edge.Routing routing = new ParallelSplineRouter();
 
    /** The vertex color */
    private final Color COLOR = Color.WHITE;

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/routing/ParallelSplineRouter.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/routing/ParallelSplineRouter.java	2009-07-20 19:22:05 UTC (rev 91440)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/routing/ParallelSplineRouter.java	2009-07-20 19:39:33 UTC (rev 91441)
@@ -12,7 +12,6 @@
 
 import org.jgraph.graph.DefaultEdge;
 import org.jgraph.graph.DefaultGraphModel;
-import org.jgraph.graph.Edge;
 import org.jgraph.graph.EdgeView;
 import org.jgraph.graph.GraphConstants;
 import org.jgraph.graph.GraphLayoutCache;
@@ -27,29 +26,15 @@
  */
 public class ParallelSplineRouter extends DefaultEdge.LoopRouting
 {
-   protected static GraphModel emptyModel = new DefaultGraphModel();
+   protected GraphModel emptyModel = new DefaultGraphModel();
 
-   private static Edge.Routing instance = new ParallelSplineRouter();
-
    /**
     * The distance between the control point and the middle line. A larger
     * number will lead to a more "bubbly" appearance of the bezier edges.
     */
    private double edgeSeparation = 25;
 
-   private ParallelSplineRouter()
-   {
-   }
-
    /**
-    * @return Returns the sharedInstance.
-    */
-   public static Edge.Routing getInstance()
-   {
-      return instance;
-	}
-
-   /**
     * Returns the array of parallel edges.
     *
     * @param edge the edge view