From a96dadf2abfc79fc2639a6b12a42932a01c3d0d5 Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Tue, 17 Dec 2019 19:00:57 +0100
Subject: [PATCH] CR: RED
Issue-Ref: 3437
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.../src/org/fortiss/tooling/common/ui/javafx/layout/.ratings | 4 ++--
.../common/ui/javafx/layout/CompositeFXControllerBase.java | 4 ++++
.../common/ui/javafx/layout/ICompositeFXController.java | 5 ++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/.ratings
index 50688d7be..f74f561a1 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/.ratings
@@ -1,2 +1,2 @@
-CompositeFXControllerBase.java 7434e6a8e5c32207c4ffdcac07e0d3ea0cc1125a YELLOW
-ICompositeFXController.java 16eebea906607ced29506abf00a4c859fa763269 YELLOW
+CompositeFXControllerBase.java a5f872b5e3a1ebd4c8160318bde5f7f99019b99d RED
+ICompositeFXController.java ef49c62dfeefbf996089d0cb36979acda979a98e RED
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/CompositeFXControllerBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/CompositeFXControllerBase.java
index 7434e6a8e..a5f872b5e 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/CompositeFXControllerBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/CompositeFXControllerBase.java
@@ -51,11 +51,15 @@ public abstract class CompositeFXControllerBase implements ICompositeFXControlle
/** Constructor. */
public CompositeFXControllerBase(ICompositeFXController... containments) {
this.containments = containments;
+ // TODO(AD): The null assignment is unneeded.
this.layout = null;
}
/** {@inheritDoc} */
@Override
+ // TODO(AD): Is this method required for each controller, or would it be sufficient to apply the
+ // FXML style in the AF3FXViewPart? Note that in this case, we could define a separate getter
+ // for the layout.
public Node getOrLoadLayout() {
if(layout == null) {
URL fxmlResource = getClass().getResource(getFXMLLocation());
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/ICompositeFXController.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/ICompositeFXController.java
index 16eebea90..ef49c62df 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/ICompositeFXController.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/layout/ICompositeFXController.java
@@ -25,9 +25,8 @@ import javafx.scene.Node;
*/
public interface ICompositeFXController {
- /**
- * Loads the a JavaFX {@link Node} from the specified {@link FXML} resource.
- */
+ /** Loads the a JavaFX {@link Node} from the specified {@link FXML} resource. */
+ // TODO(AD): See base class impl.
public Node getOrLoadLayout();
/** Returns the location of the {@link FXML} resource with the view's layout. */
--
GitLab