Merge branch '4014' into 'master'

4014

See merge request af3/af3!377

org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/.ratings

 ParameterEntryTreeViewerEditingSupport.java 4ee444241e97e5988d8c6f2f3437aa0e89a83501 GREEN
-ParameterEntryTreeViewerLabelProvider.java 46098593c7438473ce67f60dbbdc5d69afddc077 GREEN
+ParameterEntryTreeViewerLabelProvider.java 93d661b82d11167b08721c3c3448d1a9eb608b7d GREEN
 ParameterSourceElementTreeViewerEditingSupport.java 9e30e6e0df10beaaf3231c9ff06a0c5ab1df9b34 GREEN
-ParameterSourceElementTreeViewerLabelProvider.java 6dbb656b23bf79aedbfd31d14c248fbe8f32ebad GREEN
+ParameterSourceElementTreeViewerLabelProvider.java 2e5fce0c23707df0d40e4d876df7ece83e050424 GREEN
 ParameterTableTreeViewerManager.java 497ae92bb11d8adbc1059636e632267f4fd035fd GREEN
 TreeViewerCheckBoxEditingSupport.java e74087115ffcc255c9e7604f567f2c51478eac1b GREEN
 TreeViewerCheckBoxLabelProvider.java a3f517284f52310b06f16d37fe351f44eb8e48ff GREEN

org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/ParameterEntryTreeViewerLabelProvider.java

@@ -19,8 +19,8 @@ import static org.fortiss.af3.allocation.utils.AllocationModelElementFactory.RIG
 import static org.fortiss.af3.allocation.utils.AllocationUtils.getAnnotationEntry;
 import static org.fortiss.af3.allocation.utils.AllocationUtils.getParameterEntryName;
 import static org.fortiss.af3.allocation.utils.AllocationUtils.getParameterEntryValue;
-import static org.fortiss.tooling.base.ui.annotation.labelprovider.AnnotationLabelProvider.READ_ONLY_ANNOTATION_BACKGROUND_COLOR;
-import static org.fortiss.tooling.base.ui.annotation.labelprovider.AnnotationLabelProvider.getAnnotatationBackgroundColor;
+import static org.fortiss.tooling.base.ui.annotation.view.fx.AnnotationsFXUtils.READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR_SWT;
+import static org.fortiss.tooling.base.ui.annotation.view.fx.AnnotationsFXUtils.getSWTBackgroundColorForEntry;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
@@ -141,13 +141,13 @@ public class ParameterEntryTreeViewerLabelProvider<T extends ParameterTable>
 
 			Color color = super.getBackground(object);
 			if(annotationEntry != null) {
-				return getAnnotatationBackgroundColor(annotationEntry, annotationType, color);
+				return getSWTBackgroundColorForEntry(annotationEntry, annotationType, color);
 			}
 			// Fall back to default color in case annotation entry does not exist yet, but the
 			// element is "applicable" for the underlying parameter.
 			return color;
 		}
 
-		return READ_ONLY_ANNOTATION_BACKGROUND_COLOR;
+		return READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR_SWT;
 	}
 }

org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/ParameterSourceElementTreeViewerLabelProvider.java

@@ -17,7 +17,8 @@ package org.fortiss.af3.allocation.ui.editor.treeviewer;
 
 import static org.fortiss.af3.allocation.ui.editor.treeviewer.ParameterTableTreeViewerManager.getAnnotationName;
 import static org.fortiss.af3.allocation.ui.editor.treeviewer.ParameterTableTreeViewerManager.getAnnotationType;
-import static org.fortiss.tooling.base.ui.annotation.labelprovider.AnnotationLabelProvider.getAnnotatationBackgroundColor;
+import static org.fortiss.tooling.base.ui.annotation.view.fx.AnnotationsFXUtils.READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR_SWT;
+import static org.fortiss.tooling.base.ui.annotation.view.fx.AnnotationsFXUtils.getSWTBackgroundColorForEntry;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
@@ -27,7 +28,6 @@ import org.fortiss.tooling.base.annotation.AnnotationEntry;
 import org.fortiss.tooling.base.annotation.IAnnotationValueService;
 import org.fortiss.tooling.base.model.element.IAnnotatedSpecification;
 import org.fortiss.tooling.base.model.element.IModelElement;
-import org.fortiss.tooling.base.ui.annotation.labelprovider.AnnotationLabelProvider;
 import org.fortiss.tooling.kernel.ui.util.KernelUIUtils;
 
 /**
@@ -95,10 +95,10 @@ public class ParameterSourceElementTreeViewerLabelProvider extends ColumnLabelPr
 			AnnotationEntry annotationEntry =
 					IAnnotationValueService.getInstance().getAnnotationEntry((IModelElement)object);
 
-			return getAnnotatationBackgroundColor(annotationEntry, annotationType, color);
+			return getSWTBackgroundColorForEntry(annotationEntry, annotationType, color);
 		}
 
-		return AnnotationLabelProvider.READ_ONLY_ANNOTATION_BACKGROUND_COLOR;
+		return READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR_SWT;
 	}
 
 	/** {@inheritDoc} */

org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/overview/fx/.ratings

 RequirementsOverviewFXEditor.java 1dd6ec50837cd05bb8799466f8738b282b964e95 GREEN
 RequirementsOverviewFXEditorBinding.java 3346106642d7dbd68e6328e4cbd33f6569c6f6ff GREEN
-RequirementsOverviewFXEditorContentProvider.java a3815c1d4211d9e7f2bea6be700904a6e02150ed GREEN
+RequirementsOverviewFXEditorContentProvider.java 5783fa0720cc1454acc0285eb056fd97933549fe GREEN
 RequirementsOverviewFXEditorUIProvider.java adece2e83a54cb9094618cd7830358cb6e601d97 GREEN

org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/overview/fx/RequirementsOverviewFXEditorContentProvider.java

@@ -88,6 +88,9 @@ public class RequirementsOverviewFXEditorContentProvider
 		if(element == null) {
 			return false;
 		}
+		if(filterValue == null) {
+			return true;
+		}
 
 		if(element instanceof Analysis) {
 			return true;