From ba0800e49e85cfe46715bd56e87e8bee6da0481b Mon Sep 17 00:00:00 2001 From: Konrad Neitzel Date: Sun, 23 Mar 2025 07:02:22 +0100 Subject: [PATCH] First example to test component solution, renamed projects to neitzelfx. --- {injectfx-example => neitzelfx-example}/pom.xml | 8 ++++---- .../neitzelfx/component/example/Address.java | 0 .../neitzelfx/component/example/ExampleApp.java | 0 .../neitzel/neitzelfx/component/example/Main.java | 0 .../neitzel/neitzelfx/component/example/Person.java | 0 .../neitzelfx/injectfx/example/JavaFXApp.java | 0 .../de/neitzel/neitzelfx/injectfx/example/Main.java | 0 .../neitzelfx/injectfx/example/MainWindow.java | 0 .../src/main/resources/address.fxml | 0 .../neitzelfx/injectfx/example/MainWindow.fxml | 0 .../src/main/resources/person.fxml | 0 .../src/test/resources/testlevel.png | Bin {injectfx-lib => neitzelfx-lib}/pom.xml | 4 ++-- .../neitzel/neitzelfx/component/AutoViewModel.java | 0 .../neitzelfx/component/ComponentController.java | 0 .../neitzelfx/component/ComponentLoader.java | 0 .../neitzelfx/injectfx/FXMLComponentInstances.java | 0 .../injectfx/InjectableComponentScanner.java | 0 .../injectfx/InjectingControllerFactory.java | 0 .../neitzelfx/injectfx/InjectingFXMLLoader.java | 0 .../injectfx/annotation/FXMLComponent.java | 0 .../neitzelfx/injectfx/annotation/FXMLConfig.java | 0 .../de/neitzel/neitzelfx/mvvm/BindDirection.java | 0 .../neitzelfx/mvvm/BindingAwareFXMLLoader.java | 0 .../neitzelfx/mvvm/GenericViewController.java | 0 .../de/neitzel/neitzelfx/mvvm/GenericViewModel.java | 0 .../injectfx/InjectableComponentScannerTest.java | 0 .../injectfx/testcomponents/test1ok/SuperClass.java | 0 .../testcomponents/test1ok/TestComponent1_1.java | 0 .../testcomponents/test1ok/TestInterface1_1.java | 0 .../testcomponents/test1ok/TestInterface1_2.java | 0 .../test1ok/sub/TestComponent1_2.java | 0 .../testcomponents/test2fail/TestComponent2_1.java | 0 pom.xml | 6 +++--- 34 files changed, 9 insertions(+), 9 deletions(-) rename {injectfx-example => neitzelfx-example}/pom.xml (98%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/component/example/Address.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/component/example/Main.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/component/example/Person.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java (100%) rename {injectfx-example => neitzelfx-example}/src/main/resources/address.fxml (100%) rename {injectfx-example => neitzelfx-example}/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml (100%) rename {injectfx-example => neitzelfx-example}/src/main/resources/person.fxml (100%) rename {injectfx-example => neitzelfx-example}/src/test/resources/testlevel.png (100%) rename {injectfx-lib => neitzelfx-lib}/pom.xml (94%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java (100%) rename {injectfx-lib => neitzelfx-lib}/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java (100%) diff --git a/injectfx-example/pom.xml b/neitzelfx-example/pom.xml similarity index 98% rename from injectfx-example/pom.xml rename to neitzelfx-example/pom.xml index 0040265..158609d 100644 --- a/injectfx-example/pom.xml +++ b/neitzelfx-example/pom.xml @@ -6,11 +6,11 @@ de.neitzel - injectfx + neitzelfx 1.0-SNAPSHOT - injectfx-example + neitzelfx-example ${project.artifactId} @@ -21,10 +21,10 @@ - + de.neitzel - injectfx-lib + neitzelfx-lib ${project.version} diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java similarity index 100% rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java diff --git a/injectfx-example/src/main/resources/address.fxml b/neitzelfx-example/src/main/resources/address.fxml similarity index 100% rename from injectfx-example/src/main/resources/address.fxml rename to neitzelfx-example/src/main/resources/address.fxml diff --git a/injectfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml b/neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml similarity index 100% rename from injectfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml rename to neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml diff --git a/injectfx-example/src/main/resources/person.fxml b/neitzelfx-example/src/main/resources/person.fxml similarity index 100% rename from injectfx-example/src/main/resources/person.fxml rename to neitzelfx-example/src/main/resources/person.fxml diff --git a/injectfx-example/src/test/resources/testlevel.png b/neitzelfx-example/src/test/resources/testlevel.png similarity index 100% rename from injectfx-example/src/test/resources/testlevel.png rename to neitzelfx-example/src/test/resources/testlevel.png diff --git a/injectfx-lib/pom.xml b/neitzelfx-lib/pom.xml similarity index 94% rename from injectfx-lib/pom.xml rename to neitzelfx-lib/pom.xml index f9ddcdc..1faa180 100644 --- a/injectfx-lib/pom.xml +++ b/neitzelfx-lib/pom.xml @@ -6,11 +6,11 @@ de.neitzel - injectfx + neitzelfx 1.0-SNAPSHOT - injectfx-lib + neitzelfx-lib diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java similarity index 100% rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java similarity index 100% rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java diff --git a/pom.xml b/pom.xml index 1d7799e..9970037 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ 4.0.0 de.neitzel - injectfx + neitzelfx 1.0-SNAPSHOT pom - injectfx-lib - injectfx-example + neitzelfx-lib + neitzelfx-example