From 3fbca87dc7bb3ed6aaa1378d4fcb03407b11f870 Mon Sep 17 00:00:00 2001 From: Andreas Bayha <bayha@fortiss.org> Date: Wed, 22 Jul 2020 17:26:52 +0200 Subject: [PATCH] Annotations: YELLOW YELLOW Issue-Ref: 4014 Issue-Url: https://af3-developer.fortiss.org/issues/4014 Signed-off-by: Andreas Bayha <bayha@fortiss.org> --- .../org/fortiss/tooling/base/ui/annotation/view/fx/.ratings | 6 +++--- .../base/ui/annotation/view/fx/AnnotationFxViewPart.java | 4 +++- .../ui/annotation/view/fx/AnnotationViewFXController.java | 4 ++-- .../view/fx/FXAnnotationFilterContentProvider.java | 5 ----- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/.ratings index 649d4f77a..5bb19263c 100644 --- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/.ratings +++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/.ratings @@ -1,3 +1,3 @@ -AnnotationFxViewPart.java 34c845f7162a8a8bb680df6ee08160ce63a5a5a3 YELLOW -AnnotationViewFXController.java 00c64dbad1bd9ae071360ebe3d071705c8d2a68c YELLOW -FXAnnotationFilterContentProvider.java 6c92d9c96fb2a2441256f70e20a20b1287018a9f YELLOW +AnnotationFxViewPart.java 6b65210913c150420f4fe67d055a0051d1d37a4e YELLOW +AnnotationViewFXController.java 8dc7447c5724569072b3fd993c253af2fa6d4d0e YELLOW +FXAnnotationFilterContentProvider.java 80fa6e9cc2f5ba3a255cab7061edca5fa368451a YELLOW diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationFxViewPart.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationFxViewPart.java index 34c845f71..6b6521091 100644 --- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationFxViewPart.java +++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationFxViewPart.java @@ -26,7 +26,9 @@ import javafx.scene.Scene; */ public class AnnotationFxViewPart extends AF3FXViewPart { - private static final AnnotationViewFXController VIEW_CONTROLLER = new AnnotationViewFXController(); + /** The FX Controller for this view. */ + private static final AnnotationViewFXController VIEW_CONTROLLER = + new AnnotationViewFXController(); /** Constructor. */ public AnnotationFxViewPart() throws Exception { diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationViewFXController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationViewFXController.java index 00c64dbad..8dc7447c5 100644 --- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationViewFXController.java +++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/AnnotationViewFXController.java @@ -106,7 +106,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP CheckBox chkBoxselectedTypeOnly; /** - * {@link ComboBox} to chose the hierarchy option according to which the modele elements are + * {@link ComboBox} to chose the hierarchy option according to which the model elements are * displayed. */ @FXML @@ -537,7 +537,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP * * The only thing relevant here, is the {@link List} 'elements'. */ - protected class ArtificialRoot extends AnnotationEntry { + protected final class ArtificialRoot extends AnnotationEntry { /** * Constructor. diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/FXAnnotationFilterContentProvider.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/FXAnnotationFilterContentProvider.java index 6c92d9c96..80fa6e9cc 100644 --- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/FXAnnotationFilterContentProvider.java +++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/fx/FXAnnotationFilterContentProvider.java @@ -37,11 +37,6 @@ import org.fortiss.tooling.kernel.model.IProjectRootElement; /** * Content provider with row and column filter for the {@link AnnotationViewFXController}. - * <ul> - * {@link FXAnnotationFilterContentProvider#passesColumnFilter(ColumnHandle)} - * that is evaluated during the update of the - * {@link AnnotationViewFXController}.</li> - * </ul> * * @author barner * @author bayha -- GitLab