[Core] Internal code structure refactoring

Move visitors to their own package to make it easier to navigate the code.
0x8000-0000 · Apr 26, 2020 · e24cd57 · e24cd57
1 parent e3ac1d8
commit e24cd57
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 16 deletions.
diff --git a/src/main/java/net/signbit/samx/ConvertToHtml.java b/src/main/java/net/signbit/samx/ConvertToHtml.java
@@ -22,6 +22,9 @@
 import org.apache.commons.cli.Options;
 import org.w3c.tidy.Tidy;
 
+import net.signbit.samx.visitors.HtmlPrinterVisitor;
+import net.signbit.samx.visitors.RendererVisitor;
+
 public class ConvertToHtml extends Renderer
 {
 

diff --git a/src/main/java/net/signbit/samx/ConvertToXml.java b/src/main/java/net/signbit/samx/ConvertToXml.java
@@ -31,6 +31,8 @@
 import org.xml.sax.SAXParseException;
 
 import com.thaiopensource.validate.ValidationDriver;
+import net.signbit.samx.visitors.RendererVisitor;
+import net.signbit.samx.visitors.XmlTextVisitor;
 
 public final class ConvertToXml extends Renderer
 {

diff --git a/src/main/java/net/signbit/samx/PrettyPrint.java b/src/main/java/net/signbit/samx/PrettyPrint.java
@@ -18,6 +18,9 @@
 
 import java.io.IOException;
 
+import net.signbit.samx.visitors.PrettyPrinterVisitor;
+import net.signbit.samx.visitors.VisitorUtils;
+
 public final class PrettyPrint
 {
    public static void main(String[] args) throws IOException

diff --git a/src/main/java/net/signbit/samx/Renderer.java b/src/main/java/net/signbit/samx/Renderer.java
@@ -16,12 +16,17 @@
 
 package net.signbit.samx;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
 import java.util.Properties;
 
 import org.apache.commons.cli.*;
 import org.xml.sax.SAXException;
 
+import net.signbit.samx.visitors.RendererVisitor;
+
 public abstract class Renderer
 {
    public Options makeOptions()

diff --git a/src/main/java/net/signbit/samx/literate/CppVisitor.java b/src/main/java/net/signbit/samx/literate/CppVisitor.java
@@ -30,10 +30,10 @@
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STGroupFile;
 
-import net.signbit.samx.AttributeVisitor;
 import net.signbit.samx.Parser;
-import net.signbit.samx.RendererVisitor;
 import net.signbit.samx.parser.SamXParser;
+import net.signbit.samx.visitors.AttributeVisitor;
+import net.signbit.samx.visitors.RendererVisitor;
 
 public class CppVisitor extends RendererVisitor
 {

diff --git a/src/main/java/net/signbit/samx/literate/GenerateHeader.java b/src/main/java/net/signbit/samx/literate/GenerateHeader.java
@@ -16,7 +16,6 @@
 
 package net.signbit.samx.literate;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Writer;
 
@@ -26,7 +25,7 @@
 
 import net.signbit.samx.Parser;
 import net.signbit.samx.Renderer;
-import net.signbit.samx.RendererVisitor;
+import net.signbit.samx.visitors.RendererVisitor;
 
 public class GenerateHeader extends Renderer
 {

diff --git a/...va/net/signbit/samx/AttributeVisitor.java → ...gnbit/samx/visitors/AttributeVisitor.java b/...va/net/signbit/samx/AttributeVisitor.java → ...gnbit/samx/visitors/AttributeVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.util.HashSet;
 

diff --git a/...in/java/net/signbit/samx/GridVisitor.java → ...et/signbit/samx/visitors/GridVisitor.java b/...in/java/net/signbit/samx/GridVisitor.java → ...et/signbit/samx/visitors/GridVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/.../net/signbit/samx/HtmlPrinterVisitor.java → ...bit/samx/visitors/HtmlPrinterVisitor.java b/.../net/signbit/samx/HtmlPrinterVisitor.java → ...bit/samx/visitors/HtmlPrinterVisitor.java
@@ -1,4 +1,4 @@
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -14,6 +14,7 @@
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STGroupFile;
 
+import net.signbit.samx.Parser;
 import net.signbit.samx.parser.SamXLexer;
 import net.signbit.samx.parser.SamXParser;
 

diff --git a/...va/net/signbit/samx/PlainTextVisitor.java → ...gnbit/samx/visitors/PlainTextVisitor.java b/...va/net/signbit/samx/PlainTextVisitor.java → ...gnbit/samx/visitors/PlainTextVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.util.List;
 

diff --git a/...et/signbit/samx/PrettyPrinterVisitor.java → ...t/samx/visitors/PrettyPrinterVisitor.java b/...et/signbit/samx/PrettyPrinterVisitor.java → ...t/samx/visitors/PrettyPrinterVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ava/net/signbit/samx/RendererVisitor.java → ...ignbit/samx/visitors/RendererVisitor.java b/...ava/net/signbit/samx/RendererVisitor.java → ...ignbit/samx/visitors/RendererVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -23,6 +23,7 @@
 import org.antlr.v4.runtime.BufferedTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 
+import net.signbit.samx.Parser;
 import net.signbit.samx.parser.SamXParser;
 import net.signbit.samx.parser.SamXParserBaseVisitor;
 

diff --git a/...n/java/net/signbit/samx/VisitorUtils.java → ...t/signbit/samx/visitors/VisitorUtils.java b/...n/java/net/signbit/samx/VisitorUtils.java → ...t/signbit/samx/visitors/VisitorUtils.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...java/net/signbit/samx/XmlTextVisitor.java → ...signbit/samx/visitors/XmlTextVisitor.java b/...java/net/signbit/samx/XmlTextVisitor.java → ...signbit/samx/visitors/XmlTextVisitor.java
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package net.signbit.samx;
+package net.signbit.samx.visitors;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -30,6 +30,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
+import net.signbit.samx.Parser;
 import net.signbit.samx.parser.SamXLexer;
 import net.signbit.samx.parser.SamXParser;
 

diff --git a/src/test/java/net/signbit/samx/parser/PrettyPrinterTest.java b/src/test/java/net/signbit/samx/parser/PrettyPrinterTest.java
@@ -4,8 +4,8 @@
 import org.junit.Test;
 
 import net.signbit.samx.Parser;
-import net.signbit.samx.PrettyPrinterVisitor;
-import net.signbit.samx.VisitorUtils;
+import net.signbit.samx.visitors.PrettyPrinterVisitor;
+import net.signbit.samx.visitors.VisitorUtils;
 import static org.junit.Assert.*;
 
 public class PrettyPrinterTest

diff --git a/src/test/java/net/signbit/samx/parser/XmlConverterTest.java b/src/test/java/net/signbit/samx/parser/XmlConverterTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 
 import net.signbit.samx.Parser;
-import net.signbit.samx.XmlTextVisitor;
+import net.signbit.samx.visitors.XmlTextVisitor;
 import static org.junit.Assert.assertEquals;
 
 public class XmlConverterTest