WIP refactoring for tthuem#54

tcerny · Feb 11, 2021 · 29edc6b · 29edc6b
1 parent 09683c6
commit 29edc6b
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 9 deletions.
diff --git a/de.tubs.variantsync.core/pom.xml b/de.tubs.variantsync.core/pom.xml
@@ -2,6 +2,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
+	<!-- Start Refactoring support stuff -->
+	<!-- Can be deleted after issue 54 is done-->
+	<dependencies>
+		<dependency>
+			<groupId>de.tubs.variantsync</groupId>
+			<artifactId>de.variantsync.core</artifactId>
+			<version>0.0.3-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<!-- End Refactoring support stuff -->
+
 	<parent>
 		<groupId>de.tubs.variantsync</groupId>
 		<artifactId>de.tubs.variantsync</artifactId>

diff --git a/...ubs.variantsync.core/src/de/tubs/variantsync/core/view/resourcechanges/ResourcesTree.java b/...ubs.variantsync.core/src/de/tubs/variantsync/core/view/resourcechanges/ResourcesTree.java
@@ -4,8 +4,9 @@
 
 import de.tubs.variantsync.core.patch.interfaces.IDelta;
 import de.tubs.variantsync.core.patch.interfaces.IPatch;
-import de.tubs.variantsync.core.utilities.Tree;
-import de.tubs.variantsync.core.utilities.TreeNode;
+import de.variantsync.core.marker.Tree;
+
+import de.variantsync.core.marker.TreeNode;
 
 /**
  * Wraps the patches to a tree format

diff --git a/de.variantsync.core/out.txt b/de.variantsync.core/out.txt
@@ -0,0 +1,44 @@
+{
+  "uuid": "3bd1d2b2-a221-4667-ac2a-1b63eb4cfd53",
+  "value": "src",
+  "grammar_type": "Directory",
+  "children": [
+    {
+      "uuid": "c6f052a4-0210-48f9-8971-51a3382763c7",
+      "value": "Main.java",
+      "grammar_type": "TextFile",
+      "children": [
+        {
+          "uuid": "1985a27e-6c36-4bd3-9e60-e28a760b357e",
+          "value": "public class Main {",
+          "grammar_type": "Line",
+          "children": []
+        },
+        {
+          "uuid": "32779527-2bdc-4e61-a16e-2960efabc743",
+          "value": "    public static void main(String[] args)",
+          "grammar_type": "Line",
+          "children": []
+        },
+        {
+          "uuid": "e11ce171-3674-4a63-a287-fd5d334bb11b",
+          "value": "        System.out.println(\"Hello World\");",
+          "grammar_type": "Line",
+          "children": []
+        },
+        {
+          "uuid": "22a828a9-fe31-4b02-bca2-7445d01b7704",
+          "value": "    }",
+          "grammar_type": "Line",
+          "children": []
+        },
+        {
+          "uuid": "d0a02cc8-6595-4e10-b04f-70cd76344ac6",
+          "value": "}",
+          "grammar_type": "Line",
+          "children": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/...nc/core/utilities/AMarkerInformation.java → ...tsync/core/marker/AMarkerInformation.java b/...nc/core/utilities/AMarkerInformation.java → ...tsync/core/marker/AMarkerInformation.java
@@ -1,4 +1,4 @@
-package de.tubs.variantsync.core.utilities;
+package de.variantsync.core.marker;
 
 import java.util.UUID;
 

diff --git a/...tsync/core/managers/data/CodeMapping.java → .../variantsync/core/marker/CodeMapping.java b/...tsync/core/managers/data/CodeMapping.java → .../variantsync/core/marker/CodeMapping.java
@@ -1,6 +1,4 @@
-package de.tubs.variantsync.core.managers.data;
-
-import de.tubs.variantsync.core.utilities.IVariantSyncMarker;
+package de.variantsync.core.marker;
 
 public class CodeMapping {
 

diff --git a/...nc/core/utilities/IVariantSyncMarker.java → ...tsync/core/marker/IVariantSyncMarker.java b/...nc/core/utilities/IVariantSyncMarker.java → ...tsync/core/marker/IVariantSyncMarker.java
@@ -1,4 +1,4 @@
-package de.tubs.variantsync.core.utilities;
+package de.variantsync.core.marker;
 
 public interface IVariantSyncMarker {
 

diff --git a/...tubs/variantsync/core/utilities/Tree.java → ...java/de/variantsync/core/marker/Tree.java b/...tubs/variantsync/core/utilities/Tree.java → ...java/de/variantsync/core/marker/Tree.java
@@ -1,4 +1,4 @@
-package de.tubs.variantsync.core.utilities;
+package de.variantsync.core.marker;
 
 /**
  * Utility class for building treeviewer trees, see also {@link TreeNode}

diff --git a/.../variantsync/core/utilities/TreeNode.java → .../de/variantsync/core/marker/TreeNode.java b/.../variantsync/core/utilities/TreeNode.java → .../de/variantsync/core/marker/TreeNode.java
@@ -1,4 +1,4 @@
-package de.tubs.variantsync.core.utilities;
+package de.variantsync.core.marker;
 
 import java.util.ArrayList;
 import java.util.List;