Move Block, Node, Factory into model package, separating from Flowchart.

.idea/compiler.xml

@@ -16,7 +16,6 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="aidl2json" target="8" />
-      <module name="java-control-flow" target="8" />
       <module name="utils" target="8" />
     </bytecodeTargetLevel>
   </component>

flowchart/src/main/java/xyz/ignatz/flowchart/Flowchart.java

@@ -5,6 +5,8 @@ import java.util.*;
 import guru.nidi.graphviz.attribute.*;
 import guru.nidi.graphviz.model.Graph;
 import guru.nidi.graphviz.model.MutableNode;
+import xyz.ignatz.flowchart.model.Block;
+import xyz.ignatz.flowchart.model.Node;
 
 import static guru.nidi.graphviz.model.Factory.*;
 
@@ -14,7 +16,7 @@ public class Flowchart {
     Node start;
     List<Node> nodes;
 
-    protected Flowchart(String name, Block block) {
+    public Flowchart(String name, Block block) {
         this.name = name;
         start = block.start();
         nodes = block.nodes();

flowchart/src/main/java/xyz/ignatz/flowchart/Block.java → flowchart/src/main/java/xyz/ignatz/flowchart/model/Block.java

@@ -1,4 +1,4 @@
-package xyz.ignatz.flowchart;
+package xyz.ignatz.flowchart.model;
 
 import java.util.*;
 
@@ -9,7 +9,7 @@ public class Block {
         String label;
         NullLink next;
 
-        public NullLink(Node from, String label) {
+        NullLink(Node from, String label) {
             this.from = from;
             this.label = label;
             this.next = this;
@@ -50,8 +50,7 @@ public class Block {
     public Block move(String old, String type) {
         Objects.requireNonNull(old);
         Objects.requireNonNull(type);
-        if (type.equals(old)) return this;
-        nullLinks.put(type, concat(nullLinks.get(type), nullLinks.remove(old)));
+        if (!type.equals(old)) nullLinks.put(type, concat(nullLinks.get(type), nullLinks.remove(old)));
         return this;
     }
 

flowchart/src/main/java/xyz/ignatz/flowchart/Factory.java → flowchart/src/main/java/xyz/ignatz/flowchart/model/Factory.java

@@ -1,15 +1,10 @@
-package xyz.ignatz.flowchart;
-
-
+package xyz.ignatz.flowchart.model;
 
 import xyz.ignatz.utils.Pair;
 
 import java.util.*;
 
 public class Factory {
-    public static Flowchart flowchart(String name, Block block) {
-        return new Flowchart(name, block);
-    }
 
     public static Block block(String label, Integer line) {
         return block(label, line, "");

flowchart/src/main/java/xyz/ignatz/flowchart/Node.java → flowchart/src/main/java/xyz/ignatz/flowchart/model/Node.java

@@ -1,4 +1,4 @@
-package xyz.ignatz.flowchart;
+package xyz.ignatz.flowchart.model;
 
 import guru.nidi.graphviz.attribute.Label;
 import org.apache.commons.lang.StringEscapeUtils;

java9-flowchart/src/main/java/xyz/ignatz/antlr4/java9/recognizer/Java9FlowchartVisitor.java

@@ -4,11 +4,11 @@ import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.RuleNode;
 import xyz.ignatz.antlr4.java9.utils.JavaName;
 import xyz.ignatz.flowchart.Flowchart;
-import xyz.ignatz.flowchart.Block;
+import xyz.ignatz.flowchart.model.Block;
 import xyz.ignatz.utils.Pair;
 
 import static xyz.ignatz.antlr4.java9.utils.Blocks.*;
-import static xyz.ignatz.flowchart.Factory.*;
+import static xyz.ignatz.flowchart.model.Factory.*;
 
 import java.util.*;
 
@@ -77,7 +77,7 @@ public class Java9FlowchartVisitor extends Java9BaseVisitor<Block> {
     public Block visitMethodDeclaration(Java9Parser.MethodDeclarationContext ctx) {
         String dsc = name.toString() + '#' + ctx.methodHeader().methodDeclarator().getText();
         name.push('#', ctx.methodHeader().methodDeclarator().identifier().getText());
-        flowcharts.add(flowchart(name.toString(), block(dsc, ctx.start.getLine()).link(visit(ctx.methodBody()))));
+        flowcharts.add(new Flowchart(name.toString(), block(dsc, ctx.start.getLine()).link(visit(ctx.methodBody()))));
         name.pop('#');
         return null;
     }

java9-flowchart/src/main/java/xyz/ignatz/antlr4/java9/utils/Blocks.java

@@ -2,9 +2,9 @@ package xyz.ignatz.antlr4.java9.utils;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import xyz.ignatz.antlr4.java9.recognizer.Java9Parser;
-import xyz.ignatz.flowchart.Block;
-import xyz.ignatz.flowchart.Factory;
-import xyz.ignatz.flowchart.Node;
+import xyz.ignatz.flowchart.model.Block;
+import xyz.ignatz.flowchart.model.Factory;
+import xyz.ignatz.flowchart.model.Node;
 
 import static xyz.ignatz.antlr4.Utils.getFullText;
 

map-to-json/map-to-json.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />