Some more inlining and reuse

avishek-sen-gupta · Nov 9, 2024 · 15f802f · 15f802f
1 parent 3e8b453
commit 15f802f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/...kit/src/main/java/org/smojol/toolkit/analysis/task/analysis/BuildFlowchartMarkupTask.java b/...kit/src/main/java/org/smojol/toolkit/analysis/task/analysis/BuildFlowchartMarkupTask.java
@@ -22,14 +22,14 @@ public BuildFlowchartMarkupTask(FlowNode root) {
 
     public String run() {
         MutableGraph graph = Factory.mutGraph("example1").setDirected(true).setCluster(true);
-        FlowNodeVisitor chartVisitor = new FlowNodeGraphvizVisitor(graph, buildOverlay(), VisitContext::ALWAYS_VISIT);
+        FlowNodeVisitor chartVisitor = new FlowNodeGraphvizVisitor(graph, buildOverlay(root), VisitContext::ALWAYS_VISIT);
         root.accept(chartVisitor, 1);
         return Graphviz.fromGraph(graph).engine(Engine.DOT)
                 .render(Format.DOT)
                 .toString();
     }
 
-    public ChartOverlay buildOverlay() {
+    public static ChartOverlay buildOverlay(FlowNode root) {
         FlowNodeOverlayVisitor compressionVisitor = new FlowNodeOverlayVisitor(root);
         root.accept(compressionVisitor, 1);
         compressionVisitor.report();

diff --git a/smojol-toolkit/src/main/java/org/smojol/toolkit/ast/FlowchartBuilder.java b/smojol-toolkit/src/main/java/org/smojol/toolkit/ast/FlowchartBuilder.java
@@ -12,6 +12,7 @@
 import org.smojol.common.flowchart.ChartOverlay;
 import org.smojol.common.flowchart.FlowchartOutputFormat;
 import org.smojol.common.flowchart.GraphGenerator;
+import org.smojol.toolkit.analysis.task.analysis.BuildFlowchartMarkupTask;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,9 +31,7 @@ public FlowchartBuilder(FlowNode root) {
     }
 
     public void build(String dotFilePath, String imageOutputPath, FlowchartOutputFormat outputFormat) throws IOException, InterruptedException {
-        ChartOverlay chartOverlay = runWithOverlay(root);
-//        FlowNodeVisitor chartVisitor = new FlowNodeGraphvizVisitor(graph, chartOverlay, VisitContext::ALWAYS_VISIT);
-//        root.accept(chartVisitor, 1);
+        ChartOverlay chartOverlay = BuildFlowchartMarkupTask.buildOverlay(root);
         buildChartGraphic(VisitContext::ALWAYS_VISIT, root, chartOverlay);
         write(dotFilePath);
         new GraphGenerator(outputFormat).generateImage(dotFilePath, imageOutputPath);
@@ -52,15 +51,4 @@ private void write(String dotFilePath) {
             throw new RuntimeException(e);
         }
     }
-
-    private ChartOverlay runWithOverlay(FlowNode root) {
-        return buildOverlay(root);
-    }
-
-    private ChartOverlay buildOverlay(FlowNode root) {
-        FlowNodeOverlayVisitor compressionVisitor = new FlowNodeOverlayVisitor(root);
-        root.accept(compressionVisitor, 1);
-        compressionVisitor.report();
-        return compressionVisitor.overlay();
-    }
 }