Besseres, universelles Auteilen.

fx-example/pom.xml

@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>de.neitzel</groupId>
+        <groupId>de.neitzel.lib</groupId>
-        <artifactId>neitzelfx</artifactId>
+        <artifactId>neitzellib</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>neitzelfx-example</artifactId>
+    <artifactId>fx-example</artifactId>
 
     <properties>
         <link.name>${project.artifactId}</link.name>
         <launcher>${project.artifactId}</launcher>
         <appName>${project.artifactId}</appName>
-        <main.class>de.neitzel.neitzelfx.injectfx.example.Main</main.class>
+        <main.class>de.neitzel.fx.injectfx.example.Main</main.class>
         <jar.filename>${project.artifactId}-${project.version}</jar.filename>
     </properties>
 
     <dependencies>
-        <!-- NeitzelFX dependency -->
+        <!-- FX dependency -->
         <dependency>
-            <groupId>de.neitzel</groupId>
+            <groupId>de.neitzel.lib</groupId>
-            <artifactId>neitzelfx-lib</artifactId>
+            <artifactId>fx</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

fx-example/src/main/java/de/neitzel/fx/component/example/Address.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
 import lombok.Getter;
 import lombok.Setter;

fx-example/src/main/java/de/neitzel/fx/component/example/ExampleApp.java

@@ -1,6 +1,6 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
-import de.neitzel.neitzelfx.component.ComponentLoader;
+import de.neitzel.fx.component.ComponentLoader;
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

fx-example/src/main/java/de/neitzel/fx/component/example/Main.java

@@ -1,6 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
-
-import de.neitzel.neitzelfx.injectfx.example.JavaFXApp;
 
 /**
  * Another Main class as workaround when the JavaFX Application ist started without

fx-example/src/main/java/de/neitzel/fx/component/example/Person.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component.example;
+package de.neitzel.fx.component.example;
 
 import lombok.Getter;
 import lombok.Setter;

fx-example/src/main/java/de/neitzel/fx/injectfx/example/JavaFXApp.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -6,8 +6,6 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import java.io.IOException;
-
 public class JavaFXApp extends Application {
 
 	@Override

fx-example/src/main/java/de/neitzel/fx/injectfx/example/Main.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 /**
  * Another Main class as workaround when the JavaFX Application ist started without

fx-example/src/main/java/de/neitzel/fx/injectfx/example/MainWindow.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.example;
+package de.neitzel.fx.injectfx.example;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

fx-example/src/main/resources/address.fxml

@@ -6,7 +6,7 @@
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             xmlns:nfx="http://example.com/nfx"
-            fx:controller="de.neitzel.neitzelfx.component.ComponentController"
+            fx:controller="de.neitzel.fx.component.ComponentController"
             prefWidth="300" prefHeight="100">
     <children>
         <TextField layoutX="10" layoutY="10" prefWidth="280"

fx-example/src/main/resources/de/neitzel/fx/injectfx/example/MainWindow.fxml

@@ -3,7 +3,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="127.0" prefWidth="209.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.neitzel.neitzelfx.injectfx.example.MainWindow">
+<AnchorPane prefHeight="127.0" prefWidth="209.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.neitzel.fx.injectfx.example.MainWindow">
    <children>
       <Button fx:id="button" layoutX="44.0" layoutY="70.0" mnemonicParsing="false" onAction="#onButtonClick" text="Click Me" />
       <TextField fx:id="textField" layoutX="14.0" layoutY="24.0" />

fx-example/src/main/resources/person.fxml

@@ -6,7 +6,7 @@
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             xmlns:nfx="http://example.com/nfx"
-            fx:controller="de.neitzel.neitzelfx.component.ComponentController"
+            fx:controller="de.neitzel.fx.component.ComponentController"
             prefWidth="300" prefHeight="180">
     <children>
         <TextField layoutX="10" layoutY="10" prefWidth="280"

fx/pom.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.neitzel.lib</groupId>
+        <artifactId>neitzellib</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>fx</artifactId>
+
+    <properties>
+        <!-- Application Properties -->
+        <link.name>${project.artifactId}</link.name>
+        <launcher>${project.artifactId}</launcher>
+        <appName>${project.artifactId}</appName>
+        <main.class>example.de.neitzel.fx.injectfx.Main</main.class>
+        <jar.filename>${project.artifactId}-${project.version}</jar.filename>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>de.neitzel.lib</groupId>
+            <artifactId>inject</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${jar.filename}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

fx/src/main/java/de/neitzel/fx/component/AutoViewModel.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import javafx.beans.property.*;
 import java.lang.reflect.*;

fx/src/main/java/de/neitzel/fx/component/ComponentController.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

fx/src/main/java/de/neitzel/fx/component/ComponentLoader.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.component;
+package de.neitzel.fx.component;
 
 import javafx.beans.property.Property;
 import javafx.fxml.FXMLLoader;

fx/src/main/java/de/neitzel/fx/injectfx/FXMLComponentInstances.java

@@ -1,4 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
+
+import de.neitzel.inject.InjectableComponentScanner;
 
 import java.lang.reflect.Constructor;
 import java.util.*;

fx/src/main/java/de/neitzel/fx/injectfx/InjectingControllerFactory.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
 import javafx.util.Callback;
 

fx/src/main/java/de/neitzel/fx/injectfx/InjectingFXMLLoader.java

@@ -1,5 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
+import de.neitzel.inject.InjectableComponentScanner;
 import javafx.fxml.FXMLLoader;
 import lombok.extern.slf4j.Slf4j;
 

fx/src/main/java/de/neitzel/fx/mvvm/BindDirection.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 /**
  * Enum representing the direction of data binding between a JavaFX control and a ViewModel property.

fx/src/main/java/de/neitzel/fx/mvvm/BindingAwareFXMLLoader.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.beans.property.Property;
 import javafx.beans.property.StringProperty;

fx/src/main/java/de/neitzel/fx/mvvm/GenericViewController.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.fxml.Initializable;
 import java.net.URL;

fx/src/main/java/de/neitzel/fx/mvvm/GenericViewModel.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.mvvm;
+package de.neitzel.fx.mvvm;
 
 import javafx.beans.property.*;
 

fx/src/test/java/de/neitzel/fx/injectfx/InjectableComponentScannerTest.java

@@ -1,10 +1,11 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.fx.injectfx;
 
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.SuperClass;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestComponent1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestComponent1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_2;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.sub.TestComponent1_2;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.sub.TestComponent1_2;
+import de.neitzel.inject.InjectableComponentScanner;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/SuperClass.java

@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public class SuperClass {
+}

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestComponent1_1.java

@@ -0,0 +1,9 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+import de.neitzel.inject.annotation.Component;
+
+@Component
+public class TestComponent1_1 extends SuperClass implements TestInterface1_2 {
+    public TestComponent1_1() {
+    }
+}

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_1.java

@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public interface TestInterface1_1 {
+}

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/TestInterface1_2.java

@@ -0,0 +1,4 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok;
+
+public interface TestInterface1_2 {
+}

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java

@@ -0,0 +1,12 @@
+package de.neitzel.fx.injectfx.testcomponents.test1ok.sub;
+
+import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
+import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
+import de.neitzel.inject.annotation.Component;
+
+@Component
+public class TestComponent1_2 extends SuperClass implements TestInterface1_1, TestInterface1_2 {
+    public TestComponent1_2() {
+    }
+}

fx/src/test/java/de/neitzel/fx/injectfx/testcomponents/test2fail/TestComponent2_1.java

@@ -0,0 +1,12 @@
+package de.neitzel.fx.injectfx.testcomponents.test2fail;
+
+import de.neitzel.inject.annotation.Component;
+
+/**
+ * TestComponent1 that should fail.
+ */
+@Component
+public class TestComponent2_1 {
+    public TestComponent2_1(String test) {
+    }
+}

