From a39ba55d48b274590ce0e18d5ce41e3323fa83a5 Mon Sep 17 00:00:00 2001 From: Andreas Bayha <bayha@fortiss.org> Date: Mon, 19 Oct 2020 14:34:38 +0200 Subject: [PATCH] Annotations: Fixed bug in selection type filter Fixed an issue that occured if the first applied filter was "selected type only". Issue was in the initialization of a filter member. Issue-Ref: 4014 Issue-Url: https://af3-developer.fortiss.org/issues/4014 Signed-off-by: Andreas Bayha <bayha@fortiss.org> --- .../fortiss/tooling/base/ui/annotation/view/fx/.ratings | 2 +- .../view/fx/FXAnnotationFilterContentProvider.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 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 aa1377353..1fe62b872 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 @@ -3,4 +3,4 @@ AnnotationTreeTableUIProvider.java 4d9ea9f5267e1a04985c5f67e748f34474c97e0f YELL AnnotationViewFXController.java 87d70534cde579cbd5f6470e729783306a139324 YELLOW AnnotationsFXUtils.java 754152735e037da59a4c40fa045602c3ed85a40f YELLOW ColumnHandle.java 761c2517b3f3e4725feb7ce7e8d5927ba191a4bb YELLOW -FXAnnotationFilterContentProvider.java 90620e61e5c91669da26c0564527e0b4a31e4b9d YELLOW +FXAnnotationFilterContentProvider.java 2d3b32115f47bea44279e8bdf54691b93311d27b YELLOW 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 90620e61e..2d3b32115 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 @@ -77,8 +77,11 @@ public class FXAnnotationFilterContentProvider */ boolean restrictToSelectedModelElementType; - /** Row filter option based on hierarchy level of model element. */ - private String hierarchyLevelFilter; + /** + * Row filter option based on hierarchy level of model element. Default value for initialization + * is "ALL". + */ + private String hierarchyLevelFilter = HIERARCHY_LEVELS_ALL; /** Column filter option based on annotation type. */ private Class<? extends IAnnotatedSpecification> annotationTypeFilter; -- GitLab