From 0c345ce3988deff0d4e4e57d1d85792047a34ad2 Mon Sep 17 00:00:00 2001 From: Denis Nutiu Date: Tue, 19 Mar 2024 14:16:49 +0200 Subject: [PATCH] use ui subpackage --- build.gradle | 4 ++-- src/main/java/module-info.java | 6 +++--- .../nuculabs/dev/imagetagger/{ => ui}/HelloApplication.kt | 2 +- .../nuculabs/dev/imagetagger/{ => ui}/HelloController.kt | 2 +- .../com/nuculabs/dev/imagetagger/{ => ui}/hello-view.fxml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/main/kotlin/com/nuculabs/dev/imagetagger/{ => ui}/HelloApplication.kt (92%) rename src/main/kotlin/com/nuculabs/dev/imagetagger/{ => ui}/HelloController.kt (86%) rename src/main/resources/com/nuculabs/dev/imagetagger/{ => ui}/hello-view.fxml (86%) diff --git a/build.gradle b/build.gradle index 0a47caa..c94ea93 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,8 @@ tasks.withType(JavaCompile) { } application { - mainModule = 'com.nuculabs.dev.imagetagger' - mainClass = 'com.nuculabs.dev.imagetagger.HelloApplication' + mainModule = 'com.nuculabs.dev.imagetagger.ui' + mainClass = 'com.nuculabs.dev.imagetagger.ui.HelloApplication' } kotlin { jvmToolchain( 17 ) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 76c0461..a2a95e8 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module com.nuculabs.dev.imagetagger { +module com.nuculabs.dev.imagetagger.ui { requires javafx.controls; requires javafx.fxml; requires kotlin.stdlib; @@ -8,6 +8,6 @@ module com.nuculabs.dev.imagetagger { requires net.synedra.validatorfx; requires org.kordamp.ikonli.javafx; - opens com.nuculabs.dev.imagetagger to javafx.fxml; - exports com.nuculabs.dev.imagetagger; + opens com.nuculabs.dev.imagetagger.ui to javafx.fxml; + exports com.nuculabs.dev.imagetagger.ui; } \ No newline at end of file diff --git a/src/main/kotlin/com/nuculabs/dev/imagetagger/HelloApplication.kt b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloApplication.kt similarity index 92% rename from src/main/kotlin/com/nuculabs/dev/imagetagger/HelloApplication.kt rename to src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloApplication.kt index e1d48d9..cdddb32 100644 --- a/src/main/kotlin/com/nuculabs/dev/imagetagger/HelloApplication.kt +++ b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloApplication.kt @@ -1,4 +1,4 @@ -package com.nuculabs.dev.imagetagger +package com.nuculabs.dev.imagetagger.ui import javafx.application.Application import javafx.fxml.FXMLLoader diff --git a/src/main/kotlin/com/nuculabs/dev/imagetagger/HelloController.kt b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloController.kt similarity index 86% rename from src/main/kotlin/com/nuculabs/dev/imagetagger/HelloController.kt rename to src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloController.kt index a324671..78744cd 100644 --- a/src/main/kotlin/com/nuculabs/dev/imagetagger/HelloController.kt +++ b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/HelloController.kt @@ -1,4 +1,4 @@ -package com.nuculabs.dev.imagetagger +package com.nuculabs.dev.imagetagger.ui import javafx.fxml.FXML import javafx.scene.control.Label diff --git a/src/main/resources/com/nuculabs/dev/imagetagger/hello-view.fxml b/src/main/resources/com/nuculabs/dev/imagetagger/ui/hello-view.fxml similarity index 86% rename from src/main/resources/com/nuculabs/dev/imagetagger/hello-view.fxml rename to src/main/resources/com/nuculabs/dev/imagetagger/ui/hello-view.fxml index bdee5cc..3940bc7 100644 --- a/src/main/resources/com/nuculabs/dev/imagetagger/hello-view.fxml +++ b/src/main/resources/com/nuculabs/dev/imagetagger/ui/hello-view.fxml @@ -6,7 +6,7 @@ + fx:controller="com.nuculabs.dev.imagetagger.ui.HelloController">