Skip to content
Snippets Groups Projects

4014

Merged 4014
1 unresolved thread
Merged Andreas Bayha requested to merge 4014 into master
1 unresolved thread
1 file
+ 12
3
Compare changes
  • Side-by-side
  • Inline
@@ -87,6 +87,15 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
/** Option text for the annotation type filter combo box. */
private static final String SHOW_ALL_ANNOTATION_TYPES = "Show all annotation types";
/** Background color for table cells, which are not editable and empty. */
public static final Color READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR = LIGHTGREY;
/** Background color for table cells, which are not editable. */
public static final Color READ_ONLY_ANNOTATION_BACKGROUND_COLOR = BISQUE;
/** Background color for table cells of the selected element. */
protected static final Color SELECTED_ANNOTATION_BACKGROUND_COLOR = LIGHTSEAGREEN;
/** {@link TextField} for entering the filter pattern. */
@FXML
private TextField txtFilterText;
@@ -508,7 +517,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
@Override
public Color getBackgroundColor(int column, AnnotationEntry element) {
if(element.getModelElement().equals(selected)) {
return LIGHTSEAGREEN;
return READ_ONLY_EMPTY_ANNOTATION_BACKGROUND_COLOR;
}
if(column > 1 && colIdxAnnotationMap.containsKey(column)) {
@@ -518,11 +527,11 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
element.getAnnotationValueProvider(spec.getClass());
if(valueProvider != null && valueProvider.getAnnotationValue(spec) != null &&
!isEditable(column, element)) {
return BISQUE;
return READ_ONLY_ANNOTATION_BACKGROUND_COLOR;
}
if(!isEditable(column, element)) {
return LIGHTGREY;
return READ_ONLY_ANNOTATION_BACKGROUND_COLOR;
}
}
Loading