From 72d00d7632753e99229cc189318c640fe69b61b9 Mon Sep 17 00:00:00 2001
From: Andreas Bayha <bayha@fortiss.org>
Date: Wed, 22 Jul 2020 17:41:36 +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>
---
.../base/ui/annotation/view/fx/.ratings | 2 +-
.../view/fx/AnnotationViewFXController.java | 21 ++++++++++---------
2 files changed, 12 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 5bb19263c..ba76e0957 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 6b65210913c150420f4fe67d055a0051d1d37a4e YELLOW
-AnnotationViewFXController.java 8dc7447c5724569072b3fd993c253af2fa6d4d0e YELLOW
+AnnotationViewFXController.java 55041ac106d68f27fcbcb26cf0a15cc3842f9bb1 YELLOW
FXAnnotationFilterContentProvider.java 80fa6e9cc2f5ba3a255cab7061edca5fa368451a YELLOW
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 8dc7447c5..55041ac10 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
@@ -87,34 +87,34 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
/** {@link TextField} for entering the filter pattern. */
@FXML
- TextField txtFilterText;
+ private TextField txtFilterText;
/** {@link RadioButton} to enable filtering for model element names. */
@FXML
- RadioButton radBtnFilterModelElements;
+ private RadioButton radBtnFilterModelElements;
/** {@link RadioButton} to enable filtering for annotation names. */
@FXML
- RadioButton radBtnFilterAnnotationNames;
+ private RadioButton radBtnFilterAnnotationNames;
/** {@link CheckBox} to make name filtering case sensitive. */
@FXML
- CheckBox chkBoxMatchCase;
+ private CheckBox chkBoxMatchCase;
/** {@link CheckBox} to only show model elements with the same type as the selected one. */
@FXML
- CheckBox chkBoxselectedTypeOnly;
+ private CheckBox chkBoxselectedTypeOnly;
/**
* {@link ComboBox} to chose the hierarchy option according to which the model elements are
* displayed.
*/
@FXML
- ComboBox<String> comboHierarchy;
+ private ComboBox<String> comboHierarchy;
/** {@link ComboBox} to chose an annotation type to be displayed exclusively. */
@FXML
- ComboBox<String> comboAnnotationType;
+ private ComboBox<String> comboAnnotationType;
/** The {@link TreeTableView} for the annotation table. */
@FXML
@@ -127,7 +127,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
private IProjectRootElement curentRootElement;
/** The {@link IModelElement} that is currently selected by the user. */
- IModelElement selected;
+ private IModelElement selected;
/** {@link Set} of {@link ColumnHandle}s (i.e. management objects for columns). */
private Set<ColumnHandle<IAnnotatedSpecification>> columnHandles = new TreeSet<>();
@@ -144,14 +144,15 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
new HashMap<String, IAnnotatedSpecification>();
/** Content provider for the annotation table with all filtering functionality. */
- FXAnnotationFilterContentProvider filterContentProvider =
+ private FXAnnotationFilterContentProvider filterContentProvider =
new FXAnnotationFilterContentProvider();
/**
* Associates the handles of the annotations with their ordered column indexes.
* Used for the UI providers of cell items.
*/
- Map<Integer, ColumnHandle<IAnnotatedSpecification>> colIdxAnnotationMap = new HashMap<>();
+ private Map<Integer, ColumnHandle<IAnnotatedSpecification>> colIdxAnnotationMap =
+ new HashMap<>();
/** {@inheritDoc} */
@Override
--
GitLab