From e9a5dded42995555a519d3a31462b8c88cf27e5d Mon Sep 17 00:00:00 2001
From: Andreas Bayha <bayha@fortiss.org>
Date: Mon, 10 Aug 2020 16:40:42 +0200
Subject: [PATCH] DynamicTreeTable: Changed signature of isElementEditable.
The order of parameters is now (int, T), as in getLabel(...).
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 | 2 +-
.../tooling/common/ui/javafx/control/treetableview/.ratings | 2 +-
.../treetableview/DynamicTreeTableUIProviderBase.java | 6 +++---
4 files changed, 6 insertions(+), 6 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 e3bf1cfd5..1ff07a4ed 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 c7b53405c1e135c8e4195ed68173570d88c79f48 YELLOW
+AnnotationViewFXController.java c4dde26002834991ccb45f30c8cc10f39c78c0be 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 c7b53405c..c4dde2600 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
@@ -510,7 +510,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
/** {@inheritDoc} */
@Override
- public Color getBackgroundColor(AnnotationEntry element, int column) {
+ public Color getBackgroundColor(int column, AnnotationEntry element) {
if(element.getModelElement().equals(selected)) {
return LIGHTSEAGREEN;
}
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 b1f544d15..de6d5d399 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 a8545621099da2a75f2e1aa25025e35902668bde YELLOW
+DynamicTreeTableUIProviderBase.java ab6ab0335f24913f26b15e523dfd56b699f92f0f 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 a85456210..ab6ab0335 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
@@ -74,7 +74,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
* Sets styling properties as background color for the given cell.
*
* This method is not intended to be overwritten. Instead there are getters as
- * {@link #getBackgroundColor(Object, int)}.
+ * {@link #getBackgroundColor(int, Object)}.
*
* @param cell
* The cell to be layouted.
@@ -86,7 +86,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
T data = cell.getTreeTableRow().getItem();
if(data != null) {
- String colorStr = colorToHex(getBackgroundColor(data, columnIndex));
+ String colorStr = colorToHex(getBackgroundColor(columnIndex, data));
cell.setStyle("-fx-background-color: " + colorStr);
}
}
@@ -102,7 +102,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
*
* @return The {@link Color} to be used for the cell background.
*/
- public Color getBackgroundColor(T element, int column) {
+ public Color getBackgroundColor(int column, T element) {
return WHITE;
}
--
GitLab