inject/pom.xml

@@ -5,19 +5,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>de.neitzel</groupId>
+        <groupId>de.neitzel.lib</groupId>
-        <artifactId>neitzelfx</artifactId>
+        <artifactId>neitzellib</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>neitzelfx-lib</artifactId>
+    <artifactId>inject</artifactId>
 
     <properties>
         <!-- Application Properties -->
         <link.name>${project.artifactId}</link.name>
         <launcher>${project.artifactId}</launcher>
         <appName>${project.artifactId}</appName>
-        <main.class>example.de.neitzel.neitzelfx.injectfx.Main</main.class>
         <jar.filename>${project.artifactId}-${project.version}</jar.filename>
     </properties>
 

inject/src/main/java/de/neitzel/inject/InjectableComponentScanner.java

@@ -1,6 +1,6 @@
-package de.neitzel.neitzelfx.injectfx;
+package de.neitzel.inject;
 
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
+import de.neitzel.inject.annotation.Component;
 import org.reflections.Reflections;
 
 import java.lang.reflect.Constructor;
@@ -8,7 +8,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * InjectableComponents scans a package for classes annotated with {@link FXMLComponent}.
+ * InjectableComponents scans a package for classes annotated with {@link Component}.
  * It determines which components can be instantiated and manages type mappings for dependency injection.
  */
 public class InjectableComponentScanner {
@@ -46,7 +46,7 @@ public class InjectableComponentScanner {
      */
     private void scanForComponents(String basePackage) {
         Reflections reflections = new Reflections(basePackage);
-        fxmlComponents.addAll(reflections.getTypesAnnotatedWith(FXMLComponent.class));
+        fxmlComponents.addAll(reflections.getTypesAnnotatedWith(Component.class));
     }
 
     /**

inject/src/main/java/de/neitzel/inject/annotation/Component.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.annotation;
+package de.neitzel.inject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,5 +7,5 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface FXMLComponent {
+public @interface Component {
 }

inject/src/main/java/de/neitzel/inject/annotation/Config.java

@@ -1,4 +1,4 @@
-package de.neitzel.neitzelfx.injectfx.annotation;
+package de.neitzel.inject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface FXMLConfig {
+public @interface Config {
     String value() default "";
 }

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java

@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public class SuperClass {
-}

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java

@@ -1,9 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-
-@FXMLComponent
-public class TestComponent1_1 extends SuperClass implements TestInterface1_2 {
-    public TestComponent1_1() {
-    }
-}

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java

@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public interface TestInterface1_1 {
-}

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java

@@ -1,4 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok;
-
-public interface TestInterface1_2 {
-}

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java

@@ -1,12 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.sub;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.SuperClass;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_1;
-import de.neitzel.neitzelfx.injectfx.testcomponents.test1ok.TestInterface1_2;
-
-@FXMLComponent
-public class TestComponent1_2 extends SuperClass implements TestInterface1_1, TestInterface1_2 {
-    public TestComponent1_2() {
-    }
-}

neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java

@@ -1,12 +0,0 @@
-package de.neitzel.neitzelfx.injectfx.testcomponents.test2fail;
-
-import de.neitzel.neitzelfx.injectfx.annotation.FXMLComponent;
-
-/**
- * TestComponent1 that should fail.
- */
-@FXMLComponent
-public class TestComponent2_1 {
-    public TestComponent2_1(String test) {
-    }
-}

pom.xml

@@ -4,15 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>de.neitzel</groupId>
+    <groupId>de.neitzel.lib</groupId>
-    <artifactId>neitzelfx</artifactId>
+    <artifactId>neitzellib</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
     <modules>
-        <module>neitzelfx-lib</module>
+        <module>inject</module>
-        <module>neitzelfx-example</module>
+        <module>fx</module>
+        <module>fx-example</module>
     </modules>
 
     <properties>