Commit Diff


commit - c834f2871e998b3cff66c6a0f260f3e38efe4b2c
commit + 2ce6b28b221bde671d1b0e3fa38206b5236dba70
blob - 450751bf273ec87c51bdf806bd284263d74c8f3c
blob + 79e6e8ae25c38b50a408c3b07a9e5b4d7b895e34
--- src/org/snipsnap/graph/ContentRenderer.java
+++ src/org/snipsnap/graph/ContentRenderer.java
@@ -24,6 +24,8 @@
  */
 package org.snipsnap.graph;
 
+import org.snipsnap.graph.renderer.Renderer;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -36,5 +38,6 @@ import java.io.IOException;
  */
 public interface ContentRenderer {
   public String getName();
+  public Renderer getRenderer();
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException;
 }
\ No newline at end of file
blob - 7b89e28ee0d13a8d13020c01bfdcb1c73ec5fd2a
blob + e0101596b2a49f08877dc3e90517abecc937884a
--- src/org/snipsnap/graph/ExplorerContentRenderer.java
+++ src/org/snipsnap/graph/ExplorerContentRenderer.java
@@ -36,18 +36,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class ExplorerContentRenderer implements ContentRenderer {
+  Renderer renderer = new ExplorerRenderer();
 
   public String getName() {
     return "explorer";
   }
 
+  public Renderer getRenderer() {
+    return renderer;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
     ServletOutputStream out = response.getOutputStream();
 
     TreeBuilder builder = new StringTreeBuilder(content);
-    Renderer renderer = new ExplorerRenderer();
     renderer.render(builder.build(), out, new GraphRendererContext());
   }
 }
blob - a72858c6452c4d2b000e9540c5badd8566a5d9bb
blob + 5d4d89cd8ba22530adebe19ed7a2b7e61bb4e108
--- src/org/snipsnap/graph/HorizontalContentRenderer.java
+++ src/org/snipsnap/graph/HorizontalContentRenderer.java
@@ -36,18 +36,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class HorizontalContentRenderer implements ContentRenderer {
+  Renderer renderer = new HorizontalRenderer();
 
   public String getName() {
     return "horizontal";
   }
 
+  public Renderer getRenderer() {
+    return renderer;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
     ServletOutputStream out = response.getOutputStream();
 
     TreeBuilder builder = new StringTreeBuilder(content);
-    Renderer renderer = new HorizontalRenderer();
     renderer.render(builder.build(), out, new GraphRendererContext());
   }
 }
blob - 0f12aac2c521a8220d355595c047b0ddf435df9e
blob + b2b8b1203f9f86a23f4e7dbafcdd4326ce8510a4
--- src/org/snipsnap/graph/MindMapContentRenderer.java
+++ src/org/snipsnap/graph/MindMapContentRenderer.java
@@ -36,18 +36,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class MindMapContentRenderer implements ContentRenderer {
+  private Renderer renderer = new MindMapRenderer();
 
   public String getName() {
     return "mindmap";
   }
 
+  public Renderer getRenderer() {
+    return renderer;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
     ServletOutputStream out = response.getOutputStream();
 
     TreeBuilder builder = new StringTreeBuilder(content);
-    Renderer renderer = new MindMapRenderer();
     renderer.render(builder.build(), out, new GraphRendererContext());
   }
 }
blob - d5c8e3325c11c981897c70cef591888b52acabdd
blob + 1f95bc3fb0993b8945de60f1d9718ea90adf95a6
--- src/org/snipsnap/graph/NameSpaceTreeBuilder.java
+++ src/org/snipsnap/graph/NameSpaceTreeBuilder.java
@@ -24,7 +24,6 @@
  */
 package org.snipsnap.graph;
 
-import snipsnap.api.container.Components;
 import org.snipsnap.graph.builder.TreeBuilder;
 import org.snipsnap.graph.graph.Tree;
 import org.snipsnap.graph.graph.TreeNode;
blob - 47720dd5976b9cbdcb8ee860babd25470b599d6d
blob + bf6e962d3f4bb8799117b1d5006f6f90dd78c715
--- src/org/snipsnap/graph/PSPContentRenderer.java
+++ src/org/snipsnap/graph/PSPContentRenderer.java
@@ -35,18 +35,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class PSPContentRenderer implements ContentRenderer {
+  Renderer renderer = new DirectedAcyclicGraphRenderer();
 
   public String getName() {
     return "psp";
   }
 
+  public Renderer getRenderer() {
+    return renderer;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
     ServletOutputStream out = response.getOutputStream();
 
     StringDirectedAcyclicGraphBuilder builder = new StringDirectedAcyclicGraphBuilder(content);
-    Renderer renderer = new DirectedAcyclicGraphRenderer();
     renderer.render(builder.build(), out, new GraphRendererContext());
   }
 }
blob - 50cf6148d9a76fe0e83bf42ab4a351f34435079b
blob + 18afed005be30722656203a24bf17d66a43f8c6d
--- src/org/snipsnap/graph/UMLContentRenderer.java
+++ src/org/snipsnap/graph/UMLContentRenderer.java
@@ -28,6 +28,7 @@ import org.snipsnap.graph.builder.StringUMLBuilder;
 import org.snipsnap.graph.builder.UMLBuilder;
 import org.snipsnap.graph.context.UMLRendererContext;
 import org.snipsnap.graph.renderer.UMLGraphRenderer;
+import org.snipsnap.graph.renderer.Renderer;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
@@ -40,6 +41,10 @@ public class UMLContentRenderer implements ContentRend
     return "uml";
   }
 
+  public Renderer getRenderer() {
+    return null;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
blob - 5918cc1e20af92294844e84e5a7aa0935fcd41af
blob + 9f2be8fd49a5a5cdb9abcad2d57a237017eb85da
--- src/org/snipsnap/graph/VerticalContentRenderer.java
+++ src/org/snipsnap/graph/VerticalContentRenderer.java
@@ -36,18 +36,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class VerticalContentRenderer implements ContentRenderer {
+  Renderer renderer = new VerticalRenderer();
 
   public String getName() {
     return "vertical";
   }
 
+  public Renderer getRenderer() {
+    return renderer;
+  }
+
   public void render(HttpServletRequest request, HttpServletResponse response, String content) throws IOException {
     response.setContentType("image/png");
 
     ServletOutputStream out = response.getOutputStream();
 
     TreeBuilder builder = new StringTreeBuilder(content);
-    Renderer renderer = new VerticalRenderer();
     renderer.render(builder.build(), out, new GraphRendererContext());
   }
 }