From f59863c62868ba423334bdd72f0e3daf93664750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20T=C3=A2che?= Date: Fri, 3 Jan 2025 22:08:50 +0100 Subject: [PATCH] Adds gpg, sonatype, changes groupId --- README.md | 6 +- api/pom.xml | 4 +- .../fxml/compiler/ControllerFieldInfo.java | 2 +- .../ControllerFieldInjectionType.java | 2 +- .../gtache/fxml/compiler/ControllerInfo.java | 2 +- .../compiler/ControllerInjectionType.java | 2 +- .../ControllerMethodsInjectionType.java | 2 +- .../fxml/compiler/GenerationException.java | 2 +- .../fxml/compiler/GenerationParameters.java | 4 +- .../fxml/compiler/GenerationRequest.java | 4 +- .../gtache/fxml/compiler/Generator.java | 2 +- .../gtache/fxml/compiler/GenericTypes.java | 2 +- .../gtache/fxml/compiler/InjectionType.java | 2 +- .../compiler/ResourceBundleInjectionType.java | 2 +- .../gtache/fxml/compiler/SourceInfo.java | 2 +- .../GenerationCompatibility.java | 2 +- .../compiler/compatibility/ListCollector.java | 2 +- .../fxml/compiler/parsing/FXMLParser.java | 2 +- .../fxml/compiler/parsing/ParseException.java | 2 +- .../fxml/compiler/parsing/ParsedConstant.java | 2 +- .../fxml/compiler/parsing/ParsedCopy.java | 2 +- .../fxml/compiler/parsing/ParsedDefine.java | 2 +- .../fxml/compiler/parsing/ParsedFactory.java | 2 +- .../fxml/compiler/parsing/ParsedInclude.java | 2 +- .../fxml/compiler/parsing/ParsedObject.java | 2 +- .../fxml/compiler/parsing/ParsedProperty.java | 2 +- .../compiler/parsing/ParsedReference.java | 2 +- .../fxml/compiler/parsing/ParsedText.java | 2 +- .../fxml/compiler/parsing/ParsedValue.java | 2 +- api/src/main/java/module-info.java | 8 +- .../compiler/TestControllerFieldInfo.java | 2 +- .../fxml/compiler/TestControllerInfo.java | 2 +- .../compiler/TestGenerationException.java | 2 +- .../TestGenerationCompatibility.java | 2 +- .../fxml/compiler/parsing/TestFXMLParser.java | 2 +- .../compiler/parsing/TestParseException.java | 2 +- .../compiler/parsing/TestParsedConstant.java | 2 +- .../fxml/compiler/parsing/TestParsedCopy.java | 2 +- .../compiler/parsing/TestParsedDefine.java | 2 +- .../compiler/parsing/TestParsedFactory.java | 2 +- .../compiler/parsing/TestParsedInclude.java | 2 +- .../compiler/parsing/TestParsedReference.java | 2 +- .../fxml/compiler/parsing/TestParsedText.java | 2 +- .../compiler/parsing/TestParsedValue.java | 2 +- core/pom.xml | 7 +- .../impl/GenerationCompatibilityImpl.java | 4 +- .../fxml/compiler/impl/ClassesFinder.java | 2 +- .../impl/ControllerFieldInfoImpl.java | 6 +- .../compiler/impl/ControllerInfoImpl.java | 6 +- .../impl/GenerationParametersImpl.java | 14 +- .../compiler/impl/GenerationRequestImpl.java | 12 +- .../fxml/compiler/impl/GeneratorImpl.java | 12 +- .../fxml/compiler/impl/GenericTypesImpl.java | 4 +- .../fxml/compiler/impl/SourceInfoImpl.java | 4 +- .../impl/internal/BindingFormatter.java | 19 +- .../impl/internal/ConstructorArgs.java | 2 +- .../impl/internal/ConstructorHelper.java | 9 +- .../impl/internal/ControllerInjector.java | 15 +- .../impl/internal/ExpressionFormatter.java | 10 +- .../compiler/impl/internal/FieldSetter.java | 15 +- .../compiler/impl/internal/FontFormatter.java | 16 +- .../GenerationCompatibilityHelper.java | 10 +- .../impl/internal/GenerationHelper.java | 8 +- .../impl/internal/GenerationProgress.java | 6 +- .../impl/internal/HelperMethodsFormatter.java | 6 +- .../impl/internal/HelperProvider.java | 2 +- .../impl/internal/ImageFormatter.java | 14 +- .../internal/InitializationFormatter.java | 16 +- .../impl/internal/LoadMethodFormatter.java | 12 +- .../impl/internal/ObjectFormatter.java | 30 +-- .../compiler/impl/internal/Parameter.java | 2 +- .../impl/internal/PropertyFormatter.java | 22 +- .../impl/internal/ReflectionHelper.java | 12 +- .../impl/internal/SceneFormatter.java | 20 +- .../impl/internal/TriangleMeshFormatter.java | 14 +- .../compiler/impl/internal/URLFormatter.java | 12 +- .../impl/internal/ValueClassGuesser.java | 4 +- .../impl/internal/ValueFormatter.java | 10 +- .../compiler/impl/internal/VariableInfo.java | 4 +- .../impl/internal/VariableProvider.java | 2 +- .../impl/internal/WebViewFormatter.java | 16 +- .../parsing/impl/ParsedConstantImpl.java | 6 +- .../compiler/parsing/impl/ParsedCopyImpl.java | 6 +- .../parsing/impl/ParsedDefineImpl.java | 6 +- .../parsing/impl/ParsedFactoryImpl.java | 8 +- .../parsing/impl/ParsedIncludeImpl.java | 6 +- .../parsing/impl/ParsedObjectImpl.java | 6 +- .../parsing/impl/ParsedPropertyImpl.java | 4 +- .../parsing/impl/ParsedReferenceImpl.java | 6 +- .../compiler/parsing/impl/ParsedTextImpl.java | 4 +- .../parsing/impl/ParsedValueImpl.java | 6 +- core/src/main/java/module-info.java | 10 +- .../impl/TestGenerationCompatibilityImpl.java | 4 +- .../fxml/compiler/impl/TestClassesFinder.java | 40 +++ .../impl/TestControllerFieldInfoImpl.java | 6 +- .../compiler/impl/TestControllerInfoImpl.java | 6 +- .../impl/TestGenerationParametersImpl.java | 14 +- .../impl/TestGenerationRequestImpl.java | 12 +- .../fxml/compiler/impl/TestGeneratorImpl.java | 26 +- .../compiler/impl/TestGenericTypesImpl.java | 4 +- .../compiler/impl/TestSourceInfoImpl.java | 4 +- .../impl/internal/TestBindingFormatter.java | 10 +- .../impl/internal/TestConstructorArgs.java | 2 +- .../impl/internal/TestConstructorHelper.java | 10 +- .../impl/internal/TestControllerInjector.java | 26 +- .../internal/TestExpressionFormatter.java | 6 +- .../impl/internal/TestFieldSetter.java | 8 +- .../impl/internal/TestFontFormatter.java | 10 +- .../TestGenerationCompatibilityHelper.java | 10 +- .../impl/internal/TestGenerationHelper.java | 8 +- .../impl/internal/TestGenerationProgress.java | 4 +- .../internal/TestHelperMethodsFormatter.java | 6 +- .../impl/internal/TestHelperProvider.java | 20 +- .../impl/internal/TestImageFormatter.java | 10 +- .../internal/TestInitializationFormatter.java | 250 +++++++++--------- .../internal/TestLoadMethodFormatter.java | 22 +- .../impl/internal/TestObjectFormatter.java | 28 +- .../compiler/impl/internal/TestParameter.java | 2 +- .../impl/internal/TestPropertyFormatter.java | 24 +- .../impl/internal/TestReflectionHelper.java | 16 +- .../impl/internal/TestSceneFormatter.java | 12 +- .../internal/TestTriangleMeshFormatter.java | 10 +- .../impl/internal/TestURLFormatter.java | 10 +- .../impl/internal/TestValueClassGuesser.java | 6 +- .../impl/internal/TestValueFormatter.java | 6 +- .../impl/internal/TestVariableInfo.java | 4 +- .../impl/internal/TestVariableProvider.java | 2 +- .../impl/internal/TestWebViewFormatter.java | 10 +- .../impl/internal/WholeConstructorArgs.java | 2 +- .../parsing/impl/TestParsedConstantImpl.java | 6 +- .../parsing/impl/TestParsedCopyImpl.java | 6 +- .../parsing/impl/TestParsedDefineImpl.java | 6 +- .../parsing/impl/TestParsedFactoryImpl.java | 10 +- .../parsing/impl/TestParsedIncludeImpl.java | 6 +- .../parsing/impl/TestParsedObjectImpl.java | 8 +- .../parsing/impl/TestParsedPropertyImpl.java | 4 +- .../parsing/impl/TestParsedReferenceImpl.java | 6 +- .../parsing/impl/TestParsedTextImpl.java | 4 +- .../parsing/impl/TestParsedValueImpl.java | 6 +- .../fxml/compiler/impl/TestClassesFinder.java | 40 --- maven-plugin/pom.xml | 7 +- .../fxml/compiler/maven/FXMLCompilerMojo.java | 24 +- .../maven/internal/CompilationInfo.java | 2 +- .../internal/CompilationInfoProvider.java | 4 +- .../compiler/maven/internal/Compiler.java | 18 +- .../internal/ControllerInfoProvider.java | 14 +- .../maven/internal/ControllerProvider.java | 2 +- .../compiler/maven/internal/FXMLProvider.java | 2 +- .../compiler/maven/internal/FieldInfo.java | 2 +- .../maven/internal/GenericParser.java | 6 +- .../compiler/maven/internal/Inclusion.java | 2 +- .../maven/internal/SourceInfoProvider.java | 8 +- .../compiler/maven/TestFXMLCompilerMojo.java | 24 +- .../maven/internal/TestCompilationInfo.java | 3 +- .../internal/TestCompilationInfoBuilder.java | 2 +- .../internal/TestCompilationInfoProvider.java | 29 +- .../compiler/maven/internal/TestCompiler.java | 16 +- .../internal/TestControllerInfoProvider.java | 16 +- .../internal/TestControllerProvider.java | 2 +- .../maven/internal/TestFXMLProvider.java | 2 +- .../maven/internal/TestFieldInfo.java | 2 +- .../maven/internal/TestGenericParser.java | 4 +- .../maven/internal/TestInclusion.java | 2 +- .../internal/TestSourceInfoProvider.java | 4 +- .../maven/internal/com_plex-view.fxml | 2 +- .../compiler/maven/internal/infoView.fxml | 2 +- .../maven/internal/missingSource.fxml | 2 +- .../compiler/maven/internal/noController.fxml | 0 .../maven/internal/noResourceBundle.fxml | 2 +- .../compiler/maven/internal/unknownOn.fxml | 2 +- pom.xml | 71 ++++- xml/pom.xml | 7 +- .../compiler/parsing/xml/DOMFXMLParser.java | 19 +- xml/src/main/java/module-info.java | 6 +- .../parsing/xml/TestDOMFXMLParser.java | 10 +- .../parsing/xml/IncludedBundle.properties | 0 .../compiler/parsing/xml/includedView.fxml | 2 +- .../compiler/parsing/xml/invalidDefine.fxml | 2 +- .../compiler/parsing/xml/invalidFactory.fxml | 2 +- .../fxml/compiler/parsing/xml/loadRoot.fxml | 2 +- .../fxml/compiler/parsing/xml/loadScript.fxml | 2 +- .../fxml/compiler/parsing/xml/loadView.fxml | 4 +- .../compiler/parsing/xml/unknownClass.fxml | 2 +- 183 files changed, 860 insertions(+), 779 deletions(-) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ControllerFieldInfo.java (93%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ControllerFieldInjectionType.java (89%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ControllerInfo.java (97%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ControllerInjectionType.java (85%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ControllerMethodsInjectionType.java (85%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/GenerationException.java (94%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/GenerationParameters.java (91%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/GenerationRequest.java (88%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/Generator.java (89%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/GenericTypes.java (90%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/InjectionType.java (83%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/ResourceBundleInjectionType.java (93%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/SourceInfo.java (96%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/compatibility/GenerationCompatibility.java (95%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/compatibility/ListCollector.java (85%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/FXMLParser.java (94%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParseException.java (93%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedConstant.java (94%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedCopy.java (95%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedDefine.java (92%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedFactory.java (95%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedInclude.java (97%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedObject.java (94%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedProperty.java (90%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedReference.java (95%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedText.java (94%) rename api/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/ParsedValue.java (94%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/TestControllerFieldInfo.java (94%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/TestControllerInfo.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/TestGenerationException.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestFXMLParser.java (96%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParseException.java (96%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedConstant.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedCopy.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedDefine.java (93%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedFactory.java (96%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedInclude.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedReference.java (97%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedText.java (94%) rename api/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/TestParsedValue.java (97%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java (78%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/ClassesFinder.java (98%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java (80%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/ControllerInfoImpl.java (89%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/GenerationParametersImpl.java (82%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/GenerationRequestImpl.java (78%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/GeneratorImpl.java (88%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/GenericTypesImpl.java (85%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/SourceInfoImpl.java (94%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/BindingFormatter.java (86%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ConstructorArgs.java (93%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ConstructorHelper.java (96%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ControllerInjector.java (92%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java (93%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/FieldSetter.java (91%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/FontFormatter.java (92%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java (85%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/GenerationHelper.java (93%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/GenerationProgress.java (89%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java (97%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/HelperProvider.java (99%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ImageFormatter.java (91%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/InitializationFormatter.java (96%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java (91%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ObjectFormatter.java (96%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/Parameter.java (92%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/PropertyFormatter.java (95%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ReflectionHelper.java (98%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/SceneFormatter.java (89%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java (93%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/URLFormatter.java (88%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java (96%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/ValueFormatter.java (94%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/VariableInfo.java (88%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/VariableProvider.java (96%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/WebViewFormatter.java (90%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java (87%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java (84%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java (71%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java (82%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java (90%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java (87%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java (84%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java (85%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java (77%) rename core/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java (87%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java (83%) create mode 100644 core/src/test/java/ch/gtache/fxml/compiler/impl/TestClassesFinder.java rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java (89%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestControllerInfoImpl.java (94%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java (89%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java (87%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestGeneratorImpl.java (79%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestGenericTypesImpl.java (93%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/TestSourceInfoImpl.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestControllerInjector.java (81%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestFieldSetter.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestFontFormatter.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java (94%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java (91%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java (98%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestHelperProvider.java (92%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestImageFormatter.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java (67%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java (92%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestParameter.java (94%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestURLFormatter.java (93%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestValueFormatter.java (96%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestVariableInfo.java (93%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestVariableProvider.java (95%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java (97%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java (91%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java (91%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java (88%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java (91%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java (92%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java (92%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java (89%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java (91%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java (83%) rename core/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java (91%) delete mode 100644 core/src/test/java/com/github/gtache/fxml/compiler/impl/TestClassesFinder.java rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/FXMLCompilerMojo.java (92%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/CompilationInfo.java (98%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java (98%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/Compiler.java (85%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java (93%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/ControllerProvider.java (96%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/FXMLProvider.java (97%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/FieldInfo.java (88%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/GenericParser.java (94%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/Inclusion.java (92%) rename maven-plugin/src/main/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java (86%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java (92%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java (98%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java (97%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java (82%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestCompiler.java (93%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java (88%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestControllerProvider.java (96%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java (97%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestFieldInfo.java (93%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestGenericParser.java (96%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestInclusion.java (94%) rename maven-plugin/src/test/java/{com/github => ch}/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java (95%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/com_plex-view.fxml (69%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/infoView.fxml (86%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/missingSource.fxml (80%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/noController.fxml (100%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml (86%) rename maven-plugin/src/test/resources/{com/github => ch}/gtache/fxml/compiler/maven/internal/unknownOn.fxml (82%) rename xml/src/main/java/{com/github => ch}/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java (95%) rename xml/src/test/java/{com/github => ch}/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java (95%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/IncludedBundle.properties (100%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/includedView.fxml (67%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml (76%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml (83%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/loadRoot.fxml (67%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/loadScript.fxml (66%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/loadView.fxml (92%) rename xml/src/test/resources/{com/github => ch}/gtache/fxml/compiler/parsing/xml/unknownClass.fxml (65%) diff --git a/README.md b/README.md index d7652d0..e1eef54 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add the plugin to your project: - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-maven-plugin 1.0.0 @@ -41,7 +41,7 @@ Optionally add dependencies to the plugin (e.g. when using MediaView and control - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-maven-plugin 1.0.0 @@ -114,7 +114,7 @@ There are four ways to inject fields into a controller: - `SETTERS`: controller setters methods - `controller.setField(value)` - `FACTORY`: controller factory - - `controller = factory.create(fieldMap)` + - `controller = factory.apply(fieldMap)` - `factory` is a `Function, Controller>` instance that is created at runtime and passed to the view. - `fieldMap` is a map of field name (String) to value (Object) that is computed during the view `load` method. diff --git a/api/pom.xml b/api/pom.xml index 4d843c3..decb91d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,11 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler 1.0-SNAPSHOT fxml-compiler-api + fxml-compiler-api + API module for the fxml-compiler project \ No newline at end of file diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java b/api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInfo.java similarity index 93% rename from api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java rename to api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInfo.java index 1a324be..2d1554d 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInjectionType.java b/api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInjectionType.java similarity index 89% rename from api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInjectionType.java rename to api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInjectionType.java index 42a5989..8764857 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInjectionType.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ControllerFieldInjectionType.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Base field {@link InjectionType}s diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java b/api/src/main/java/ch/gtache/fxml/compiler/ControllerInfo.java similarity index 97% rename from api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java rename to api/src/main/java/ch/gtache/fxml/compiler/ControllerInfo.java index 6841f81..439ac2f 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ControllerInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import java.util.Map; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInjectionType.java b/api/src/main/java/ch/gtache/fxml/compiler/ControllerInjectionType.java similarity index 85% rename from api/src/main/java/com/github/gtache/fxml/compiler/ControllerInjectionType.java rename to api/src/main/java/ch/gtache/fxml/compiler/ControllerInjectionType.java index cebe7bb..6964a1b 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInjectionType.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ControllerInjectionType.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Base controller {@link InjectionType}s diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerMethodsInjectionType.java b/api/src/main/java/ch/gtache/fxml/compiler/ControllerMethodsInjectionType.java similarity index 85% rename from api/src/main/java/com/github/gtache/fxml/compiler/ControllerMethodsInjectionType.java rename to api/src/main/java/ch/gtache/fxml/compiler/ControllerMethodsInjectionType.java index de48366..4847058 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerMethodsInjectionType.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ControllerMethodsInjectionType.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Base methods {@link InjectionType}s diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationException.java b/api/src/main/java/ch/gtache/fxml/compiler/GenerationException.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/GenerationException.java rename to api/src/main/java/ch/gtache/fxml/compiler/GenerationException.java index 002993a..1ef3efa 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationException.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/GenerationException.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Exception thrown when a generation error occurs diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationParameters.java b/api/src/main/java/ch/gtache/fxml/compiler/GenerationParameters.java similarity index 91% rename from api/src/main/java/com/github/gtache/fxml/compiler/GenerationParameters.java rename to api/src/main/java/ch/gtache/fxml/compiler/GenerationParameters.java index ac6232a..92be242 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationParameters.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/GenerationParameters.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; import java.util.Map; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationRequest.java b/api/src/main/java/ch/gtache/fxml/compiler/GenerationRequest.java similarity index 88% rename from api/src/main/java/com/github/gtache/fxml/compiler/GenerationRequest.java rename to api/src/main/java/ch/gtache/fxml/compiler/GenerationRequest.java index 46967d8..beb8910 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/GenerationRequest.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/GenerationRequest.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedObject; /** * Represents a request for a code generation diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/Generator.java b/api/src/main/java/ch/gtache/fxml/compiler/Generator.java similarity index 89% rename from api/src/main/java/com/github/gtache/fxml/compiler/Generator.java rename to api/src/main/java/ch/gtache/fxml/compiler/Generator.java index 9bfd8d4..122ca04 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/Generator.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/Generator.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Generates compiled FXML code diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/GenericTypes.java b/api/src/main/java/ch/gtache/fxml/compiler/GenericTypes.java similarity index 90% rename from api/src/main/java/com/github/gtache/fxml/compiler/GenericTypes.java rename to api/src/main/java/ch/gtache/fxml/compiler/GenericTypes.java index 447fc4b..24bf553 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/GenericTypes.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/GenericTypes.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/InjectionType.java b/api/src/main/java/ch/gtache/fxml/compiler/InjectionType.java similarity index 83% rename from api/src/main/java/com/github/gtache/fxml/compiler/InjectionType.java rename to api/src/main/java/ch/gtache/fxml/compiler/InjectionType.java index 43725c5..3b4ebf3 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/InjectionType.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/InjectionType.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * A type of injection for controllers diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ResourceBundleInjectionType.java b/api/src/main/java/ch/gtache/fxml/compiler/ResourceBundleInjectionType.java similarity index 93% rename from api/src/main/java/com/github/gtache/fxml/compiler/ResourceBundleInjectionType.java rename to api/src/main/java/ch/gtache/fxml/compiler/ResourceBundleInjectionType.java index 34cedab..b452f1d 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ResourceBundleInjectionType.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/ResourceBundleInjectionType.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; /** * Base {@link InjectionType}s for resource bundles diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/SourceInfo.java b/api/src/main/java/ch/gtache/fxml/compiler/SourceInfo.java similarity index 96% rename from api/src/main/java/com/github/gtache/fxml/compiler/SourceInfo.java rename to api/src/main/java/ch/gtache/fxml/compiler/SourceInfo.java index 741042f..ac0437e 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/SourceInfo.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/SourceInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import java.nio.file.Path; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/compatibility/GenerationCompatibility.java b/api/src/main/java/ch/gtache/fxml/compiler/compatibility/GenerationCompatibility.java similarity index 95% rename from api/src/main/java/com/github/gtache/fxml/compiler/compatibility/GenerationCompatibility.java rename to api/src/main/java/ch/gtache/fxml/compiler/compatibility/GenerationCompatibility.java index a31190c..659463c 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/compatibility/GenerationCompatibility.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/compatibility/GenerationCompatibility.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.compatibility; +package ch.gtache.fxml.compiler.compatibility; /** * Compatibility information for generated code diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/compatibility/ListCollector.java b/api/src/main/java/ch/gtache/fxml/compiler/compatibility/ListCollector.java similarity index 85% rename from api/src/main/java/com/github/gtache/fxml/compiler/compatibility/ListCollector.java rename to api/src/main/java/ch/gtache/fxml/compiler/compatibility/ListCollector.java index 0ca25cd..807fadb 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/compatibility/ListCollector.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/compatibility/ListCollector.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.compatibility; +package ch.gtache.fxml.compiler.compatibility; /** * Type of list collector to use for generated code diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/FXMLParser.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/FXMLParser.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/FXMLParser.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/FXMLParser.java index 9f5ff8a..37c8fc1 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/FXMLParser.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/FXMLParser.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.io.IOException; import java.nio.file.Files; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParseException.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParseException.java similarity index 93% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParseException.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParseException.java index 651f7b5..d64d62e 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParseException.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParseException.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; /** * Exception thrown when a parsing error occurs diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedConstant.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedConstant.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedConstant.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedConstant.java index 05d2597..ab50369 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedConstant.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedConstant.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedCopy.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedCopy.java similarity index 95% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedCopy.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedCopy.java index 9575d61..baac706 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedCopy.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedCopy.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedDefine.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedDefine.java similarity index 92% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedDefine.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedDefine.java index 960798a..a098811 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedDefine.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedDefine.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.Map; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedFactory.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedFactory.java similarity index 95% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedFactory.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedFactory.java index 5b875d3..0385f18 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedFactory.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedFactory.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.SequencedCollection; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedInclude.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedInclude.java similarity index 97% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedInclude.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedInclude.java index e67a611..ce4ae01 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedInclude.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedInclude.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedObject.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedObject.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedObject.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedObject.java index 12c257b..f055d7d 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedObject.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedObject.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.Map; import java.util.SequencedCollection; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedProperty.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedProperty.java similarity index 90% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedProperty.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedProperty.java index 1445432..3f44911 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedProperty.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedProperty.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; /** * Parsed property/attribute from FXML diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedReference.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedReference.java similarity index 95% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedReference.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedReference.java index a6361a0..33c9c22 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedReference.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedReference.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedText.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedText.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedText.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedText.java index c895bb9..7a397a9 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedText.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedText.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedValue.java b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedValue.java similarity index 94% rename from api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedValue.java rename to api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedValue.java index 9cbd819..11d4df4 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/parsing/ParsedValue.java +++ b/api/src/main/java/ch/gtache/fxml/compiler/parsing/ParsedValue.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import java.util.LinkedHashMap; import java.util.List; diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java index 3802d1b..a26d013 100644 --- a/api/src/main/java/module-info.java +++ b/api/src/main/java/module-info.java @@ -1,8 +1,8 @@ /** * API module for FXML compiler */ -module com.github.gtache.fxml.compiler.api { - exports com.github.gtache.fxml.compiler; - exports com.github.gtache.fxml.compiler.compatibility; - exports com.github.gtache.fxml.compiler.parsing; +module ch.gtache.fxml.compiler.api { + exports ch.gtache.fxml.compiler; + exports ch.gtache.fxml.compiler.compatibility; + exports ch.gtache.fxml.compiler.parsing; } \ No newline at end of file diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java b/api/src/test/java/ch/gtache/fxml/compiler/TestControllerFieldInfo.java similarity index 94% rename from api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java rename to api/src/test/java/ch/gtache/fxml/compiler/TestControllerFieldInfo.java index 6097b51..d00adf4 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/TestControllerFieldInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java b/api/src/test/java/ch/gtache/fxml/compiler/TestControllerInfo.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java rename to api/src/test/java/ch/gtache/fxml/compiler/TestControllerInfo.java index 4d76b82..1381b4c 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/TestControllerInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/TestGenerationException.java b/api/src/test/java/ch/gtache/fxml/compiler/TestGenerationException.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/TestGenerationException.java rename to api/src/test/java/ch/gtache/fxml/compiler/TestGenerationException.java index d4e233b..c435d9e 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/TestGenerationException.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/TestGenerationException.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler; +package ch.gtache.fxml.compiler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java b/api/src/test/java/ch/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java rename to api/src/test/java/ch/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java index ea6c0d1..c323d56 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/compatibility/TestGenerationCompatibility.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.compatibility; +package ch.gtache.fxml.compiler.compatibility; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestFXMLParser.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestFXMLParser.java similarity index 96% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestFXMLParser.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestFXMLParser.java index 33a6a09..c55dd64 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestFXMLParser.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestFXMLParser.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParseException.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParseException.java similarity index 96% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParseException.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParseException.java index a44a6aa..2b6b7ec 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParseException.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParseException.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedConstant.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedConstant.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedConstant.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedConstant.java index a65c446..3bc7a88 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedConstant.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedConstant.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedCopy.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedCopy.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedCopy.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedCopy.java index e8be11c..89131cc 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedCopy.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedCopy.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedDefine.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedDefine.java similarity index 93% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedDefine.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedDefine.java index 0337d17..2487cae 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedDefine.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedDefine.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedFactory.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedFactory.java similarity index 96% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedFactory.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedFactory.java index 9561ad3..b1498ae 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedFactory.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedFactory.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedInclude.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedInclude.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedInclude.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedInclude.java index 5219b7f..8be4cc8 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedInclude.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedInclude.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedReference.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedReference.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedReference.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedReference.java index d63f3b4..6526aa1 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedReference.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedReference.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedText.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedText.java similarity index 94% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedText.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedText.java index bda2d15..5300710 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedText.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedText.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedValue.java b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedValue.java similarity index 97% rename from api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedValue.java rename to api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedValue.java index 5f289f6..9db665e 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/parsing/TestParsedValue.java +++ b/api/src/test/java/ch/gtache/fxml/compiler/parsing/TestParsedValue.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.parsing; +package ch.gtache.fxml.compiler.parsing; import org.junit.jupiter.api.BeforeEach; diff --git a/core/pom.xml b/core/pom.xml index ef98270..130e468 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,16 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler 1.0-SNAPSHOT fxml-compiler-core + fxml-compiler-core + Core module for the fxml-compiler project + - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-api diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java similarity index 78% rename from core/src/main/java/com/github/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java index d7b798c..2387bbc 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/compatibility/impl/GenerationCompatibilityImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.compatibility.impl; +package ch.gtache.fxml.compiler.compatibility.impl; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; /** * Implementation of {@link GenerationCompatibility} diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ClassesFinder.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/ClassesFinder.java similarity index 98% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/ClassesFinder.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/ClassesFinder.java index df1128b..e654dbf 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ClassesFinder.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/ClassesFinder.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; import java.io.IOException; import java.net.URI; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java similarity index 80% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java index fd3946a..a4069b0 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.GenericTypes; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerInfoImpl.java similarity index 89% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerInfoImpl.java index d6c1aab..207c2a7 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/ControllerInfoImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.ControllerInfo; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationParametersImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationParametersImpl.java similarity index 82% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationParametersImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationParametersImpl.java index e6bd8eb..2c78de9 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationParametersImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationParametersImpl.java @@ -1,11 +1,11 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationRequestImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationRequestImpl.java similarity index 78% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationRequestImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationRequestImpl.java index 89ccb0d..b9628a0 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenerationRequestImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenerationRequestImpl.java @@ -1,10 +1,10 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GeneratorImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/GeneratorImpl.java similarity index 88% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/GeneratorImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/GeneratorImpl.java index 4582f5f..64b600e 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GeneratorImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/GeneratorImpl.java @@ -1,10 +1,10 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.Generator; -import com.github.gtache.fxml.compiler.impl.internal.GenerationProgress; -import com.github.gtache.fxml.compiler.impl.internal.HelperProvider; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.Generator; +import ch.gtache.fxml.compiler.impl.internal.GenerationProgress; +import ch.gtache.fxml.compiler.impl.internal.HelperProvider; import java.util.Objects; import java.util.function.Function; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenericTypesImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenericTypesImpl.java similarity index 85% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/GenericTypesImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/GenericTypesImpl.java index e7ce8d4..68433e3 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/GenericTypesImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/GenericTypesImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.GenericTypes; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/SourceInfoImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/SourceInfoImpl.java similarity index 94% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/SourceInfoImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/SourceInfoImpl.java index 6f960aa..4bbd894 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/SourceInfoImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/SourceInfoImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.SourceInfo; import java.nio.file.Path; import java.util.List; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/BindingFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/BindingFormatter.java similarity index 86% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/BindingFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/BindingFormatter.java index a5bf357..9ebd1cf 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/BindingFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/BindingFormatter.java @@ -1,22 +1,22 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import javafx.beans.property.Property; import javafx.beans.property.ReadOnlyProperty; import java.util.Arrays; import java.util.SequencedCollection; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; /** * Formatter for property bindings */ -class BindingFormatter { +final class BindingFormatter { private static final String PROPERTY = "Property"; @@ -72,10 +72,11 @@ class BindingFormatter { if (bidirectional ? hasWriteProperty(className, methodName) : hasReadProperty(className, methodName)) { final var returnType = ReflectionHelper.getReturnType(className, methodName); final var expression = helperProvider.getExpressionFormatter().format(value, returnType); + final var binding = INDENT_8 + parentVariable + "." + methodName + "()." + bindMethod + "(" + expression + ");\n"; if (isControllerWithFactory(value)) { - controllerFactoryPostAction.add(INDENT_8 + parentVariable + "." + methodName + "()." + bindMethod + "(" + expression + ");\n"); + controllerFactoryPostAction.add(binding); } else { - sb.append(INDENT_8).append(parentVariable).append(".").append(methodName).append("().").append(bindMethod).append("(").append(expression).append(");\n"); + sb.append(binding); } } else { throw new GenerationException("Cannot bind " + name + " on " + className); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorArgs.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorArgs.java similarity index 93% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorArgs.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorArgs.java index b1fe5f8..7c363d1 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorArgs.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorArgs.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import java.lang.reflect.Constructor; import java.util.Collections; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorHelper.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorHelper.java similarity index 96% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorHelper.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorHelper.java index 19351d6..f11925a 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ConstructorHelper.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ConstructorHelper.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -40,6 +40,7 @@ final class ConstructorHelper { final var type = parameter.type(); final var p = parsedObject.attributes().get(entry.getKey()); if (p == null) { + //Check if it is a complex property: If yes, throw an exception final var c = parsedObject.properties().entrySet().stream().filter(e -> e.getKey().name().equals(entry.getKey())).findFirst().orElse(null); if (c == null) { diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ControllerInjector.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ControllerInjector.java similarity index 92% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ControllerInjector.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ControllerInjector.java index 00f5396..7f99b86 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ControllerInjector.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ControllerInjector.java @@ -1,14 +1,14 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.SequencedCollection; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.INDENT_8; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.INDENT_8; import static java.util.Objects.requireNonNull; /** @@ -98,6 +98,7 @@ final class ControllerInjector { final var controllerMethod = property.value().replace("#", ""); return switch (methodInjectionType) { case REFERENCE -> { + // Checks if the method has the event as argument final var hasArgument = controllerInfo.handlerHasArgument(controllerMethod); if (hasArgument) { yield INDENT_8 + parentVariable + "." + setMethod + "(controller::" + controllerMethod + ");\n"; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java similarity index 93% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java index fe76ec9..c424dc5 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ExpressionFormatter.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; import javafx.beans.property.ReadOnlyProperty; import java.util.Arrays; @@ -42,8 +42,10 @@ class ExpressionFormatter { String format(final String expression, final Class returnType) throws GenerationException { final var cleaned = expression.substring(2, expression.length() - 1).trim(); if (cleaned.contains(".")) { + //Reference to the property of an object return getDotExpression(expression, returnType); } else { + //Simple reference to an id return getNonDotExpression(expression); } } @@ -54,12 +56,14 @@ class ExpressionFormatter { if (split.size() == 2) { final var referenced = split.get(0); final var value = split.get(1); + //Checks if it is a reference to the controller if (referenced.equals("controller")) { return getControllerExpression(value, returnType); } else { return getNonControllerExpression(referenced, value); } } else { + //Only supports one level throw new GenerationException("Unsupported binding : " + expression); } } diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FieldSetter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FieldSetter.java similarity index 91% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FieldSetter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FieldSetter.java index f2aa564..bd2dca5 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FieldSetter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FieldSetter.java @@ -1,15 +1,15 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.Objects; import java.util.SequencedCollection; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.EXPRESSION_PREFIX; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.INDENT_8; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.EXPRESSION_PREFIX; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.INDENT_8; import static java.util.Objects.requireNonNull; /** @@ -81,6 +81,7 @@ final class FieldSetter { } private static String getSetString(final ParsedProperty property, final String parentVariable) throws GenerationException { + //If field injection is setter or factory, assume controller has getters final var methodName = GenerationHelper.getSetMethod(property); final var value = property.value().replace(EXPRESSION_PREFIX, ""); final var split = value.split("\\."); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FontFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FontFormatter.java similarity index 92% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FontFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FontFormatter.java index 67fedba..64a6293 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/FontFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/FontFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import javafx.scene.text.FontPosture; import javafx.scene.text.FontWeight; @@ -13,8 +13,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.Objects; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; /** * Helper methods for {@link GeneratorImpl} to format fonts @@ -89,7 +89,7 @@ final class FontFormatter { for (final var property : sortedAttributes) { switch (property.name()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "name" -> { try { diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java similarity index 85% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java index d752d5c..02ec033 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationCompatibilityHelper.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationHelper.java similarity index 93% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationHelper.java index c26b393..09feedc 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationHelper.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationProgress.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationProgress.java similarity index 89% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationProgress.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationProgress.java index 8bed268..8f0bd8d 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationProgress.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/GenerationProgress.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; import java.util.ArrayList; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java similarity index 97% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java index 7793911..2eb2aa7 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperMethodsFormatter.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperProvider.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperProvider.java similarity index 99% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperProvider.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperProvider.java index e2101b2..0e4fe07 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/HelperProvider.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/HelperProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ImageFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ImageFormatter.java similarity index 91% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ImageFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ImageFormatter.java index 7a95cd2..b7c70b1 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ImageFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ImageFormatter.java @@ -1,11 +1,11 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; import static java.util.Objects.requireNonNull; /** @@ -42,7 +42,7 @@ final class ImageFormatter { for (final var property : sortedAttributes) { switch (property.name()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "url" -> url = helperProvider.getURLFormatter().formatURL(property.value()); case "requestedWidth" -> requestedWidth = Double.parseDouble(property.value()); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/InitializationFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/InitializationFormatter.java similarity index 96% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/InitializationFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/InitializationFormatter.java index 0f4155b..7d75883 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/InitializationFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/InitializationFormatter.java @@ -1,12 +1,12 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.InjectionType; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.InjectionType; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; import java.util.HashMap; import java.util.HashSet; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java similarity index 91% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java index 5d1fb6e..61cebba 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/LoadMethodFormatter.java @@ -1,10 +1,10 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; import static java.util.Objects.requireNonNull; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ObjectFormatter.java similarity index 96% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ObjectFormatter.java index 3d5e8fa..d738072 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ObjectFormatter.java @@ -1,18 +1,18 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedConstant; -import com.github.gtache.fxml.compiler.parsing.ParsedCopy; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedFactory; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedReference; -import com.github.gtache.fxml.compiler.parsing.ParsedText; -import com.github.gtache.fxml.compiler.parsing.ParsedValue; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedConstant; +import ch.gtache.fxml.compiler.parsing.ParsedCopy; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedFactory; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedReference; +import ch.gtache.fxml.compiler.parsing.ParsedText; +import ch.gtache.fxml.compiler.parsing.ParsedValue; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import javafx.scene.Node; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -25,7 +25,7 @@ import java.util.List; import java.util.SequencedCollection; import java.util.Set; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; /** diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/Parameter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/Parameter.java similarity index 92% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/Parameter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/Parameter.java index e81cfc1..d95a3eb 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/Parameter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/Parameter.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import static java.util.Objects.requireNonNull; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/PropertyFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/PropertyFormatter.java similarity index 95% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/PropertyFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/PropertyFormatter.java index 2f76a7f..4d3d65d 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/PropertyFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/PropertyFormatter.java @@ -1,14 +1,14 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedText; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedText; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import javafx.event.EventHandler; import java.util.ArrayList; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Objects; import java.util.SequencedCollection; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; /** diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ReflectionHelper.java similarity index 98% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ReflectionHelper.java index 6d4acb6..b748668 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ReflectionHelper.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenericTypes; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import javafx.beans.DefaultProperty; import javafx.beans.NamedArg; import org.apache.logging.log4j.LogManager; @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; /** * Helper methods for reflection diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/SceneFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/SceneFormatter.java similarity index 89% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/SceneFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/SceneFormatter.java index 318733d..5458928 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/SceneFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/SceneFormatter.java @@ -1,11 +1,11 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import javafx.scene.paint.Color; import java.util.ArrayList; @@ -13,8 +13,8 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; import static java.util.Objects.requireNonNull; /** @@ -46,7 +46,7 @@ final class SceneFormatter { for (final var property : sortedAttributes) { switch (property.name()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "width" -> width = Double.parseDouble(property.value()); case "height" -> height = Double.parseDouble(property.value()); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java similarity index 93% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java index eda56ba..3562531 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/TriangleMeshFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import javafx.scene.shape.VertexFormat; import java.util.ArrayList; @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; /** @@ -42,7 +42,7 @@ final class TriangleMeshFormatter { for (final var property : sortedAttributes) { switch (property.name().toLowerCase()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "points" -> { points.clear(); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/URLFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/URLFormatter.java similarity index 88% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/URLFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/URLFormatter.java index e136106..12d8702 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/URLFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/URLFormatter.java @@ -1,13 +1,13 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.util.ArrayList; import java.util.List; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; @@ -54,7 +54,7 @@ final class URLFormatter { for (final var property : sortedAttributes) { switch (property.name()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "value" -> value = property.value(); default -> throw new GenerationException("Unknown URL attribute : " + property.name()); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java similarity index 96% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java index c3d52d2..b3f4861 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueClassGuesser.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueFormatter.java similarity index 94% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueFormatter.java index d2439c3..c41d0a0 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ValueFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/ValueFormatter.java @@ -1,14 +1,14 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.regex.Pattern; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.*; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.*; import static java.util.Objects.requireNonNull; /** diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableInfo.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableInfo.java similarity index 88% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableInfo.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableInfo.java index 5cefbcf..d437deb 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableInfo.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableInfo.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableProvider.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableProvider.java similarity index 96% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableProvider.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableProvider.java index 5c1d50d..f8d074f 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/VariableProvider.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/VariableProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/WebViewFormatter.java b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/WebViewFormatter.java similarity index 90% rename from core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/WebViewFormatter.java rename to core/src/main/java/ch/gtache/fxml/compiler/impl/internal/WebViewFormatter.java index 786d461..c92afad 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/WebViewFormatter.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/impl/internal/WebViewFormatter.java @@ -1,12 +1,12 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; -import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ID; +import static ch.gtache.fxml.compiler.impl.internal.GenerationHelper.getSortedAttributes; import static java.util.Objects.requireNonNull; /** @@ -48,7 +48,7 @@ final class WebViewFormatter { final String variableName, final String engineVariable) throws GenerationException { switch (value.name()) { case FX_ID -> { - //Do nothing + //Do nothing, handled in ObjectFormatter } case "confirmHandler" -> injectConfirmHandler(value, engineVariable); case "createPopupHandler" -> injectCreatePopupHandler(value, engineVariable); diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java similarity index 87% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java index 39cde18..09134ce 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedConstantImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedConstant; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedConstant; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java similarity index 84% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java index 5077607..998d714 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedCopyImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedCopy; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedCopy; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java similarity index 71% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java index ca86371..f381dbb 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedDefineImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import java.util.List; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java similarity index 82% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java index 38c83c9..b6e9542 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedFactoryImpl.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedFactory; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedFactory; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java similarity index 90% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java index 601a083..105d87d 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedIncludeImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java similarity index 87% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java index c683e3f..9f6f3a7 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedObjectImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java similarity index 84% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java index 16ac170..5f82f39 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedPropertyImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import static java.util.Objects.requireNonNull; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java similarity index 85% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java index 042baa4..d055ffe 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedReferenceImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedReference; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedReference; import java.util.Map; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java similarity index 77% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java index 9249d68..e515804 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedTextImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedText; +import ch.gtache.fxml.compiler.parsing.ParsedText; import java.util.Objects; diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java similarity index 87% rename from core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java rename to core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java index 33eab8d..d8239ef 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java +++ b/core/src/main/java/ch/gtache/fxml/compiler/parsing/impl/ParsedValueImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedValue; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedValue; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index b55eddf..44187a4 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -1,13 +1,13 @@ /** * Core module for FXML compiler */ -module com.github.gtache.fxml.compiler.core { - requires transitive com.github.gtache.fxml.compiler.api; +module ch.gtache.fxml.compiler.core { + requires transitive ch.gtache.fxml.compiler.api; requires transitive javafx.graphics; requires org.apache.logging.log4j; requires java.sql; - exports com.github.gtache.fxml.compiler.impl; - exports com.github.gtache.fxml.compiler.parsing.impl; - exports com.github.gtache.fxml.compiler.compatibility.impl; + exports ch.gtache.fxml.compiler.impl; + exports ch.gtache.fxml.compiler.compatibility.impl; + exports ch.gtache.fxml.compiler.parsing.impl; } \ No newline at end of file diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java similarity index 83% rename from core/src/test/java/com/github/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java index e40d66c..9b44b92 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/compatibility/impl/TestGenerationCompatibilityImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.compatibility.impl; +package ch.gtache.fxml.compiler.compatibility.impl; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/ch/gtache/fxml/compiler/impl/TestClassesFinder.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestClassesFinder.java new file mode 100644 index 0000000..764b33d --- /dev/null +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestClassesFinder.java @@ -0,0 +1,40 @@ +package ch.gtache.fxml.compiler.impl; + +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class TestClassesFinder { + + @Test + void testGetClassesCurrent() throws IOException { + final var expected = Set.of( + "ch.gtache.fxml.compiler.parsing.impl.TestParsedConstantImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedCopyImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedDefineImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedFactoryImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedIncludeImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedObjectImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedPropertyImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedReferenceImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedTextImpl", + "ch.gtache.fxml.compiler.parsing.impl.TestParsedValueImpl"); + final var actual = ClassesFinder.getClasses("ch.gtache.fxml.compiler.parsing.impl"); + assertEquals(expected, actual); + } + + @Test + void testGetClassesJar() throws IOException { + final var expected = Set.of("javafx.beans.DefaultProperty", + "javafx.beans.InvalidationListener", + "javafx.beans.NamedArg", + "javafx.beans.Observable", + "javafx.beans.WeakInvalidationListener", + "javafx.beans.WeakListener"); + final var actual = ClassesFinder.getClasses("javafx.beans"); + assertEquals(expected, actual); + } +} diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java similarity index 89% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java index bc8a3e6..867d510 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.GenericTypes; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerInfoImpl.java similarity index 94% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerInfoImpl.java index 7ef9803..be81142 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestControllerInfoImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.ControllerInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java similarity index 89% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java index 1a4f87f..fa961a9 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationParametersImpl.java @@ -1,11 +1,11 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java similarity index 87% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java index 111a33c..d55e4aa 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenerationRequestImpl.java @@ -1,10 +1,10 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGeneratorImpl.java similarity index 79% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestGeneratorImpl.java index c1cdaec..693e95c 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGeneratorImpl.java @@ -1,13 +1,13 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.Generator; -import com.github.gtache.fxml.compiler.impl.internal.HelperMethodsFormatter; -import com.github.gtache.fxml.compiler.impl.internal.HelperProvider; -import com.github.gtache.fxml.compiler.impl.internal.InitializationFormatter; -import com.github.gtache.fxml.compiler.impl.internal.LoadMethodFormatter; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.Generator; +import ch.gtache.fxml.compiler.impl.internal.HelperMethodsFormatter; +import ch.gtache.fxml.compiler.impl.internal.HelperProvider; +import ch.gtache.fxml.compiler.impl.internal.InitializationFormatter; +import ch.gtache.fxml.compiler.impl.internal.LoadMethodFormatter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,8 +41,8 @@ class TestGeneratorImpl { this.helperMethodsFormatter = requireNonNull(helperMethodsFormatter); this.request = requireNonNull(request); this.controllerInfo = requireNonNull(controllerInfo); - this.outputClassName = "com.github.gtache.fxml.compiler.OutputClass"; - this.className = "com.github.gtache.fxml.compiler.ControllerClass"; + this.outputClassName = "ch.gtache.fxml.compiler.OutputClass"; + this.className = "ch.gtache.fxml.compiler.ControllerClass"; this.generator = new GeneratorImpl(p -> helperProvider); } @@ -59,7 +59,7 @@ class TestGeneratorImpl { @Test void testGenerate() throws GenerationException { final var expected = """ - package com.github.gtache.fxml.compiler; + package ch.gtache.fxml.compiler; /** * Generated code @@ -74,7 +74,7 @@ class TestGeneratorImpl { * @return The controller * @throws IllegalStateException If the view is not loaded */ - public com.github.gtache.fxml.compiler.ControllerClass controller() { + public ch.gtache.fxml.compiler.ControllerClass controller() { if (loaded) { return controller; } else { diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenericTypesImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenericTypesImpl.java similarity index 93% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenericTypesImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenericTypesImpl.java index 8680b18..db6131a 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestGenericTypesImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestGenericTypesImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.GenericTypes; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestSourceInfoImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestSourceInfoImpl.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/TestSourceInfoImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/TestSourceInfoImpl.java index 42eb597..3a3551e 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestSourceInfoImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/TestSourceInfoImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl; +package ch.gtache.fxml.compiler.impl; -import com.github.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.SourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java index e2d9417..d5fff11 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestBindingFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java index c14c01e..7643bd8 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorArgs.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java index 6abc468..135aa4f 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestConstructorHelper.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import javafx.beans.NamedArg; import javafx.scene.control.Spinner; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestControllerInjector.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestControllerInjector.java similarity index 81% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestControllerInjector.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestControllerInjector.java index 2e623da..1498550 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestControllerInjector.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestControllerInjector.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,7 +56,7 @@ class TestControllerInjector { @Test void testInjectControllerFieldAssign() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); injector.injectControllerField(id, variable); final var expected = " controller." + id + " = " + variable + ";\n"; assertEquals(expected, sb.toString()); @@ -65,7 +65,7 @@ class TestControllerInjector { @Test void testInjectControllerFieldSetters() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.SETTERS, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.SETTERS, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); injector.injectControllerField(id, variable); final var expected = " controller." + GenerationHelper.getSetMethod(id) + "(" + variable + ");\n"; assertEquals(expected, sb.toString()); @@ -74,7 +74,7 @@ class TestControllerInjector { @Test void testInjectControllerFieldReflection() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.REFLECTION, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.REFLECTION, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); injector.injectControllerField(id, variable); final var expected = " injectField(\"" + id + "\", " + variable + ");\n"; assertEquals(expected, sb.toString()); @@ -83,7 +83,7 @@ class TestControllerInjector { @Test void testInjectEventHandlerReferenceFactoryNoArgument() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); injector.injectEventHandlerControllerMethod(property, variable); final var expected = " " + variable + "." + GenerationHelper.getSetMethod(property.name()) + "(e -> controller." + property.value().replace("#", "") + "());\n"; assertEquals(1, controllerFactoryPostAction.size()); @@ -93,7 +93,7 @@ class TestControllerInjector { @Test void testInjectEventHandlerReferenceFactoryWithArgument() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); when(controllerInfo.handlerHasArgument(propertyValue.replace("#", ""))).thenReturn(true); injector.injectEventHandlerControllerMethod(property, variable); final var expected = " " + variable + "." + GenerationHelper.getSetMethod(property.name()) + "(controller::" + propertyValue.replace("#", "") + ");\n"; @@ -104,7 +104,7 @@ class TestControllerInjector { @Test void testInjectEventHandlerReflectionAssign() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFLECTION, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, ControllerMethodsInjectionType.REFLECTION, sb, controllerFactoryPostAction); injector.injectEventHandlerControllerMethod(property, variable); final var expected = " " + variable + "." + GenerationHelper.getSetMethod(property.name()) + "(e -> callEventHandlerMethod(\"" + propertyValue.replace("#", "") + "\", e));\n"; assertEquals(expected, sb.toString()); @@ -113,7 +113,7 @@ class TestControllerInjector { @Test void testInjectCallbackReflectionSetters() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFLECTION, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.ASSIGN, ControllerMethodsInjectionType.REFLECTION, sb, controllerFactoryPostAction); injector.injectCallbackControllerMethod(property, variable, "clazz"); final var expected = " " + variable + "." + GenerationHelper.getSetMethod(property.name()) + "(e -> callCallbackMethod(\"" + propertyValue.replace("#", "") + "\", e, clazz));\n"; assertEquals(expected, sb.toString()); @@ -122,7 +122,7 @@ class TestControllerInjector { @Test void testInjectCallbackReferenceFactory() { - final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); + final var injector = new ControllerInjector(controllerInfo, ControllerFieldInjectionType.FACTORY, ControllerMethodsInjectionType.REFERENCE, sb, controllerFactoryPostAction); injector.injectCallbackControllerMethod(property, variable, "clazz"); final var expected = " " + variable + "." + GenerationHelper.getSetMethod(property.name()) + "(controller::" + propertyValue.replace("#", "") + ");\n"; assertEquals(1, controllerFactoryPostAction.size()); diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java index b0bf91b..49fdaab 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestExpressionFormatter.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; import javafx.beans.property.StringProperty; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFieldSetter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFieldSetter.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFieldSetter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFieldSetter.java index 9c8e756..f2a16a2 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFieldSetter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFieldSetter.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFontFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFontFormatter.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFontFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFontFormatter.java index 8f7f335..ce1964b 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestFontFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestFontFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java similarity index 94% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java index 6a342f8..d65bcfb 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationCompatibilityHelper.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; -import com.github.gtache.fxml.compiler.compatibility.ListCollector; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.compatibility.ListCollector; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java index 02c6a7c..da97771 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationHelper.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java index 238cf27..b0ab4d4 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestGenerationProgress.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.GenerationRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java similarity index 98% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java index 7263e5f..0c20f32 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperMethodsFormatter.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperProvider.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperProvider.java similarity index 92% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperProvider.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperProvider.java index 50c4833..8d13a9c 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestHelperProvider.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestHelperProvider.java @@ -1,13 +1,13 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -70,7 +70,7 @@ class TestHelperProvider { final var bindingFormatter = helperProvider.getBindingFormatter(); assertSame(bindingFormatter, helperProvider.getBindingFormatter()); } - + @Test void testControllerInjector() { final var injector = helperProvider.getControllerInjector(); diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestImageFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestImageFormatter.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestImageFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestImageFormatter.java index c75f888..fb1eabb 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestImageFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestImageFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java similarity index 67% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java index 051e74b..2278462 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestInitializationFormatter.java @@ -1,14 +1,14 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -68,10 +68,10 @@ class TestInitializationFormatter { when(compatibilityHelper.getStartVar(anyString())).then(i -> i.getArgument(0)); when(variableProvider.getNextVariableName(anyString())).then(i -> i.getArgument(0)); when(request.parameters()).thenReturn(parameters); - when(request.outputClassName()).thenReturn("com.github.gtache.fxml.OutputClassName"); + when(request.outputClassName()).thenReturn("ch.gtache.fxml.OutputClassName"); when(request.sourceInfo()).thenReturn(sourceInfo); when(request.controllerInfo()).thenReturn(controllerInfo); - when(controllerInfo.className()).thenReturn("com.github.gtache.fxml.ControllerClassName"); + when(controllerInfo.className()).thenReturn("ch.gtache.fxml.ControllerClassName"); when(sourceInfo.sourceToSourceInfo()).thenReturn(sourceToSourceInfo); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.GET_BUNDLE); } @@ -94,15 +94,15 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); when(parameters.fieldInjectionType()).thenReturn(ControllerFieldInjectionType.FACTORY); final var expected = """ - private final java.util.function.Function, com.github.gtache.fxml.ControllerClassName> controllerFactory; - private com.github.gtache.fxml.ControllerClassName controller; + private final java.util.function.Function, ch.gtache.fxml.ControllerClassName> controllerFactory; + private ch.gtache.fxml.ControllerClassName controller; private boolean loaded; /** * Instantiates a new OutputClassName * @param controllerFactory The controller factory */ - public OutputClassName(final java.util.function.Function, com.github.gtache.fxml.ControllerClassName> controllerFactory) { + public OutputClassName(final java.util.function.Function, ch.gtache.fxml.ControllerClassName> controllerFactory) { this.controllerFactory = java.util.Objects.requireNonNull(controllerFactory); } """; @@ -114,15 +114,15 @@ class TestInitializationFormatter { void testFormatBaseFactory() throws GenerationException { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); final var expected = """ - private final java.util.function.Supplier controllerFactory; - private com.github.gtache.fxml.ControllerClassName controller; + private final java.util.function.Supplier controllerFactory; + private ch.gtache.fxml.ControllerClassName controller; private boolean loaded; /** * Instantiates a new OutputClassName * @param controllerFactory The controller factory */ - public OutputClassName(final java.util.function.Supplier controllerFactory) { + public OutputClassName(final java.util.function.Supplier controllerFactory) { this.controllerFactory = java.util.Objects.requireNonNull(controllerFactory); } """; @@ -134,14 +134,14 @@ class TestInitializationFormatter { void testFormatInstance() throws GenerationException { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); final var expected = """ - private final com.github.gtache.fxml.ControllerClassName controller; + private final ch.gtache.fxml.ControllerClassName controller; private boolean loaded; /** * Instantiates a new OutputClassName * @param controller The controller instance */ - public OutputClassName(final com.github.gtache.fxml.ControllerClassName controller) { + public OutputClassName(final ch.gtache.fxml.ControllerClassName controller) { this.controller = java.util.Objects.requireNonNull(controller); } """; @@ -154,7 +154,7 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR); final var expected = """ - private final com.github.gtache.fxml.ControllerClassName controller; + private final ch.gtache.fxml.ControllerClassName controller; private final java.util.ResourceBundle resourceBundle; private boolean loaded; @@ -163,7 +163,7 @@ class TestInitializationFormatter { * @param controller The controller instance * @param resourceBundle The resource bundle */ - public OutputClassName(final com.github.gtache.fxml.ControllerClassName controller, final java.util.ResourceBundle resourceBundle) { + public OutputClassName(final ch.gtache.fxml.ControllerClassName controller, final java.util.ResourceBundle resourceBundle) { this.controller = java.util.Objects.requireNonNull(controller); this.resourceBundle = java.util.Objects.requireNonNull(resourceBundle); } @@ -177,7 +177,7 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_FUNCTION); final var expected = """ - private final com.github.gtache.fxml.ControllerClassName controller; + private final ch.gtache.fxml.ControllerClassName controller; private final java.util.function.Function resourceBundleFunction; private boolean loaded; @@ -186,7 +186,7 @@ class TestInitializationFormatter { * @param controller The controller instance * @param resourceBundleFunction The resource bundle */ - public OutputClassName(final com.github.gtache.fxml.ControllerClassName controller, final java.util.function.Function resourceBundleFunction) { + public OutputClassName(final ch.gtache.fxml.ControllerClassName controller, final java.util.function.Function resourceBundleFunction) { this.controller = java.util.Objects.requireNonNull(controller); this.resourceBundleFunction = java.util.Objects.requireNonNull(resourceBundleFunction); } @@ -200,7 +200,7 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_NAME); final var expected = """ - private final com.github.gtache.fxml.ControllerClassName controller; + private final ch.gtache.fxml.ControllerClassName controller; private final String resourceBundleName; private boolean loaded; @@ -209,7 +209,7 @@ class TestInitializationFormatter { * @param controller The controller instance * @param resourceBundleName The resource bundle */ - public OutputClassName(final com.github.gtache.fxml.ControllerClassName controller, final String resourceBundleName) { + public OutputClassName(final ch.gtache.fxml.ControllerClassName controller, final String resourceBundleName) { this.controller = java.util.Objects.requireNonNull(controller); this.resourceBundleName = java.util.Objects.requireNonNull(resourceBundleName); } @@ -223,28 +223,28 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); when(parameters.fieldInjectionType()).thenReturn(ControllerFieldInjectionType.FACTORY); final var expected = """ - private final java.util.function.Function, com.github.gtache.fxml.ControllerClassName> controllerFactory; - private final java.util.function.Function, com.github.gtache.fxml.Controller2> controller2Factory; - private final java.util.function.Function, com.github.gtache.fxml.Controller3> controller3Factory; - private com.github.gtache.fxml.ControllerClassName controller; + private final java.util.function.Function, ch.gtache.fxml.ControllerClassName> controllerFactory; + private final java.util.function.Function, ch.gtache.fxml.Controller2> controller2Factory; + private final java.util.function.Function, ch.gtache.fxml.Controller3> controller3Factory; + private ch.gtache.fxml.ControllerClassName controller; private boolean loaded; /** * Instantiates a new OutputClassName * @param controllerFactory The controller factory - * @param controller2Factory The subcontroller factory for com.github.gtache.fxml.Controller2 - * @param controller3Factory The subcontroller factory for com.github.gtache.fxml.Controller3 + * @param controller2Factory The subcontroller factory for ch.gtache.fxml.Controller2 + * @param controller3Factory The subcontroller factory for ch.gtache.fxml.Controller3 */ - public OutputClassName(final java.util.function.Function, com.github.gtache.fxml.ControllerClassName> controllerFactory, final java.util.function.Function, com.github.gtache.fxml.Controller2> controller2Factory, final java.util.function.Function, com.github.gtache.fxml.Controller3> controller3Factory) { + public OutputClassName(final java.util.function.Function, ch.gtache.fxml.ControllerClassName> controllerFactory, final java.util.function.Function, ch.gtache.fxml.Controller2> controller2Factory, final java.util.function.Function, ch.gtache.fxml.Controller3> controller3Factory) { this.controllerFactory = java.util.Objects.requireNonNull(controllerFactory); this.controller2Factory = java.util.Objects.requireNonNull(controller2Factory); this.controller3Factory = java.util.Objects.requireNonNull(controller3Factory); } """; final var source2 = mock(SourceInfo.class); - when(source2.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); + when(source2.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(sourceInfo.includedSources()).thenReturn(List.of(source2)); when(source2.includedSources()).thenReturn(List.of(source3)); initializationFormatter.formatFieldsAndConstructor(); @@ -255,28 +255,28 @@ class TestInitializationFormatter { void testHasControllersBaseFactory() throws GenerationException { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); final var expected = """ - private final java.util.function.Supplier controllerFactory; - private final java.util.function.Supplier controller2Factory; - private final java.util.function.Supplier controller3Factory; - private com.github.gtache.fxml.ControllerClassName controller; + private final java.util.function.Supplier controllerFactory; + private final java.util.function.Supplier controller2Factory; + private final java.util.function.Supplier controller3Factory; + private ch.gtache.fxml.ControllerClassName controller; private boolean loaded; /** * Instantiates a new OutputClassName * @param controllerFactory The controller factory - * @param controller2Factory The subcontroller factory for com.github.gtache.fxml.Controller2 - * @param controller3Factory The subcontroller factory for com.github.gtache.fxml.Controller3 + * @param controller2Factory The subcontroller factory for ch.gtache.fxml.Controller2 + * @param controller3Factory The subcontroller factory for ch.gtache.fxml.Controller3 */ - public OutputClassName(final java.util.function.Supplier controllerFactory, final java.util.function.Supplier controller2Factory, final java.util.function.Supplier controller3Factory) { + public OutputClassName(final java.util.function.Supplier controllerFactory, final java.util.function.Supplier controller2Factory, final java.util.function.Supplier controller3Factory) { this.controllerFactory = java.util.Objects.requireNonNull(controllerFactory); this.controller2Factory = java.util.Objects.requireNonNull(controller2Factory); this.controller3Factory = java.util.Objects.requireNonNull(controller3Factory); } """; final var source2 = mock(SourceInfo.class); - when(source2.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); + when(source2.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(sourceInfo.includedSources()).thenReturn(List.of(source2)); when(source2.includedSources()).thenReturn(List.of(source3)); initializationFormatter.formatFieldsAndConstructor(); @@ -287,27 +287,27 @@ class TestInitializationFormatter { void testHasControllersInstance() throws GenerationException { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); final var expected = """ - private final com.github.gtache.fxml.ControllerClassName controller; - private final com.github.gtache.fxml.Controller2 controller2; - private final com.github.gtache.fxml.Controller3 controller3; + private final ch.gtache.fxml.ControllerClassName controller; + private final ch.gtache.fxml.Controller2 controller2; + private final ch.gtache.fxml.Controller3 controller3; private boolean loaded; /** * Instantiates a new OutputClassName * @param controller The controller instance - * @param controller2 The subcontroller instance for com.github.gtache.fxml.Controller2 - * @param controller3 The subcontroller instance for com.github.gtache.fxml.Controller3 + * @param controller2 The subcontroller instance for ch.gtache.fxml.Controller2 + * @param controller3 The subcontroller instance for ch.gtache.fxml.Controller3 */ - public OutputClassName(final com.github.gtache.fxml.ControllerClassName controller, final com.github.gtache.fxml.Controller2 controller2, final com.github.gtache.fxml.Controller3 controller3) { + public OutputClassName(final ch.gtache.fxml.ControllerClassName controller, final ch.gtache.fxml.Controller2 controller2, final ch.gtache.fxml.Controller3 controller3) { this.controller = java.util.Objects.requireNonNull(controller); this.controller2 = java.util.Objects.requireNonNull(controller2); this.controller3 = java.util.Objects.requireNonNull(controller3); } """; final var source2 = mock(SourceInfo.class); - when(source2.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); + when(source2.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(sourceInfo.includedSources()).thenReturn(List.of(source2)); when(source2.includedSources()).thenReturn(List.of(source3)); initializationFormatter.formatFieldsAndConstructor(); @@ -319,21 +319,21 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR); final var expected = """ - private final java.util.function.Supplier controllerFactory; - private final java.util.function.Supplier controller2Factory; - private final java.util.function.Supplier controller3Factory; - private com.github.gtache.fxml.ControllerClassName controller; + private final java.util.function.Supplier controllerFactory; + private final java.util.function.Supplier controller2Factory; + private final java.util.function.Supplier controller3Factory; + private ch.gtache.fxml.ControllerClassName controller; private final java.util.ResourceBundle resourceBundle; private boolean loaded; /** * Instantiates a new OutputClassName * @param controllerFactory The controller factory - * @param controller2Factory The subcontroller factory for com.github.gtache.fxml.Controller2 - * @param controller3Factory The subcontroller factory for com.github.gtache.fxml.Controller3 + * @param controller2Factory The subcontroller factory for ch.gtache.fxml.Controller2 + * @param controller3Factory The subcontroller factory for ch.gtache.fxml.Controller3 * @param resourceBundle The resource bundle */ - public OutputClassName(final java.util.function.Supplier controllerFactory, final java.util.function.Supplier controller2Factory, final java.util.function.Supplier controller3Factory, final java.util.ResourceBundle resourceBundle) { + public OutputClassName(final java.util.function.Supplier controllerFactory, final java.util.function.Supplier controller2Factory, final java.util.function.Supplier controller3Factory, final java.util.ResourceBundle resourceBundle) { this.controllerFactory = java.util.Objects.requireNonNull(controllerFactory); this.controller2Factory = java.util.Objects.requireNonNull(controller2Factory); this.controller3Factory = java.util.Objects.requireNonNull(controller3Factory); @@ -341,9 +341,9 @@ class TestInitializationFormatter { } """; final var source2 = mock(SourceInfo.class); - when(source2.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); + when(source2.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(sourceInfo.includedSources()).thenReturn(List.of(source2, source3)); when(source2.includedSources()).thenReturn(List.of(source3)); initializationFormatter.formatFieldsAndConstructor(); @@ -360,11 +360,11 @@ class TestInitializationFormatter { when(include.source()).thenReturn("source"); when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); when(subInfo.includedSources()).thenReturn(List.of()); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2);\n"; + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -374,11 +374,11 @@ class TestInitializationFormatter { when(include.source()).thenReturn("source"); when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); when(subInfo.includedSources()).thenReturn(List.of()); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2Factory);\n"; + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2Factory);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -386,21 +386,21 @@ class TestInitializationFormatter { @Test void testFormatSubViewMultipleInstanceFactory(@Mock final SourceInfo subInfo) throws GenerationException { final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(source3.includedSources()).thenReturn(List.of()); final var source4 = mock(SourceInfo.class); - when(source4.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller4"); + when(source4.controllerClassName()).thenReturn("ch.gtache.fxml.Controller4"); when(source4.includedSources()).thenReturn(List.of()); when(subInfo.includedSources()).thenReturn(List.of(source3, source4)); when(include.source()).thenReturn("source"); when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.FACTORY); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller3", "controller3"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller4", "controller4"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2Factory, controller3Factory, controller4Factory);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller3", "controller3"); + controllerClassToVariable.put("ch.gtache.fxml.Controller4", "controller4"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2Factory, controller3Factory, controller4Factory);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -408,21 +408,21 @@ class TestInitializationFormatter { @Test void testFormatSubViewMultipleInstance(@Mock final SourceInfo subInfo) throws GenerationException { final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(source3.includedSources()).thenReturn(List.of()); final var source4 = mock(SourceInfo.class); - when(source4.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller4"); + when(source4.controllerClassName()).thenReturn("ch.gtache.fxml.Controller4"); when(source4.includedSources()).thenReturn(List.of()); when(subInfo.includedSources()).thenReturn(List.of(source3, source4)); when(include.source()).thenReturn("source"); when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller3", "controller3"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller4", "controller4"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, controller3, controller4);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller3", "controller3"); + controllerClassToVariable.put("ch.gtache.fxml.Controller4", "controller4"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, controller3, controller4);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -435,10 +435,10 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.GETTER); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -451,10 +451,10 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.GET_BUNDLE); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -467,10 +467,10 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundle);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundle);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -483,10 +483,10 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_FUNCTION); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundleFunction);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundleFunction);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -499,10 +499,10 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_NAME); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - final var expected = "com.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundleName);\n"; + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + final var expected = "ch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundleName);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -515,11 +515,11 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); when(include.resources()).thenReturn("resources"); - final var expected = "java.util.ResourceBundleresourceBundle = java.util.ResourceBundle.getBundle(\"resources\");\ncom.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundle);\n"; + final var expected = "java.util.ResourceBundleresourceBundle = java.util.ResourceBundle.getBundle(\"resources\");\nch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundle);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -532,11 +532,11 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_FUNCTION); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); when(include.resources()).thenReturn("resources"); - final var expected = "java.util.ResourceBundleresourceBundle = java.util.ResourceBundle.getBundle(\"resources\");\njava.util.function.FunctionresourceBundleFunction = (java.util.function.Function) s -> resourceBundle.getString(s);\ncom.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundleFunction);\n"; + final var expected = "java.util.ResourceBundleresourceBundle = java.util.ResourceBundle.getBundle(\"resources\");\njava.util.function.FunctionresourceBundleFunction = (java.util.function.Function) s -> resourceBundle.getString(s);\nch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundleFunction);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -549,11 +549,11 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_NAME); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); when(include.resources()).thenReturn("resources"); - final var expected = "StringresourceBundleName = \"resources\";\ncom.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, resourceBundleName);\n"; + final var expected = "StringresourceBundleName = \"resources\";\nch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, resourceBundleName);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } @@ -561,10 +561,10 @@ class TestInitializationFormatter { @Test void testFormatSubViewComplete(@Mock final SourceInfo subInfo) throws GenerationException { final var source3 = mock(SourceInfo.class); - when(source3.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller3"); + when(source3.controllerClassName()).thenReturn("ch.gtache.fxml.Controller3"); when(source3.includedSources()).thenReturn(List.of()); final var source4 = mock(SourceInfo.class); - when(source4.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller4"); + when(source4.controllerClassName()).thenReturn("ch.gtache.fxml.Controller4"); when(source4.includedSources()).thenReturn(List.of(source3)); when(subInfo.includedSources()).thenReturn(List.of(source4)); when(subInfo.requiresResourceBundle()).thenReturn(true); @@ -572,13 +572,13 @@ class TestInitializationFormatter { when(parameters.controllerInjectionType()).thenReturn(ControllerInjectionType.INSTANCE); when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.CONSTRUCTOR_NAME); sourceToSourceInfo.put("source", subInfo); - when(subInfo.controllerClassName()).thenReturn("com.github.gtache.fxml.Controller2"); - when(subInfo.generatedClassName()).thenReturn("com.github.gtache.fxml.View2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller2", "controller2"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller3", "controller3"); - controllerClassToVariable.put("com.github.gtache.fxml.Controller4", "controller4"); + when(subInfo.controllerClassName()).thenReturn("ch.gtache.fxml.Controller2"); + when(subInfo.generatedClassName()).thenReturn("ch.gtache.fxml.View2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller2", "controller2"); + controllerClassToVariable.put("ch.gtache.fxml.Controller3", "controller3"); + controllerClassToVariable.put("ch.gtache.fxml.Controller4", "controller4"); when(include.resources()).thenReturn("resources"); - final var expected = "StringresourceBundleName = \"resources\";\ncom.github.gtache.fxml.View2view2 = new com.github.gtache.fxml.View2(controller2, controller3, controller4, resourceBundleName);\n"; + final var expected = "StringresourceBundleName = \"resources\";\nch.gtache.fxml.View2view2 = new ch.gtache.fxml.View2(controller2, controller3, controller4, resourceBundleName);\n"; assertEquals("view2", initializationFormatter.formatSubViewConstructorCall(include)); assertEquals(expected, sb.toString()); } diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java similarity index 92% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java index 10fc2ac..b6c780e 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestLoadMethodFormatter.java @@ -1,14 +1,14 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -170,7 +170,7 @@ class TestLoadMethodFormatter { void testGetBundleFieldFactoryReflectionNoBundle() throws GenerationException { when(parameters.resourceInjectionType()).thenReturn(ResourceBundleInjectionType.GET_BUNDLE); when(parameters.fieldInjectionType()).thenReturn(ControllerFieldInjectionType.FACTORY); - when(parameters.methodInjectionType()).thenReturn(com.github.gtache.fxml.compiler.ControllerMethodsInjectionType.REFLECTION); + when(parameters.methodInjectionType()).thenReturn(ControllerMethodsInjectionType.REFLECTION); when(parameters.bundleMap()).thenReturn(Map.of()); when(object.toString()).thenReturn("object"); loadMethodFormatter.formatLoadMethod(); diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java index 3dd9367..2508e42 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestObjectFormatter.java @@ -1,18 +1,18 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.compatibility.GenerationCompatibility; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedReference; -import com.github.gtache.fxml.compiler.parsing.impl.*; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.compatibility.GenerationCompatibility; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedReference; +import ch.gtache.fxml.compiler.parsing.impl.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestParameter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestParameter.java similarity index 94% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestParameter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestParameter.java index 20bfd69..e832163 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestParameter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestParameter.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java index afc0749..3f3688d 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestPropertyFormatter.java @@ -1,16 +1,16 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.GenerationRequest; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedObjectImpl; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedTextImpl; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.GenerationRequest; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedObjectImpl; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.parsing.impl.ParsedTextImpl; import javafx.event.EventHandler; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java index 7cbb525..ba4c3d7 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestReflectionHelper.java @@ -1,12 +1,12 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.impl.GenericTypesImpl; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.impl.GenericTypesImpl; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Node; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java index f6d3f6b..015a8c7 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestSceneFormatter.java @@ -1,10 +1,10 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java index b966a71..fe9ebf7 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestTriangleMeshFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestURLFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestURLFormatter.java similarity index 93% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestURLFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestURLFormatter.java index 0d01524..3b3ef01 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestURLFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestURLFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java index 5168bee..b53429a 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueClassGuesser.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import javafx.scene.Node; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueFormatter.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueFormatter.java index 2f0b9f3..57c8d43 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestValueFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestValueFormatter.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; import javafx.geometry.Pos; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableInfo.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableInfo.java similarity index 93% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableInfo.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableInfo.java index 5062ec9..53a869c 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableInfo.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableInfo.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableProvider.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableProvider.java similarity index 95% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableProvider.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableProvider.java index 6ddc796..8f80be9 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestVariableProvider.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestVariableProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java index e98f4c4..da59183 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/TestWebViewFormatter.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java similarity index 97% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java rename to core/src/test/java/ch/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java index bc2fabb..3a2cc2c 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/impl/internal/WholeConstructorArgs.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl.internal; +package ch.gtache.fxml.compiler.impl.internal; import javafx.beans.NamedArg; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java index 5a1a9c6..381ad69 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedConstantImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedConstant; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedConstant; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java index b975df5..8346a67 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedCopyImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedCopy; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedCopy; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java similarity index 88% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java index bcb382a..7ba3457 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedDefineImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java index ce829db..351f8a8 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedFactoryImpl.java @@ -1,9 +1,9 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedFactory; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedFactory; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java similarity index 92% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java index 2e6895d..b5ce4f9 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedIncludeImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedInclude; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedInclude; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java similarity index 92% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java index 2b4695d..d0021c9 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedObjectImpl.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java similarity index 89% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java index 09884df..919835e 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedPropertyImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java index 679e28e..852961a 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedReferenceImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedReference; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedReference; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java similarity index 83% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java index 1ecc7cd..7d6bf01 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedTextImpl.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedText; +import ch.gtache.fxml.compiler.parsing.ParsedText; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java similarity index 91% rename from core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java rename to core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java index 88d274a..6d4d5d5 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java +++ b/core/src/test/java/ch/gtache/fxml/compiler/parsing/impl/TestParsedValueImpl.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.impl; +package ch.gtache.fxml.compiler.parsing.impl; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.ParsedValue; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.ParsedValue; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestClassesFinder.java b/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestClassesFinder.java deleted file mode 100644 index c91756c..0000000 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestClassesFinder.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.gtache.fxml.compiler.impl; - -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.util.Set; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -class TestClassesFinder { - - @Test - void testGetClassesCurrent() throws IOException { - final var expected = Set.of( - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedConstantImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedCopyImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedDefineImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedFactoryImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedIncludeImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedObjectImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedPropertyImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedReferenceImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedTextImpl", - "com.github.gtache.fxml.compiler.parsing.impl.TestParsedValueImpl"); - final var actual = ClassesFinder.getClasses("com.github.gtache.fxml.compiler.parsing.impl"); - assertEquals(expected, actual); - } - - @Test - void testGetClassesJar() throws IOException { - final var expected = Set.of("javafx.beans.DefaultProperty", - "javafx.beans.InvalidationListener", - "javafx.beans.NamedArg", - "javafx.beans.Observable", - "javafx.beans.WeakInvalidationListener", - "javafx.beans.WeakListener"); - final var actual = ClassesFinder.getClasses("javafx.beans"); - assertEquals(expected, actual); - } -} diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index cb931fc..18638ee 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler 1.0-SNAPSHOT @@ -12,7 +12,8 @@ fxml-compiler-maven-plugin maven-plugin - fxml-compiler-maven-plugin Maven Mojo + fxml-compiler-maven-plugin + Maven plugin for the fxml-compiler project 3.9.9 @@ -43,7 +44,7 @@ - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-xml diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/FXMLCompilerMojo.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/FXMLCompilerMojo.java similarity index 92% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/FXMLCompilerMojo.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/FXMLCompilerMojo.java index 07ceac6..8bfeb6e 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/FXMLCompilerMojo.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/FXMLCompilerMojo.java @@ -1,16 +1,16 @@ -package com.github.gtache.fxml.compiler.maven; +package ch.gtache.fxml.compiler.maven; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl; -import com.github.gtache.fxml.compiler.impl.GenerationParametersImpl; -import com.github.gtache.fxml.compiler.maven.internal.CompilationInfo; -import com.github.gtache.fxml.compiler.maven.internal.CompilationInfoProvider; -import com.github.gtache.fxml.compiler.maven.internal.Compiler; -import com.github.gtache.fxml.compiler.maven.internal.ControllerProvider; -import com.github.gtache.fxml.compiler.maven.internal.FXMLProvider; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl; +import ch.gtache.fxml.compiler.impl.GenerationParametersImpl; +import ch.gtache.fxml.compiler.maven.internal.CompilationInfo; +import ch.gtache.fxml.compiler.maven.internal.CompilationInfoProvider; +import ch.gtache.fxml.compiler.maven.internal.Compiler; +import ch.gtache.fxml.compiler.maven.internal.ControllerProvider; +import ch.gtache.fxml.compiler.maven.internal.FXMLProvider; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfo.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfo.java similarity index 98% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfo.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfo.java index e4b2d77..e7e960e 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfo.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import java.nio.file.Path; import java.util.HashMap; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java similarity index 98% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java index 41e555e..9f1ac0d 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo; +import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo; import javafx.event.EventHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Compiler.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Compiler.java similarity index 85% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Compiler.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Compiler.java index 23028a2..955aac4 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Compiler.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Compiler.java @@ -1,13 +1,13 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.Generator; -import com.github.gtache.fxml.compiler.impl.GenerationRequestImpl; -import com.github.gtache.fxml.compiler.impl.GeneratorImpl; -import com.github.gtache.fxml.compiler.parsing.FXMLParser; -import com.github.gtache.fxml.compiler.parsing.ParseException; -import com.github.gtache.fxml.compiler.parsing.xml.DOMFXMLParser; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.Generator; +import ch.gtache.fxml.compiler.impl.GenerationRequestImpl; +import ch.gtache.fxml.compiler.impl.GeneratorImpl; +import ch.gtache.fxml.compiler.parsing.FXMLParser; +import ch.gtache.fxml.compiler.parsing.ParseException; +import ch.gtache.fxml.compiler.parsing.xml.DOMFXMLParser; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.maven.plugin.MojoExecutionException; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java similarity index 93% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java index cfb3d62..6dd621d 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java @@ -1,11 +1,11 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.ControllerFieldInfo; -import com.github.gtache.fxml.compiler.ControllerInfo; -import com.github.gtache.fxml.compiler.impl.ClassesFinder; -import com.github.gtache.fxml.compiler.impl.ControllerFieldInfoImpl; -import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl; -import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo; +import ch.gtache.fxml.compiler.ControllerFieldInfo; +import ch.gtache.fxml.compiler.ControllerInfo; +import ch.gtache.fxml.compiler.impl.ClassesFinder; +import ch.gtache.fxml.compiler.impl.ControllerFieldInfoImpl; +import ch.gtache.fxml.compiler.impl.ControllerInfoImpl; +import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.maven.plugin.MojoExecutionException; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerProvider.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerProvider.java similarity index 96% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerProvider.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerProvider.java index 6da38aa..bd4c45e 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerProvider.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.apache.maven.plugin.MojoExecutionException; import org.xml.sax.SAXException; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FXMLProvider.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FXMLProvider.java similarity index 97% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FXMLProvider.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FXMLProvider.java index d6cd373..9c8c028 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FXMLProvider.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FXMLProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FieldInfo.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FieldInfo.java similarity index 88% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FieldInfo.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FieldInfo.java index 63f9c2b..04bd78f 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FieldInfo.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FieldInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import java.util.Objects; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/GenericParser.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/GenericParser.java similarity index 94% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/GenericParser.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/GenericParser.java index 79c881d..0f6383e 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/GenericParser.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/GenericParser.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.GenericTypes; -import com.github.gtache.fxml.compiler.impl.GenericTypesImpl; +import ch.gtache.fxml.compiler.GenericTypes; +import ch.gtache.fxml.compiler.impl.GenericTypesImpl; import org.apache.maven.plugin.MojoExecutionException; import java.util.ArrayList; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Inclusion.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Inclusion.java similarity index 92% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Inclusion.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Inclusion.java index 6bff80f..539f3bd 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Inclusion.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Inclusion.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import java.nio.file.Path; import java.util.Objects; diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java similarity index 86% rename from maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java rename to maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java index ffd7cda..b5b5840 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java +++ b/maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.SourceInfo; -import com.github.gtache.fxml.compiler.impl.SourceInfoImpl; -import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo; +import ch.gtache.fxml.compiler.SourceInfo; +import ch.gtache.fxml.compiler.impl.SourceInfoImpl; +import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo; import java.nio.file.Path; import java.util.ArrayList; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java similarity index 92% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java index 9573616..33054ea 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java @@ -1,16 +1,16 @@ -package com.github.gtache.fxml.compiler.maven; +package ch.gtache.fxml.compiler.maven; -import com.github.gtache.fxml.compiler.ControllerFieldInjectionType; -import com.github.gtache.fxml.compiler.ControllerInjectionType; -import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType; -import com.github.gtache.fxml.compiler.ResourceBundleInjectionType; -import com.github.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl; -import com.github.gtache.fxml.compiler.impl.GenerationParametersImpl; -import com.github.gtache.fxml.compiler.maven.internal.CompilationInfo; -import com.github.gtache.fxml.compiler.maven.internal.CompilationInfoProvider; -import com.github.gtache.fxml.compiler.maven.internal.Compiler; -import com.github.gtache.fxml.compiler.maven.internal.ControllerProvider; -import com.github.gtache.fxml.compiler.maven.internal.FXMLProvider; +import ch.gtache.fxml.compiler.ControllerFieldInjectionType; +import ch.gtache.fxml.compiler.ControllerInjectionType; +import ch.gtache.fxml.compiler.ControllerMethodsInjectionType; +import ch.gtache.fxml.compiler.ResourceBundleInjectionType; +import ch.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl; +import ch.gtache.fxml.compiler.impl.GenerationParametersImpl; +import ch.gtache.fxml.compiler.maven.internal.CompilationInfo; +import ch.gtache.fxml.compiler.maven.internal.CompilationInfoProvider; +import ch.gtache.fxml.compiler.maven.internal.Compiler; +import ch.gtache.fxml.compiler.maven.internal.ControllerProvider; +import ch.gtache.fxml.compiler.maven.internal.FXMLProvider; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.BeforeEach; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java similarity index 98% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java index 04c5171..9a8133f 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java @@ -1,4 +1,5 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java similarity index 97% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java index b855e6f..5cd4dd0 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java similarity index 82% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java index a20b9b8..edb2555 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java @@ -1,4 +1,5 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; @@ -33,16 +34,16 @@ class TestCompilationInfoProvider { final var path = copyFile("infoView.fxml", tempDir); final var includedPath = path.getParent().resolve("includeView.fxml"); final var controllerPath = path.getParent().resolve("InfoController.java"); - final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController"; + final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController"; Files.createFile(controllerPath); when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString())); final var expected = new CompilationInfo(path, path.getParent().resolve("InfoView.java"), - "com.github.gtache.fxml.compiler.maven.internal.InfoView", controllerPath, controllerClass, + "ch.gtache.fxml.compiler.maven.internal.InfoView", controllerPath, controllerClass, Set.of(new FieldInfo("javafx.event.EventHandler", "onContextMenuRequested"), new FieldInfo("Button", "button"), - new FieldInfo("com.github.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")), + new FieldInfo("ch.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")), Set.of("onAction"), Map.of("includeView.fxml", new Inclusion(path.getParent().resolve("includeView.fxml"), 1)), true); final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir); - final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController")); + final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController")); assertEquals(expected, actual); } @@ -50,11 +51,11 @@ class TestCompilationInfoProvider { void testComplexFilename(@TempDir final Path tempDir) throws Exception { final var path = copyFile("com_plex-view.fxml", tempDir); final var controllerPath = path.getParent().resolve("InfoController.java"); - final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController"; + final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController"; Files.createFile(controllerPath); when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString())); final var expected = new CompilationInfo(path, path.getParent().resolve("ComPlexView.java"), - "com.github.gtache.fxml.compiler.maven.internal.ComPlexView", controllerPath, controllerClass, + "ch.gtache.fxml.compiler.maven.internal.ComPlexView", controllerPath, controllerClass, Set.of(), Set.of(), Map.of(), false); final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir); final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of()); @@ -79,7 +80,7 @@ class TestCompilationInfoProvider { Files.createFile(controllerPath); when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString())); final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir); - assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController"))); + assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController"))); } @Test @@ -90,7 +91,7 @@ class TestCompilationInfoProvider { Files.createFile(controllerPath); when(project.getCompileSourceRoots()).thenReturn(List.of()); final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir); - assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController"))); + assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController"))); } @Test @@ -108,16 +109,16 @@ class TestCompilationInfoProvider { final var path = copyFile("noResourceBundle.fxml", tempDir); final var includedPath = path.getParent().resolve("includeView.fxml"); final var controllerPath = path.getParent().resolve("InfoController.java"); - final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController"; + final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController"; Files.createFile(controllerPath); when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString())); final var expected = new CompilationInfo(path, path.getParent().resolve("NoResourceBundle.java"), - "com.github.gtache.fxml.compiler.maven.internal.NoResourceBundle", controllerPath, controllerClass, + "ch.gtache.fxml.compiler.maven.internal.NoResourceBundle", controllerPath, controllerClass, Set.of(new FieldInfo("javafx.event.EventHandler", "onContextMenuRequested"), new FieldInfo("Button", "button"), - new FieldInfo("com.github.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")), + new FieldInfo("ch.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")), Set.of("onAction"), Map.of("includeView.fxml", new Inclusion(path.getParent().resolve("includeView.fxml"), 1)), false); final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir); - final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController")); + final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController")); assertEquals(expected, actual); } @@ -132,7 +133,7 @@ class TestCompilationInfoProvider { } private Path copyFile(final String source, final Path tempDir) throws IOException { - final var out = tempDir.resolve("com").resolve("github").resolve("gtache").resolve("fxml").resolve("compiler").resolve("maven").resolve("internal").resolve(source); + final var out = tempDir.resolve("ch").resolve("gtache").resolve("fxml").resolve("compiler").resolve("maven").resolve("internal").resolve(source); Files.createDirectories(out.getParent()); try (final var in = getClass().getResourceAsStream(source)) { assertNotNull(in); diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompiler.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompiler.java similarity index 93% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompiler.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompiler.java index 2e9ba94..0d30cd3 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompiler.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompiler.java @@ -1,12 +1,12 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.GenerationException; -import com.github.gtache.fxml.compiler.GenerationParameters; -import com.github.gtache.fxml.compiler.Generator; -import com.github.gtache.fxml.compiler.impl.GenerationRequestImpl; -import com.github.gtache.fxml.compiler.parsing.FXMLParser; -import com.github.gtache.fxml.compiler.parsing.ParseException; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.GenerationException; +import ch.gtache.fxml.compiler.GenerationParameters; +import ch.gtache.fxml.compiler.Generator; +import ch.gtache.fxml.compiler.impl.GenerationRequestImpl; +import ch.gtache.fxml.compiler.parsing.FXMLParser; +import ch.gtache.fxml.compiler.parsing.ParseException; +import ch.gtache.fxml.compiler.parsing.ParsedObject; import org.apache.maven.plugin.MojoExecutionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java similarity index 88% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java index 344174e..48037e5 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java @@ -1,8 +1,8 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.impl.ControllerFieldInfoImpl; -import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl; -import com.github.gtache.fxml.compiler.impl.GenericTypesImpl; +import ch.gtache.fxml.compiler.impl.ControllerFieldInfoImpl; +import ch.gtache.fxml.compiler.impl.ControllerInfoImpl; +import ch.gtache.fxml.compiler.impl.GenericTypesImpl; import org.apache.maven.plugin.MojoExecutionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -35,7 +35,7 @@ class TestControllerInfoProvider { void testGetControllerInfo(@TempDir final Path tempDir) throws Exception { final var fxml = tempDir.resolve("fxml.fxml"); Files.writeString(fxml, """ - package com.github.gtache.fxml.compiler.maven.internal; + package ch.gtache.fxml.compiler.maven.internal; import javafx.event.EventHandler; import javafx.event.KeyEvent; @@ -64,7 +64,7 @@ class TestControllerInfoProvider { } """); when(compilationInfo.controllerFile()).thenReturn(fxml); - final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.LoadController"; + final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.LoadController"; when(compilationInfo.controllerClass()).thenReturn(controllerClass); when(compilationInfo.injectedFields()).thenReturn(Set.of(new FieldInfo("EventHandler", "keyEventHandler"), new FieldInfo("ComboBox", "comboBox"), new FieldInfo("Button", "button"), @@ -85,7 +85,7 @@ class TestControllerInfoProvider { void testGetControllerInfoMethodNotFound(@TempDir final Path tempDir) throws Exception { final var fxml = tempDir.resolve("fxml.fxml"); Files.writeString(fxml, """ - package com.github.gtache.fxml.compiler.maven.internal; + package ch.gtache.fxml.compiler.maven.internal; import javafx.event.EventHandler; import javafx.event.KeyEvent; @@ -96,7 +96,7 @@ class TestControllerInfoProvider { } """); when(compilationInfo.controllerFile()).thenReturn(fxml); - when(compilationInfo.controllerClass()).thenReturn("com.github.gtache.fxml.compiler.maven.internal.LoadController"); + when(compilationInfo.controllerClass()).thenReturn("ch.gtache.fxml.compiler.maven.internal.LoadController"); when(compilationInfo.injectedFields()).thenReturn(Set.of()); when(compilationInfo.injectedMethods()).thenReturn(Set.of("onClick")); assertThrows(MojoExecutionException.class, () -> ControllerInfoProvider.getControllerInfo(compilationInfo)); diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerProvider.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerProvider.java similarity index 96% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerProvider.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerProvider.java index fcc2db8..3679614 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerProvider.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.apache.maven.plugin.MojoExecutionException; import org.junit.jupiter.api.Test; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java similarity index 97% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java index 688d9f1..470e1c6 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.apache.maven.model.Resource; import org.apache.maven.project.MavenProject; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFieldInfo.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFieldInfo.java similarity index 93% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFieldInfo.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFieldInfo.java index e67399d..8da8381 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFieldInfo.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFieldInfo.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.junit.jupiter.api.Test; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestGenericParser.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestGenericParser.java similarity index 96% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestGenericParser.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestGenericParser.java index 94469cc..b6a6e61 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestGenericParser.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestGenericParser.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.impl.GenericTypesImpl; +import ch.gtache.fxml.compiler.impl.GenericTypesImpl; import org.apache.maven.plugin.MojoExecutionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestInclusion.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestInclusion.java similarity index 94% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestInclusion.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestInclusion.java index 625c5b4..a42b528 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestInclusion.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestInclusion.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java similarity index 95% rename from maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java rename to maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java index eab9930..64355f0 100644 --- a/maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java +++ b/maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java @@ -1,6 +1,6 @@ -package com.github.gtache.fxml.compiler.maven.internal; +package ch.gtache.fxml.compiler.maven.internal; -import com.github.gtache.fxml.compiler.impl.SourceInfoImpl; +import ch.gtache.fxml.compiler.impl.SourceInfoImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/com_plex-view.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/com_plex-view.fxml similarity index 69% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/com_plex-view.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/com_plex-view.fxml index 3d02a9b..d49f37e 100644 --- a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/com_plex-view.fxml +++ b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/com_plex-view.fxml @@ -2,7 +2,7 @@ + fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController"> diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/infoView.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/infoView.fxml similarity index 86% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/infoView.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/infoView.fxml index ffa0cf1..f4b0f6c 100644 --- a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/infoView.fxml +++ b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/infoView.fxml @@ -4,7 +4,7 @@ + fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController"> diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/missingSource.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/missingSource.fxml similarity index 80% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/missingSource.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/missingSource.fxml index 380e4ad..918acb8 100644 --- a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/missingSource.fxml +++ b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/missingSource.fxml @@ -3,7 +3,7 @@ + fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController"> diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noController.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noController.fxml similarity index 100% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noController.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noController.fxml diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml similarity index 86% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml index 9da9eda..a0e1ee1 100644 --- a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml +++ b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml @@ -4,7 +4,7 @@ + fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController"> diff --git a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/unknownOn.fxml b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/unknownOn.fxml similarity index 82% rename from maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/unknownOn.fxml rename to maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/unknownOn.fxml index 5e3a0c5..360f2d5 100644 --- a/maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/unknownOn.fxml +++ b/maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/unknownOn.fxml @@ -4,7 +4,7 @@ + fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController"> diff --git a/pom.xml b/pom.xml index 58965fa..e107096 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler 1.0-SNAPSHOT pom + api core @@ -15,7 +16,13 @@ xml + fxml-compiler + Parent pom for the fxml-compiler project + https://github.com/gtache/fxml-compiler + + https://github.com/gtache/fxml-compiler + scm:git:git@github.com:gtache/fxml-compiler.git scm:git:ssh://git@github.com:gtache/fxml-compiler.git HEAD @@ -25,7 +32,22 @@ https://github.com/gtache + + + gtache + Guillaume Tâche + + + + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + true 3.6.3 21 21 @@ -38,8 +60,10 @@ 3.1.3 3.5.0 3.5.2 + 3.2.7 3.11.1 0.8.12 + 0.6.0 3.1.1 3.3.1 3.3.1 @@ -56,6 +80,15 @@ + + org.sonatype.central + central-publishing-maven-plugin + ${plugin.publishing.version} + true + + central + + org.apache.maven.plugins maven-clean-plugin @@ -99,6 +132,7 @@ + org.apache.maven.plugins maven-enforcer-plugin @@ -141,6 +175,28 @@ + + org.apache.maven.plugins + maven-gpg-plugin + ${plugin.gpg.version} + + ${skip.gpg} + + --pinentry-mode + loopback + + + + + + sign + + + 2AFBEC4EEEC7C95CB61D9BB2357A2C2A7A8581E6 + + + + org.jacoco jacoco-maven-plugin @@ -243,6 +299,10 @@ org.apache.maven.plugins maven-failsafe-plugin + + org.apache.maven.plugins + maven-gpg-plugin + org.jacoco jacoco-maven-plugin @@ -277,26 +337,25 @@ - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-api ${project.version} - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-core ${project.version} - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-maven-plugin ${project.version} - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-xml ${project.version} - org.apache.logging.log4j log4j-api diff --git a/xml/pom.xml b/xml/pom.xml index a6d4db3..c4784e7 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -4,16 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler 1.0-SNAPSHOT fxml-compiler-xml + fxml-compiler-xml + XML module for the fxml-compiler project + - com.github.gtache + ch.gtache.fxml-compiler fxml-compiler-core diff --git a/xml/src/main/java/com/github/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java b/xml/src/main/java/ch/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java similarity index 95% rename from xml/src/main/java/com/github/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java rename to xml/src/main/java/ch/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java index 7ff9a5a..ea7ea9b 100644 --- a/xml/src/main/java/com/github/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java +++ b/xml/src/main/java/ch/gtache/fxml/compiler/parsing/xml/DOMFXMLParser.java @@ -1,12 +1,12 @@ -package com.github.gtache.fxml.compiler.parsing.xml; +package ch.gtache.fxml.compiler.parsing.xml; -import com.github.gtache.fxml.compiler.impl.ClassesFinder; -import com.github.gtache.fxml.compiler.parsing.FXMLParser; -import com.github.gtache.fxml.compiler.parsing.ParseException; -import com.github.gtache.fxml.compiler.parsing.ParsedDefine; -import com.github.gtache.fxml.compiler.parsing.ParsedObject; -import com.github.gtache.fxml.compiler.parsing.ParsedProperty; -import com.github.gtache.fxml.compiler.parsing.impl.*; +import ch.gtache.fxml.compiler.impl.ClassesFinder; +import ch.gtache.fxml.compiler.parsing.FXMLParser; +import ch.gtache.fxml.compiler.parsing.ParseException; +import ch.gtache.fxml.compiler.parsing.ParsedDefine; +import ch.gtache.fxml.compiler.parsing.ParsedObject; +import ch.gtache.fxml.compiler.parsing.ParsedProperty; +import ch.gtache.fxml.compiler.parsing.impl.*; import javafx.event.EventHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -134,6 +134,7 @@ public class DOMFXMLParser implements FXMLParser { if (isObject(item)) { objects.add(parseObject(item, imports)); } else if (isSimpleProperty(item)) { + //A property that could be an attribute final var sourceTypeName = getSourceTypeName(item, imports); final var property = new ParsedPropertyImpl(sourceTypeName.name(), sourceTypeName.sourceType(), item.getTextContent()); attributes.put(property.name(), property); @@ -290,6 +291,8 @@ public class DOMFXMLParser implements FXMLParser { if (imports.containsKey(key)) { return imports.get(key); } else { + //Fallback to searching in packages + logger.debug("Class {} not found in imports, searching in packages", key); for (final var pkg : packages) { final var className = pkg + "." + key; try { diff --git a/xml/src/main/java/module-info.java b/xml/src/main/java/module-info.java index 90050d3..8cbf142 100644 --- a/xml/src/main/java/module-info.java +++ b/xml/src/main/java/module-info.java @@ -1,10 +1,10 @@ /** * XML parsing module for FXML compiler */ -module com.github.gtache.fxml.compiler.xml { - requires transitive com.github.gtache.fxml.compiler.core; +module ch.gtache.fxml.compiler.xml { + requires transitive ch.gtache.fxml.compiler.core; requires java.xml; requires org.apache.logging.log4j; - exports com.github.gtache.fxml.compiler.parsing.xml; + exports ch.gtache.fxml.compiler.parsing.xml; } \ No newline at end of file diff --git a/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java b/xml/src/test/java/ch/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java similarity index 95% rename from xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java rename to xml/src/test/java/ch/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java index 50aea0b..add882a 100644 --- a/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java +++ b/xml/src/test/java/ch/gtache/fxml/compiler/parsing/xml/TestDOMFXMLParser.java @@ -1,7 +1,7 @@ -package com.github.gtache.fxml.compiler.parsing.xml; +package ch.gtache.fxml.compiler.parsing.xml; -import com.github.gtache.fxml.compiler.parsing.ParseException; -import com.github.gtache.fxml.compiler.parsing.impl.*; +import ch.gtache.fxml.compiler.parsing.ParseException; +import ch.gtache.fxml.compiler.parsing.impl.*; import javafx.collections.FXCollections; import javafx.event.EventHandler; import javafx.geometry.Insets; @@ -33,7 +33,7 @@ class TestDOMFXMLParser { @Test void testRealCase() throws Exception { final var expected = new ParsedObjectImpl(BorderPane.class.getName(), - newLinkedHashMap("fx:controller", new ParsedPropertyImpl("fx:controller", null, "com.github.gtache.fxml.compiler.parsing.xml.LoadController")), + newLinkedHashMap("fx:controller", new ParsedPropertyImpl("fx:controller", null, "ch.gtache.fxml.compiler.parsing.xml.LoadController")), newLinkedHashMap(new ParsedPropertyImpl("bottom", null, null), List.of(new ParsedDefineImpl(List.of(new ParsedObjectImpl(HBox.class.getName(), Map.of("fx:id", new ParsedPropertyImpl("fx:id", null, "define1")), newLinkedHashMap(), List.of()))), new ParsedObjectImpl(VBox.class.getName(), @@ -53,7 +53,7 @@ class TestDOMFXMLParser { newLinkedHashMap(new ParsedPropertyImpl("right", null, null), List.of(new ParsedReferenceImpl(Map.of("source", new ParsedPropertyImpl("source", null, "define7"))))), List.of()))), List.of()), new ParsedIncludeImpl( - Map.of("source", new ParsedPropertyImpl("source", null, "includedView.fxml"), "resources", new ParsedPropertyImpl("resources", null, "com/github/gtache/fxml/compiler/parsing/xml/IncludedBundle"), "fx:id", new ParsedPropertyImpl("fx:id", null, "id"))) + Map.of("source", new ParsedPropertyImpl("source", null, "includedView.fxml"), "resources", new ParsedPropertyImpl("resources", null, "ch/gtache/fxml/compiler/parsing/xml/IncludedBundle"), "fx:id", new ParsedPropertyImpl("fx:id", null, "id"))) )), List.of(new ParsedDefineImpl(List.of( new ParsedConstantImpl(Cursor.class.getName(), Map.of("fx:constant", new ParsedPropertyImpl("fx:constant", null, "CLOSED_HAND"))), new ParsedObjectImpl(String.class.getName(), Map.of("fx:id", new ParsedPropertyImpl("fx:id", null, "define2")), newLinkedHashMap(), List.of(new ParsedTextImpl("text"))), diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/IncludedBundle.properties b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/IncludedBundle.properties similarity index 100% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/IncludedBundle.properties rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/IncludedBundle.properties diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/includedView.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/includedView.fxml similarity index 67% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/includedView.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/includedView.fxml index be35434..6926e3e 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/includedView.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/includedView.fxml @@ -2,5 +2,5 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml similarity index 76% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml index a1e49b0..858fc6c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidDefine.fxml @@ -2,7 +2,7 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml similarity index 83% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml index a456683..9846d46 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/invalidFactory.fxml @@ -3,7 +3,7 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadRoot.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadRoot.fxml similarity index 67% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadRoot.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadRoot.fxml index 607d553..836e08a 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadRoot.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadRoot.fxml @@ -2,5 +2,5 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadScript.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadScript.fxml similarity index 66% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadScript.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadScript.fxml index 040776c..1e39ade 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadScript.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadScript.fxml @@ -2,6 +2,6 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadView.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadView.fxml similarity index 92% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadView.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadView.fxml index e40d44d..8a788c8 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/loadView.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/loadView.fxml @@ -10,7 +10,7 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController"> @@ -54,7 +54,7 @@ + resources="ch/gtache/fxml/compiler/parsing/xml/IncludedBundle" fx:id="id"/> diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/unknownClass.fxml b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/unknownClass.fxml similarity index 65% rename from xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/unknownClass.fxml rename to xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/unknownClass.fxml index ade9afc..4b387ad 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/unknownClass.fxml +++ b/xml/src/test/resources/ch/gtache/fxml/compiler/parsing/xml/unknownClass.fxml @@ -1,7 +1,7 @@ + fx:controller="ch.gtache.fxml.compiler.parsing.xml.LoadController">