From 7b9ad2ad93b0e18484b097b7cc6398918e9356c2 Mon Sep 17 00:00:00 2001 From: LeStegii Date: Mon, 10 Jun 2024 11:16:46 +0200 Subject: [PATCH 1/2] refactor(framework): Add new for loop constructor based on app --- .../main/java/org/fulib/fx/constructs/forloop/FxFor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java b/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java index 8b7e193..1dfb109 100644 --- a/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java +++ b/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java @@ -2,12 +2,12 @@ import javafx.collections.ObservableList; import javafx.scene.Parent; +import org.fulib.fx.FulibFxApp; import org.fulib.fx.annotation.controller.Component; import org.fulib.fx.controller.ControllerManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; import java.util.Map; @@ -21,11 +21,15 @@ public class FxFor { private final ControllerManager controllerManager; - @Inject + @Deprecated public FxFor(ControllerManager controllerManager) { this.controllerManager = controllerManager; } + public FxFor(FulibFxApp app) { + this.controllerManager = app.frameworkComponent().controllerManager(); + } + /** * Creates a new For loop for use in code and initializes it. *

From e4e60ea19b61d9694ce745add54ff742d160daa9 Mon Sep 17 00:00:00 2001 From: LeStegii Date: Mon, 10 Jun 2024 11:19:27 +0200 Subject: [PATCH 2/2] fix(framework): Re-add `@Inject` annotation --- .../src/main/java/org/fulib/fx/constructs/forloop/FxFor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java b/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java index 1dfb109..e37041f 100644 --- a/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java +++ b/framework/src/main/java/org/fulib/fx/constructs/forloop/FxFor.java @@ -8,6 +8,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; import java.util.Map; @@ -26,6 +27,7 @@ public FxFor(ControllerManager controllerManager) { this.controllerManager = controllerManager; } + @Inject public FxFor(FulibFxApp app) { this.controllerManager = app.frameworkComponent().controllerManager(); }