update class imports

xpenatan · Jul 16, 2023 · c9efb96 · c9efb96
1 parent 6169c3d
commit c9efb96
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 11 deletions.
diff --git a/example/example-build/src/main/java/com/github/xpenatan/jparser/example/Main.java b/example/example-build/src/main/java/com/github/xpenatan/jparser/example/Main.java
@@ -1,7 +1,7 @@
 package com.github.xpenatan.jparser.example;
 
 import com.github.xpenatan.jparser.core.JParser;
-import com.github.xpenatan.jparser.core.codeparser.idl.IDLDefaultCodeParser;
+import com.github.xpenatan.jparser.idl.parser.IDLDefaultCodeParser;
 import com.github.xpenatan.jparser.cpp.CPPBuildHelper;
 import com.github.xpenatan.jparser.cpp.CppCodeParserV2;
 import com.github.xpenatan.jparser.cpp.CppGenerator;

diff --git a/jParser/core/build.gradle b/jParser/core/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'java-library'
 def module_name = "core"
 
 dependencies {
-    api project(":jParser:idl")
     api "com.github.javaparser:javaparser-symbol-solver-core:$project.javaparserVersion"
     api "com.github.javaparser:javaparser-core:$project.javaparserVersion"
 }

diff --git a/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/CppCodeParser.java b/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/CppCodeParser.java
@@ -20,7 +20,7 @@
 import com.github.xpenatan.jparser.core.JParser;
 import com.github.xpenatan.jparser.core.JParserHelper;
 import com.github.xpenatan.jparser.core.JParserItem;
-import com.github.xpenatan.jparser.core.codeparser.idl.IDLDefaultCodeParser;
+import com.github.xpenatan.jparser.idl.parser.IDLDefaultCodeParser;
 import com.github.xpenatan.jparser.idl.IDLClass;
 import com.github.xpenatan.jparser.idl.IDLMethod;
 import com.github.xpenatan.jparser.idl.IDLParameter;

diff --git a/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/CppCodeParserV2.java b/jParser/cpp/src/main/java/com/github/xpenatan/jparser/cpp/CppCodeParserV2.java
@@ -20,7 +20,7 @@
 import com.github.xpenatan.jparser.core.JParser;
 import com.github.xpenatan.jparser.core.JParserHelper;
 import com.github.xpenatan.jparser.core.JParserItem;
-import com.github.xpenatan.jparser.core.codeparser.idl.IDLDefaultCodeParser;
+import com.github.xpenatan.jparser.idl.parser.IDLDefaultCodeParser;
 import com.github.xpenatan.jparser.idl.IDLClass;
 import com.github.xpenatan.jparser.idl.IDLMethod;
 import com.github.xpenatan.jparser.idl.IDLParameter;

diff --git a/jParser/idl/build.gradle b/jParser/idl/build.gradle
@@ -3,6 +3,7 @@ apply plugin: "java"
 def module_name = "idl"
 
 dependencies {
+    implementation project(":jParser:core")
     testImplementation "junit:junit:$project.jUnitVersion"
 }
 

diff --git a/...ub.xpenatan.jparser.idl/IDLAttribute.java → ...ub/xpenatan/jparser/idl/IDLAttribute.java b/...ub.xpenatan.jparser.idl/IDLAttribute.java → ...ub/xpenatan/jparser/idl/IDLAttribute.java
diff --git a/...github.xpenatan.jparser.idl/IDLClass.java → ...github/xpenatan/jparser/idl/IDLClass.java b/...github.xpenatan.jparser.idl/IDLClass.java → ...github/xpenatan/jparser/idl/IDLClass.java
diff --git a/....xpenatan.jparser.idl/IDLClassHeader.java → .../xpenatan/jparser/idl/IDLClassHeader.java b/....xpenatan.jparser.idl/IDLClassHeader.java → .../xpenatan/jparser/idl/IDLClassHeader.java
diff --git a/....xpenatan.jparser.idl/IDLConstructor.java → .../xpenatan/jparser/idl/IDLConstructor.java b/....xpenatan.jparser.idl/IDLConstructor.java → .../xpenatan/jparser/idl/IDLConstructor.java
diff --git a/....github.xpenatan.jparser.idl/IDLFile.java → .../github/xpenatan/jparser/idl/IDLFile.java b/....github.xpenatan.jparser.idl/IDLFile.java → .../github/xpenatan/jparser/idl/IDLFile.java
diff --git a/...ithub.xpenatan.jparser.idl/IDLMethod.java → ...ithub/xpenatan/jparser/idl/IDLMethod.java b/...ithub.xpenatan.jparser.idl/IDLMethod.java → ...ithub/xpenatan/jparser/idl/IDLMethod.java
diff --git a/...ub.xpenatan.jparser.idl/IDLParameter.java → ...ub/xpenatan/jparser/idl/IDLParameter.java b/...ub.xpenatan.jparser.idl/IDLParameter.java → ...ub/xpenatan/jparser/idl/IDLParameter.java
diff --git a/...ithub.xpenatan.jparser.idl/IDLReader.java → ...ithub/xpenatan/jparser/idl/IDLReader.java b/...ithub.xpenatan.jparser.idl/IDLReader.java → ...ithub/xpenatan/jparser/idl/IDLReader.java
diff --git a/...re/codeparser/idl/IDLAttributeParser.java → ...parser/idl/parser/IDLAttributeParser.java b/...re/codeparser/idl/IDLAttributeParser.java → ...parser/idl/parser/IDLAttributeParser.java
@@ -1,4 +1,4 @@
-package com.github.xpenatan.jparser.core.codeparser.idl;
+package com.github.xpenatan.jparser.idl.parser;
 
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;

