From cdfb50f82f34ee403d70940d504f537bbafc2034 Mon Sep 17 00:00:00 2001 From: Denis-Cosmin NUTIU Date: Thu, 21 Mar 2024 23:23:58 +0200 Subject: [PATCH] move custom control into controls package --- src/main/java/module-info.java | 1 + .../com/nuculabs/dev/imagetagger/ui/MainPageController.kt | 1 + .../imagetagger/ui/{ => controls}/ImageTagsEntryControl.kt | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) rename src/main/kotlin/com/nuculabs/dev/imagetagger/ui/{ => controls}/ImageTagsEntryControl.kt (93%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index b2baeae..3f98cd8 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -13,5 +13,6 @@ module com.nuculabs.dev.imagetagger.ui { requires java.desktop; opens com.nuculabs.dev.imagetagger.ui to javafx.fxml, javafx.graphics; + opens com.nuculabs.dev.imagetagger.ui.controls to javafx.fxml, javafx.graphics; exports com.nuculabs.dev.imagetagger.ui; } \ No newline at end of file diff --git a/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/MainPageController.kt b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/MainPageController.kt index 5b1f788..2be521e 100644 --- a/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/MainPageController.kt +++ b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/MainPageController.kt @@ -1,6 +1,7 @@ package com.nuculabs.dev.imagetagger.ui import com.nuculabs.dev.imagetagger.tag_prediction.ImageTagsPrediction +import com.nuculabs.dev.imagetagger.ui.controls.ImageTagsEntryControl import javafx.application.Platform import javafx.fxml.FXML import javafx.scene.control.Label diff --git a/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/ImageTagsEntryControl.kt b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/controls/ImageTagsEntryControl.kt similarity index 93% rename from src/main/kotlin/com/nuculabs/dev/imagetagger/ui/ImageTagsEntryControl.kt rename to src/main/kotlin/com/nuculabs/dev/imagetagger/ui/controls/ImageTagsEntryControl.kt index 6990550..f6bd608 100644 --- a/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/ImageTagsEntryControl.kt +++ b/src/main/kotlin/com/nuculabs/dev/imagetagger/ui/controls/ImageTagsEntryControl.kt @@ -1,4 +1,4 @@ -package com.nuculabs.dev.imagetagger.ui +package com.nuculabs.dev.imagetagger.ui.controls import javafx.fxml.FXML import javafx.fxml.FXMLLoader import javafx.scene.control.TextArea @@ -30,8 +30,8 @@ class ImageTagsEntryControl private lateinit var predictedImageTags: TextArea init { - val resource = ImageTagsEntryControl::class.java.getResource("controls/image-tags-entry.fxml") - logger.info("Using resource URL: $resource") + val resource = ImageTagsEntryControl::class.java.getResource("image-tags-entry.fxml") + logger.fine("Using resource URL: $resource") val fxmlLoader = FXMLLoader(resource) fxmlLoader.setRoot(this) fxmlLoader.setController(this)