From 3101d7502e4686f31fdd4b422f1da61ef6a2c7f9 Mon Sep 17 00:00:00 2001
From: Andreas Bayha <bayha@fortiss.org>
Date: Mon, 10 Aug 2020 16:51:17 +0200
Subject: [PATCH] DynmicTreeTable: Changed signature of
DynamicTreeTableUIProviderBase.isEditable
New (more consistent) signature: isEditable(int column, AnnotationEntry
element).
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 | 2 +-
.../ui/annotation/view/fx/AnnotationViewFXController.java | 6 +++---
.../tooling/common/ui/javafx/control/treetableview/.ratings | 2 +-
.../treetableview/DynamicTreeTableUIProviderBase.java | 4 ++--
4 files changed, 7 insertions(+), 7 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 1ff07a4ed..c94ec1b52 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 c4dde26002834991ccb45f30c8cc10f39c78c0be YELLOW
+AnnotationViewFXController.java fb57d0b275ef946c59af50d33bc3ef5be03a0a9d 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 c4dde2600..fb57d0b27 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
@@ -521,11 +521,11 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
IAnnotationValueProvider<IAnnotatedSpecification> valueProvider =
element.getAnnotationValueProvider(spec.getClass());
if(valueProvider != null && valueProvider.getAnnotationValue(spec) != null &&
- !isElementEditable(column, element)) {
+ !isEditable(column, element)) {
return ALICEBLUE;
}
- if(!isElementEditable(column, element)) {
+ if(!isEditable(column, element)) {
return LIGHTGREY;
}
}
@@ -545,7 +545,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
/** {@inheritDoc} */
@Override
- public boolean isElementEditable(int column, AnnotationEntry element) {
+ public boolean isEditable(int column, AnnotationEntry element) {
if(column > 1 && colIdxAnnotationMap.containsKey(column)) {
IAnnotatedSpecification spec =
colIdxAnnotationMap.get(column).getAnnotatedSpecification();
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
index de6d5d399..bec9ef7b7 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
@@ -1,7 +1,7 @@
DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff YELLOW
DynamicTreeContentProviderBase.java 6760a6dc5721175b1dada8f30fd9da05f7bcc4b3 GREEN
DynamicTreeItem.java 75dc5534b119ffdb3c10a65810c2a0f330b7955e GREEN
-DynamicTreeTableUIProviderBase.java ab6ab0335f24913f26b15e523dfd56b699f92f0f YELLOW
+DynamicTreeTableUIProviderBase.java c6e2e137c6b8afbb81e0a90b7642571e7e2364cd YELLOW
DynamicTreeTableViewer.java 3d91b1bd43393f5d0733a253a85436b8255526ae YELLOW
DynamicTreeUIProviderBase.java e9b68607683de279d0cb8712a28dc131c5c33ece GREEN
DynamicTreeViewer.java 725f41f4fb4b6bfa813f010fb9083ab02eea164a GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java
index ab6ab0335..c6e2e137c 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java
@@ -159,7 +159,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
* The element to be checked
* @return Whether the column is editable
*/
- public boolean isElementEditable(int column, T element) {
+ public boolean isEditable(int column, T element) {
return isEditable(column);
}
@@ -479,7 +479,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
/** {@inheritDoc} */
@Override
protected boolean canEdit(T element) {
- return isElementEditable(columnIndex, element);
+ return DynamicTreeTableUIProviderBase.this.isEditable(columnIndex, element);
}
/** {@inheritDoc} */
--
GitLab