diff --git a/bin/app/user/ApplicationSettings_for_package.xml b/bin/app/data/fallback/ApplicationSettings.xml similarity index 57% rename from bin/app/user/ApplicationSettings_for_package.xml rename to bin/app/data/fallback/ApplicationSettings.xml index 224415fc..108551e4 100644 --- a/bin/app/user/ApplicationSettings_for_package.xml +++ b/bin/app/data/fallback/ApplicationSettings.xml @@ -9,9 +9,9 @@ - ./data/projects/tutorial/tutorial.coatiproject - ./data/projects/tictactoe/tictactoe.coatiproject - ./data/projects/javaparser/javaparser.coatiproject + ./projects/tutorial/tutorial.coatiproject + ./projects/tictactoe/tictactoe.coatiproject + ./projects/javaparser/javaparser.coatiproject 1 diff --git a/bin/app/user/window_settings_for_package.ini b/bin/app/data/fallback/window_settings.ini similarity index 100% rename from bin/app/user/window_settings_for_package.ini rename to bin/app/data/fallback/window_settings.ini diff --git a/bin/app/data/install/uninstall_wix.bat b/bin/app/data/install/uninstall_wix.bat index 33421a1e..a5fd9c11 100644 --- a/bin/app/data/install/uninstall_wix.bat +++ b/bin/app/data/install/uninstall_wix.bat @@ -1 +1 @@ -%windir%\system32\msiexec.exe /x {596E7336-D5B9-449A-95E9-6040F354E283} \ No newline at end of file +%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E} \ No newline at end of file diff --git a/bin/app/data/projects/javaparser/javaparser.coatiproject b/bin/app/user/projects/javaparser/javaparser.coatiproject similarity index 100% rename from bin/app/data/projects/javaparser/javaparser.coatiproject rename to bin/app/user/projects/javaparser/javaparser.coatiproject diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/Position.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/Position.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/Range.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/Range.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java diff --git a/bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java b/bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java similarity index 100% rename from bin/app/data/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java rename to bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java diff --git a/bin/app/data/projects/javaparser/src/main/javacc/java_1_8.jj b/bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj similarity index 100% rename from bin/app/data/projects/javaparser/src/main/javacc/java_1_8.jj rename to bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java diff --git a/bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java b/bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java similarity index 100% rename from bin/app/data/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java rename to bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java diff --git a/bin/app/data/projects/tictactoe/src/artificial_player.cpp b/bin/app/user/projects/tictactoe/src/artificial_player.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/artificial_player.cpp rename to bin/app/user/projects/tictactoe/src/artificial_player.cpp diff --git a/bin/app/data/projects/tictactoe/src/artificial_player.h b/bin/app/user/projects/tictactoe/src/artificial_player.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/artificial_player.h rename to bin/app/user/projects/tictactoe/src/artificial_player.h diff --git a/bin/app/data/projects/tictactoe/src/field.cpp b/bin/app/user/projects/tictactoe/src/field.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/field.cpp rename to bin/app/user/projects/tictactoe/src/field.cpp diff --git a/bin/app/data/projects/tictactoe/src/field.h b/bin/app/user/projects/tictactoe/src/field.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/field.h rename to bin/app/user/projects/tictactoe/src/field.h diff --git a/bin/app/data/projects/tictactoe/src/human_player.cpp b/bin/app/user/projects/tictactoe/src/human_player.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/human_player.cpp rename to bin/app/user/projects/tictactoe/src/human_player.cpp diff --git a/bin/app/data/projects/tictactoe/src/human_player.h b/bin/app/user/projects/tictactoe/src/human_player.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/human_player.h rename to bin/app/user/projects/tictactoe/src/human_player.h diff --git a/bin/app/data/projects/tictactoe/src/io.cpp b/bin/app/user/projects/tictactoe/src/io.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/io.cpp rename to bin/app/user/projects/tictactoe/src/io.cpp diff --git a/bin/app/data/projects/tictactoe/src/io.h b/bin/app/user/projects/tictactoe/src/io.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/io.h rename to bin/app/user/projects/tictactoe/src/io.h diff --git a/bin/app/data/projects/tictactoe/src/main.cpp b/bin/app/user/projects/tictactoe/src/main.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/main.cpp rename to bin/app/user/projects/tictactoe/src/main.cpp diff --git a/bin/app/data/projects/tictactoe/src/player.cpp b/bin/app/user/projects/tictactoe/src/player.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/player.cpp rename to bin/app/user/projects/tictactoe/src/player.cpp diff --git a/bin/app/data/projects/tictactoe/src/player.h b/bin/app/user/projects/tictactoe/src/player.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/player.h rename to bin/app/user/projects/tictactoe/src/player.h diff --git a/bin/app/data/projects/tictactoe/src/tictactoe.cpp b/bin/app/user/projects/tictactoe/src/tictactoe.cpp similarity index 100% rename from bin/app/data/projects/tictactoe/src/tictactoe.cpp rename to bin/app/user/projects/tictactoe/src/tictactoe.cpp diff --git a/bin/app/data/projects/tictactoe/src/tictactoe.h b/bin/app/user/projects/tictactoe/src/tictactoe.h similarity index 100% rename from bin/app/data/projects/tictactoe/src/tictactoe.h rename to bin/app/user/projects/tictactoe/src/tictactoe.h diff --git a/bin/app/data/projects/tictactoe/tictactoe.coatiproject b/bin/app/user/projects/tictactoe/tictactoe.coatiproject similarity index 100% rename from bin/app/data/projects/tictactoe/tictactoe.coatiproject rename to bin/app/user/projects/tictactoe/tictactoe.coatiproject diff --git a/bin/app/data/projects/tutorial/src/code_tutorial_1.h b/bin/app/user/projects/tutorial/src/code_tutorial_1.h similarity index 100% rename from bin/app/data/projects/tutorial/src/code_tutorial_1.h rename to bin/app/user/projects/tutorial/src/code_tutorial_1.h diff --git a/bin/app/data/projects/tutorial/src/code_tutorial_2.h b/bin/app/user/projects/tutorial/src/code_tutorial_2.h similarity index 100% rename from bin/app/data/projects/tutorial/src/code_tutorial_2.h rename to bin/app/user/projects/tutorial/src/code_tutorial_2.h diff --git a/bin/app/data/projects/tutorial/src/code_tutorial_3.h b/bin/app/user/projects/tutorial/src/code_tutorial_3.h similarity index 100% rename from bin/app/data/projects/tutorial/src/code_tutorial_3.h rename to bin/app/user/projects/tutorial/src/code_tutorial_3.h diff --git a/bin/app/data/projects/tutorial/src/graph_tutorial_1.h b/bin/app/user/projects/tutorial/src/graph_tutorial_1.h similarity index 100% rename from bin/app/data/projects/tutorial/src/graph_tutorial_1.h rename to bin/app/user/projects/tutorial/src/graph_tutorial_1.h diff --git a/bin/app/data/projects/tutorial/src/graph_tutorial_2.h b/bin/app/user/projects/tutorial/src/graph_tutorial_2.h similarity index 100% rename from bin/app/data/projects/tutorial/src/graph_tutorial_2.h rename to bin/app/user/projects/tutorial/src/graph_tutorial_2.h diff --git a/bin/app/data/projects/tutorial/src/graph_tutorial_3.h b/bin/app/user/projects/tutorial/src/graph_tutorial_3.h similarity index 100% rename from bin/app/data/projects/tutorial/src/graph_tutorial_3.h rename to bin/app/user/projects/tutorial/src/graph_tutorial_3.h diff --git a/bin/app/data/projects/tutorial/src/graph_tutorial_4.h b/bin/app/user/projects/tutorial/src/graph_tutorial_4.h similarity index 100% rename from bin/app/data/projects/tutorial/src/graph_tutorial_4.h rename to bin/app/user/projects/tutorial/src/graph_tutorial_4.h diff --git a/bin/app/data/projects/tutorial/src/main.cpp b/bin/app/user/projects/tutorial/src/main.cpp similarity index 100% rename from bin/app/data/projects/tutorial/src/main.cpp rename to bin/app/user/projects/tutorial/src/main.cpp diff --git a/bin/app/data/projects/tutorial/src/my_first_step.h b/bin/app/user/projects/tutorial/src/my_first_step.h similarity index 100% rename from bin/app/data/projects/tutorial/src/my_first_step.h rename to bin/app/user/projects/tutorial/src/my_first_step.h diff --git a/bin/app/data/projects/tutorial/src/my_next_step.h b/bin/app/user/projects/tutorial/src/my_next_step.h similarity index 100% rename from bin/app/data/projects/tutorial/src/my_next_step.h rename to bin/app/user/projects/tutorial/src/my_next_step.h diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_1.h b/bin/app/user/projects/tutorial/src/search_tutorial_1.h similarity index 100% rename from bin/app/data/projects/tutorial/src/search_tutorial_1.h rename to bin/app/user/projects/tutorial/src/search_tutorial_1.h diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_2.h b/bin/app/user/projects/tutorial/src/search_tutorial_2.h similarity index 100% rename from bin/app/data/projects/tutorial/src/search_tutorial_2.h rename to bin/app/user/projects/tutorial/src/search_tutorial_2.h diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_3.h b/bin/app/user/projects/tutorial/src/search_tutorial_3.h similarity index 100% rename from bin/app/data/projects/tutorial/src/search_tutorial_3.h rename to bin/app/user/projects/tutorial/src/search_tutorial_3.h diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_4.h b/bin/app/user/projects/tutorial/src/search_tutorial_4.h similarity index 100% rename from bin/app/data/projects/tutorial/src/search_tutorial_4.h rename to bin/app/user/projects/tutorial/src/search_tutorial_4.h diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_5.h b/bin/app/user/projects/tutorial/src/search_tutorial_5.h similarity index 100% rename from bin/app/data/projects/tutorial/src/search_tutorial_5.h rename to bin/app/user/projects/tutorial/src/search_tutorial_5.h diff --git a/bin/app/data/projects/tutorial/src/start_exploring.h b/bin/app/user/projects/tutorial/src/start_exploring.h similarity index 100% rename from bin/app/data/projects/tutorial/src/start_exploring.h rename to bin/app/user/projects/tutorial/src/start_exploring.h diff --git a/bin/app/data/projects/tutorial/src/the_central_hub.h b/bin/app/user/projects/tutorial/src/the_central_hub.h similarity index 100% rename from bin/app/data/projects/tutorial/src/the_central_hub.h rename to bin/app/user/projects/tutorial/src/the_central_hub.h diff --git a/bin/app/data/projects/tutorial/src/utility.h b/bin/app/user/projects/tutorial/src/utility.h similarity index 100% rename from bin/app/data/projects/tutorial/src/utility.h rename to bin/app/user/projects/tutorial/src/utility.h diff --git a/bin/app/data/projects/tutorial/tutorial.coatiproject b/bin/app/user/projects/tutorial/tutorial.coatiproject similarity index 100% rename from bin/app/data/projects/tutorial/tutorial.coatiproject rename to bin/app/user/projects/tutorial/tutorial.coatiproject diff --git a/cmake/LinuxPackage.cmake b/cmake/LinuxPackage.cmake index ee472a48..1efb59fd 100644 --- a/cmake/LinuxPackage.cmake +++ b/cmake/LinuxPackage.cmake @@ -48,22 +48,14 @@ function(AddSharedToComponent componentName) DESTINATION Coati COMPONENT ${componentName} PATTERN "log/*" EXCLUDE - PATTERN "data/projects" PATTERN "data/src" EXCLUDE PATTERN "data/gui/installer" EXCLUDE + PATTERN "projects" EXCLUDE PATTERN "data/install" EXCLUDE - PATTERN "ApplicationSettings.xml" EXCLUDE - PATTERN "ApplicationSettings_for_package.xml" EXCLUDE PATTERN "ProjectSettings_template.xml" EXCLUDE PATTERN "ApplicationSettings_template.xml" EXCLUDE ) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/ApplicationSettings_for_package.xml - DESTINATION Coati/user - COMPONENT ${componentName} - RENAME ApplicationSettings.xml - ) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/gui/installer/EULA.txt COMPONENT ${componentName} @@ -111,6 +103,18 @@ function(AddSharedToComponent componentName) COMPONENT ${componentName} ) + INSTALL(FILES + ${CMAKE_SOURCE_DIR}/bin/app/data/fallback/ApplicationSettings.xml + COMPONENT ${componentName} + DESTINATION Coati/user + ) + + INSTALL(FILES + ${CMAKE_SOURCE_DIR}/bin/app/data/fallback/window_settings.ini + COMPONENT ${componentName} + DESTINATION Coati/user + ) + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user DESTINATION Coati COMPONENT ${componentName} @@ -121,11 +125,6 @@ function(AddSharedToComponent componentName) PATTERN "window_settings_for_package.ini" EXCLUDE ) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/window_settings_for_package.ini - DESTINATION Coati/user - COMPONENT ${componentName} - RENAME window_settings.ini - ) endfunction(AddSharedToComponent) # Add shared files to full and trial version @@ -138,12 +137,6 @@ INSTALL(DIRECTORY PATTERN "vs" EXCLUDE ) -INSTALL(DIRECTORY - ${CMAKE_SOURCE_DIR}/bin/app/data/projects - DESTINATION Coati/user - COMPONENT FULL -) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop ${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml diff --git a/cmake/pre_install_linux.cmake b/cmake/pre_install_linux.cmake index 500e5ccc..e3d458a3 100644 --- a/cmake/pre_install_linux.cmake +++ b/cmake/pre_install_linux.cmake @@ -19,16 +19,16 @@ endfunction() ) execute_process( - COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tictactoe/tictactoe.coatiproject + COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject ) execute_process( - COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tutorial/tutorial.coatiproject + COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject ) -#execute_process( - #COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/javaparser/javaparser.coatiproject -#) + execute_process( + COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject + ) SET (NO_UPX 1) if (NO_UPX) diff --git a/deployment/windows/wixSetup/Setup/src/main.cpp b/deployment/windows/wixSetup/Setup/src/main.cpp index fbb67374..c97b1cb8 100644 --- a/deployment/windows/wixSetup/Setup/src/main.cpp +++ b/deployment/windows/wixSetup/Setup/src/main.cpp @@ -10,14 +10,14 @@ int main() { std::cout << "Coati found" << std::endl; std::cout << "Performing upgrade" << std::endl; - system("msiexec /i coati.msi REINSTALL=ALL REINSTALLMODE=vomus"); } else { std::cout << "Coati not found" << std::endl; std::cout << "Performing initial installation" << std::endl; - system("msiexec /i coati.msi"); } + system("msiexec /i coati.msi"); + return 0; -} \ No newline at end of file +} diff --git a/deployment/windows/wixSetup/appDataDir.wxs b/deployment/windows/wixSetup/appDataDir.wxs index d384ddad..a48dd469 100644 --- a/deployment/windows/wixSetup/appDataDir.wxs +++ b/deployment/windows/wixSetup/appDataDir.wxs @@ -16,8 +16,8 @@ - - + + @@ -27,24 +27,24 @@ - - - - + + + + - - + + - - + + - + - - + + - - + + @@ -58,8 +58,8 @@ - - + + @@ -70,24 +70,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -100,8 +100,8 @@ - - + + @@ -150,10 +150,10 @@ - - - - + + + + @@ -162,14 +162,14 @@ - - - - - - - - + + + + + + + + @@ -178,24 +178,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -205,12 +205,12 @@ - - - - - - + + + + + + @@ -220,44 +220,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -267,17 +267,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -287,28 +287,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -318,15 +318,15 @@ - - - - - - - - - + + + + + + + + + @@ -336,15 +336,15 @@ - - - - - - - - - + + + + + + + + + @@ -355,9 +355,9 @@ - - - + + + @@ -371,7 +371,7 @@ - + @@ -423,16 +423,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs index 551ca3b8..4f12d8c4 100644 --- a/deployment/windows/wixSetup/coati.wxs +++ b/deployment/windows/wixSetup/coati.wxs @@ -1,10 +1,13 @@ - + - + + @@ -97,14 +101,13 @@ - - - - - - - - + + + + + + + @@ -266,6 +269,7 @@ + @@ -281,8 +285,8 @@ + - @@ -325,6 +329,7 @@ + SELFFOUND NEWERFOUND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs index ae20b8d4..052f8b61 100644 --- a/deployment/windows/wixSetup/installDir.wxs +++ b/deployment/windows/wixSetup/installDir.wxs @@ -246,6 +246,13 @@ + + + + + + + diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh index f97165a4..490eb7ae 100644 --- a/script/deploy_windows.sh +++ b/script/deploy_windows.sh @@ -1,7 +1,7 @@ # FLAGS -REBUILD=true -OBFUSCATE=true -UPDATE_DATABASES=true +REBUILD=false +OBFUSCATE=false +UPDATE_DATABASES=false # USEFUL VARIABLES diff --git a/setup/Linux/Coati.sh b/setup/Linux/Coati.sh index 1d2fb218..975da5ea 100755 --- a/setup/Linux/Coati.sh +++ b/setup/Linux/Coati.sh @@ -10,13 +10,13 @@ done COATI_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )" #setup data folder -if [ ! -d "${HOME}/.config/coati" ]; then - # Control will enter here if $DIRECTORY doesn't exist. - mkdir -p "${HOME}/.config/coati" - echo "First start of Coati from this user, copy default configfiles to ~/.config/coati" -fi +#if [ ! -d "${HOME}/.config/coati" ]; then + ## Control will enter here if $DIRECTORY doesn't exist. + #mkdir -p "${HOME}/.config/coati" + #echo "First start of Coati from this user, copy default configfiles to ~/.config/coati" +#fi -cp -rn "$COATI_PATH/user"/* "${HOME}/.config/coati/" +#cp -rn "$COATI_PATH/user"/* "${HOME}/.config/coati/" export LD_LIBRARY_PATH="$COATI_PATH/lib:$LD_LIBRARY_PATH" export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT" diff --git a/setup/MacOSX/bundle_install.sh.in b/setup/MacOSX/bundle_install.sh.in index cc791340..f21b6fe4 100755 --- a/setup/MacOSX/bundle_install.sh.in +++ b/setup/MacOSX/bundle_install.sh.in @@ -77,22 +77,18 @@ cp $APP_NAME $APP_PATH cp bundle_info.plist $BUNDLE_PATH/Contents/Info.plist mkdir -p $RES_DIR/data -mkdir -p $RES_DIR/data/projects cp -R ../data/color_schemes $RES_DIR/data/color_schemes cp -R ../data/fonts $RES_DIR/data/fonts cp -R ../data/gui $RES_DIR/data/gui cp -R ../data/java $RES_DIR/data/java - -cp -R ../data/projects/tictactoe $RES_DIR/data/projects/tictactoe -cp -R ../data/projects/tutorial $RES_DIR/data/projects/tutorial -cp -R ../data/projects/javaparser $RES_DIR/data/projects/javaparser +cp -R ../user/projects $RES_DIR/data/projects mkdir -p $RES_DIR/user mkdir -p $RES_DIR/user/log cp ../user/window_settings.ini $RES_DIR/user/window_settings.ini -cp ../user/ApplicationSettings_for_package.xml $RES_DIR/user/ApplicationSettings.xml +cp ../data/fallback/ApplicationSettings.xml $RES_DIR/user/ApplicationSettings.xml echo -e $INFO "Copying dynamic libraries." for LIB_PATH in ${DYNLIB_PATHS[@]} @@ -209,9 +205,9 @@ convert $ICON -resize 1024x1024 $ICON_SET/icon_512x512@2x.png iconutil -c icns -o $RES_DIR/project.icns $ICON_SET -echo -e $INFO "Obfuscate binary" +# echo -e $INFO "Obfuscate binary" # upx -1 $APP_PATH -upx --best $APP_PATH +# upx --best $APP_PATH echo -e $INFO "create DMG" hdiutil create ${PACKAGE_DIR}.dmg -volname ${PACKAGE_DIR} -srcfolder ${PACKAGE_DIR} diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp index f43561e6..bf992aab 100644 --- a/src/lib/settings/ApplicationSettings.cpp +++ b/src/lib/settings/ApplicationSettings.cpp @@ -3,6 +3,7 @@ #include "utility/ResourcePaths.h" #include "utility/Status.h" #include "utility/utility.h" +#include "utility/UserPaths.h" const size_t ApplicationSettings::VERSION = 1; @@ -307,7 +308,14 @@ std::vector ApplicationSettings::getRecentProjects() const for (FilePath project: loadedRecentProjects) { + if (project.isAbsolute()) + { recentProjects.push_back(project); + } + else + { + recentProjects.push_back(UserPaths::getSampleProjectsPath() + project.str()); + } } return recentProjects; } diff --git a/src/lib/utility/UserPaths.cpp b/src/lib/utility/UserPaths.cpp index d8b08b5d..7a853e91 100644 --- a/src/lib/utility/UserPaths.cpp +++ b/src/lib/utility/UserPaths.cpp @@ -1,6 +1,7 @@ #include "utility/UserPaths.h" std::string UserPaths::s_userDataPath = ""; +std::string UserPaths::s_sampleProjectsPath = ""; std::string UserPaths::getUserDataPath() { @@ -12,6 +13,21 @@ void UserPaths::setUserDataPath(const std::string& path) s_userDataPath = path; } +std::string UserPaths::getSampleProjectsPath() +{ + if (s_sampleProjectsPath.size()) + { + return s_sampleProjectsPath; + } + + return s_userDataPath; +} + +void UserPaths::setSampleProjectsPath(const std::string& path) +{ + s_sampleProjectsPath = path; +} + std::string UserPaths::getAppSettingsPath() { return getUserDataPath() + "ApplicationSettings.xml"; diff --git a/src/lib/utility/UserPaths.h b/src/lib/utility/UserPaths.h index a8e22062..51c0696b 100644 --- a/src/lib/utility/UserPaths.h +++ b/src/lib/utility/UserPaths.h @@ -9,12 +9,16 @@ public: static std::string getUserDataPath(); static void setUserDataPath(const std::string& path); + static std::string getSampleProjectsPath(); + static void setSampleProjectsPath(const std::string& path); + static std::string getAppSettingsPath(); static std::string getWindowSettingsPath(); static std::string getLogPath(); private: static std::string s_userDataPath; + static std::string s_sampleProjectsPath; }; #endif // USER_PATHS_H diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h index 2e3a19fb..12ed3a7d 100644 --- a/src/lib_gui/platform_includes/includesLinux.h +++ b/src/lib_gui/platform_includes/includesLinux.h @@ -32,7 +32,7 @@ void setupApp(int argc, char *argv[]) dataDir.mkpath(userDataPath); } - utility::copyNewFilesFromDirectory(QString::fromStdString(AppPath::getAppPath() + "/usr/" ), userDataPath); + utility::copyNewFilesFromDirectory(QString::fromStdString(AppPath::getAppPath() + "/user/" ), userDataPath); } #endif // INCLUDES_DEFAULT_H diff --git a/src/lib_gui/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h index d1c39d80..573d0895 100644 --- a/src/lib_gui/platform_includes/includesMac.h +++ b/src/lib_gui/platform_includes/includesMac.h @@ -62,7 +62,7 @@ void setupPlatform(int argc, char *argv[]) dataDir.mkpath(dataPath); } - utility::copyNewFilesFromDirectory(QString::fromStdString(UserPaths::getUserDataPath()), dataPath); + utility::copyNewFilesFromDirectory(QString::fromStdString(UserPaths::getUserDataPath() + "user/"), dataPath); UserPaths::setUserDataPath(dataPath.toStdString() + "/"); // ---------------------------------------------------------------------------- @@ -79,6 +79,10 @@ void setupApp(int argc, char *argv[]) { UserPaths::setUserDataPath(path.absolute().str() + "/user/"); } + else + { + UserPaths::setSampleProjectsPath(path.absolute().str() + "/data/"); + } } #endif // INCLUDES_MAC_H diff --git a/src/lib_gui/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h index 0c4d30e1..1981a087 100644 --- a/src/lib_gui/platform_includes/includesWindows.h +++ b/src/lib_gui/platform_includes/includesWindows.h @@ -6,6 +6,7 @@ #include "vld.h" +#include "utility/file/FileSystem.h" #include "utility/UserPaths.h" #include "platform_includes/deploy.h" @@ -25,6 +26,10 @@ void setupApp(int argc, char *argv[]) path += "/user/"; UserPaths::setUserDataPath(path); #endif + + // These method does nothing if the copy destination already exist + FileSystem::copyFile("data/fallback/ApplicationSettings.xml", UserPaths::getAppSettingsPath()); + FileSystem::copyFile("data/fallback/window_settings.ini", UserPaths::getWindowSettingsPath()); } #endif // INCLUDES_WINDOWS_H