diff --git a/...deparser/idl/IDLClassGeneratorParser.java → ...r/idl/parser/IDLClassGeneratorParser.java b/...deparser/idl/IDLClassGeneratorParser.java → ...r/idl/parser/IDLClassGeneratorParser.java
@@ -1,4 +1,4 @@
-package com.github.xpenatan.jparser.core.codeparser.idl;
+package com.github.xpenatan.jparser.idl.parser;
 
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;

diff --git a/.../codeparser/idl/IDLConstructorParser.java → ...rser/idl/parser/IDLConstructorParser.java b/.../codeparser/idl/IDLConstructorParser.java → ...rser/idl/parser/IDLConstructorParser.java
@@ -1,4 +1,4 @@
-package com.github.xpenatan.jparser.core.codeparser.idl;
+package com.github.xpenatan.jparser.idl.parser;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Modifier;

diff --git a/.../codeparser/idl/IDLDefaultCodeParser.java → ...rser/idl/parser/IDLDefaultCodeParser.java b/.../codeparser/idl/IDLDefaultCodeParser.java → ...rser/idl/parser/IDLDefaultCodeParser.java
@@ -1,4 +1,4 @@
-package com.github.xpenatan.jparser.core.codeparser.idl;
+package com.github.xpenatan.jparser.idl.parser;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;

diff --git a/.../core/codeparser/idl/IDLMethodParser.java → ...n/jparser/idl/parser/IDLMethodParser.java b/.../core/codeparser/idl/IDLMethodParser.java → ...n/jparser/idl/parser/IDLMethodParser.java
@@ -1,4 +1,4 @@
-package com.github.xpenatan.jparser.core.codeparser.idl;
+package com.github.xpenatan.jparser.idl.parser;
 
 import com.github.javaparser.Position;
 import com.github.javaparser.Range;

diff --git a/jParser/teavm/src/main/java/com/github/xpenatan/jparser/teavm/TeaVMCodeParser.java b/jParser/teavm/src/main/java/com/github/xpenatan/jparser/teavm/TeaVMCodeParser.java
@@ -29,7 +29,7 @@
 import com.github.javaparser.ast.type.Type;
 import com.github.xpenatan.jparser.core.JParser;
 import com.github.xpenatan.jparser.core.JParserHelper;
-import com.github.xpenatan.jparser.core.codeparser.idl.IDLDefaultCodeParser;
+import com.github.xpenatan.jparser.idl.parser.IDLDefaultCodeParser;
 import com.github.xpenatan.jparser.idl.IDLClass;
 import com.github.xpenatan.jparser.idl.IDLMethod;
 import com.github.xpenatan.jparser.idl.IDLReader;

diff --git a/jParser/teavm/src/main/java/com/github/xpenatan/jparser/teavm/TeaVMCodeParserV2.java b/jParser/teavm/src/main/java/com/github/xpenatan/jparser/teavm/TeaVMCodeParserV2.java
@@ -1,6 +1,6 @@
 package com.github.xpenatan.jparser.teavm;
 
-import com.github.xpenatan.jparser.core.codeparser.idl.IDLDefaultCodeParser;
+import com.github.xpenatan.jparser.idl.parser.IDLDefaultCodeParser;
 import com.github.xpenatan.jparser.idl.IDLReader;
 
 public class TeaVMCodeParserV2 extends IDLDefaultCodeParser {