DotFormatter is now a real singleton

kuali · Aug 7, 2005 · 2e211d0 · 2e211d0
1 parent fc90909
commit 2e211d0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/net/sourceforge/schemaspy/Main.java b/src/net/sourceforge/schemaspy/Main.java
@@ -144,7 +144,7 @@ public static void main(String[] argv) {
                 File graphsDir = new File(outputDir, "graphs/summary");
                 String dotBaseFilespec = "relationships";
                 out = new LineWriter(new FileWriter(new File(graphsDir, dotBaseFilespec + ".real.dot")));
-                WriteStats stats = new DotFormatter().writeRelationships(tables, false, out);
+                WriteStats stats = DotFormatter.getInstance().writeRelationships(tables, false, out);
                 boolean hasRelationships = stats.getNumTablesWritten() > 0 || stats.getNumViewsWritten() > 0;
                 out.close();
 
@@ -164,7 +164,7 @@ public static void main(String[] argv) {
 
                     File impliedDotFile = new File(graphsDir, dotBaseFilespec + ".implied.dot");
                     out = new LineWriter(new FileWriter(impliedDotFile));
-                    boolean hasImplied = new DotFormatter().writeRelationships(tables, true, out).wroteImplied();
+                    boolean hasImplied = DotFormatter.getInstance().writeRelationships(tables, true, out).wroteImplied();
                     out.close();
                     if (!hasImplied)
                         impliedDotFile.delete();

diff --git a/src/net/sourceforge/schemaspy/view/DotFormatter.java b/src/net/sourceforge/schemaspy/view/DotFormatter.java
@@ -11,6 +11,18 @@
  * @author John Currier
  */
 public class DotFormatter {
+    private static DotFormatter instance = new DotFormatter();
+
+    /**
+     * Singleton - prevent creation
+     */
+    private DotFormatter() {
+    }
+
+    public static DotFormatter getInstance() {
+        return instance;
+    }
+
     /**
      * Write relationships associated with the given table
      *

diff --git a/src/net/sourceforge/schemaspy/view/HtmlGraphFormatter.java b/src/net/sourceforge/schemaspy/view/HtmlGraphFormatter.java
@@ -133,7 +133,7 @@ public boolean writeOrphans(Database db, List orphanTables, boolean hasRelations
                 File graphFile = new File(graphDir, dotBaseFilespec + ".1degree.png");
 
                 LineWriter dotOut = new LineWriter(new FileWriter(dotFile));
-                new DotFormatter().writeOrphan(table, dotOut);
+                DotFormatter.getInstance().writeOrphan(table, dotOut);
                 dotOut.close();
                 try {
                     if (!dot.generateGraph(dotFile, graphFile))