started refactoring to new lib

tcerny · Feb 11, 2021 · 09683c6 · 09683c6
1 parent 4bc0314
commit 09683c6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/...ain/java/de/variantsync/core/ast/AST.java → ...ava/de/variantsync/core/ast/data/AST.java b/...ain/java/de/variantsync/core/ast/AST.java → ...ava/de/variantsync/core/ast/data/AST.java
@@ -1,4 +1,4 @@
-package de.variantsync.core.ast;
+package de.variantsync.core.ast.data;
 
 import java.util.*;
 
@@ -24,8 +24,19 @@ public class AST<G extends Grammar, Value> {
 	private final String INDENT_STRING = "    ";
 
 	/**
-	 * TODO: - sanity check like: A Directory can't have direct child Line or Lines are always leaf nodes - add - toString - equals - compareTo ? - hash ? -
-	 * toList ? - size - get - contains - remove <p> - testing
+	 * TODO:  <br />
+	 * - sanity check like: A Directory can't have direct child Line or Lines are always leaf nodes <br />
+	 * - add  <br />
+	 * - toString  <br />
+	 * - equals  <br />
+	 * - compareTo ?  <br />
+	 * - hash ?  <br />
+	 * - toList ?  <br />
+	 * - size  <br />
+	 * - get  <br />
+	 * - contains  <br />
+	 * - remove  <br />
+	 * - testing  <br />
 	 */
 
 	@Override
@@ -38,8 +49,6 @@ public String toString() {
 			// result.append(value + "\n");
 
 			HashSet<Integer> levelFinished = new HashSet<>(); // eg. is level 3 finished?
-			// levelFinished.add(level[0]);
-			// level[0]++;
 			toString(result, this, level, levelFinished, false);
 		}
 

diff --git a/...e/variantsync/core/ast/JsonParserAST.java → ...ntsync/core/ast/parser/JsonParserAST.java b/...e/variantsync/core/ast/JsonParserAST.java → ...ntsync/core/ast/parser/JsonParserAST.java
@@ -1,4 +1,4 @@
-package de.variantsync.core.ast;
+package de.variantsync.core.ast.parser;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -8,7 +8,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import de.variantsync.core.ast.AST;
+import de.variantsync.core.ast.data.AST;
 import de.variantsync.core.interfaces.Grammar;
 
 public class JsonParserAST {

diff --git a/...variantsync/core/ast/LineBasedParser.java → ...sync/core/ast/parser/LineBasedParser.java b/...variantsync/core/ast/LineBasedParser.java → ...sync/core/ast/parser/LineBasedParser.java
@@ -1,4 +1,7 @@
-package de.variantsync.core.ast;
+package de.variantsync.core.ast.parser;
+
+import de.variantsync.core.ast.data.AST;
+import de.variantsync.core.ast.LineGrammar;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;

diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java
@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertEquals;
 import java.util.Arrays;
 
-import de.variantsync.core.ast.AST;
+import de.variantsync.core.ast.data.AST;
 import de.variantsync.core.ast.LineGrammar;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java
@@ -7,8 +7,8 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 
-import de.variantsync.core.ast.AST;
-import de.variantsync.core.ast.JsonParserAST;
+import de.variantsync.core.ast.data.AST;
+import de.variantsync.core.ast.parser.JsonParserAST;
 import de.variantsync.core.ast.LineGrammar;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java
@@ -7,8 +7,8 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 
-import de.variantsync.core.ast.AST;
-import de.variantsync.core.ast.LineBasedParser;
+import de.variantsync.core.ast.data.AST;
+import de.variantsync.core.ast.parser.LineBasedParser;
 import de.variantsync.core.ast.LineGrammar;
 import org.junit.Before;
 import org.junit.Rule;