Skip to content
Snippets Groups Projects
Commit 3101d750 authored by Andreas Bayha's avatar Andreas Bayha
Browse files

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: default avatarAndreas Bayha <bayha@fortiss.org>
parent e9a5dded
No related branches found
No related tags found
1 merge request!1254014
AnnotationFxViewPart.java 6b65210913c150420f4fe67d055a0051d1d37a4e YELLOW AnnotationFxViewPart.java 6b65210913c150420f4fe67d055a0051d1d37a4e YELLOW
AnnotationViewFXController.java c4dde26002834991ccb45f30c8cc10f39c78c0be YELLOW AnnotationViewFXController.java fb57d0b275ef946c59af50d33bc3ef5be03a0a9d YELLOW
FXAnnotationFilterContentProvider.java 80fa6e9cc2f5ba3a255cab7061edca5fa368451a YELLOW FXAnnotationFilterContentProvider.java 80fa6e9cc2f5ba3a255cab7061edca5fa368451a YELLOW
...@@ -521,11 +521,11 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP ...@@ -521,11 +521,11 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
IAnnotationValueProvider<IAnnotatedSpecification> valueProvider = IAnnotationValueProvider<IAnnotatedSpecification> valueProvider =
element.getAnnotationValueProvider(spec.getClass()); element.getAnnotationValueProvider(spec.getClass());
if(valueProvider != null && valueProvider.getAnnotationValue(spec) != null && if(valueProvider != null && valueProvider.getAnnotationValue(spec) != null &&
!isElementEditable(column, element)) { !isEditable(column, element)) {
return ALICEBLUE; return ALICEBLUE;
} }
if(!isElementEditable(column, element)) { if(!isEditable(column, element)) {
return LIGHTGREY; return LIGHTGREY;
} }
} }
...@@ -545,7 +545,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP ...@@ -545,7 +545,7 @@ public class AnnotationViewFXController extends CompositeFXControllerBase<SplitP
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public boolean isElementEditable(int column, AnnotationEntry element) { public boolean isEditable(int column, AnnotationEntry element) {
if(column > 1 && colIdxAnnotationMap.containsKey(column)) { if(column > 1 && colIdxAnnotationMap.containsKey(column)) {
IAnnotatedSpecification spec = IAnnotatedSpecification spec =
colIdxAnnotationMap.get(column).getAnnotatedSpecification(); colIdxAnnotationMap.get(column).getAnnotatedSpecification();
......
DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff YELLOW DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff YELLOW
DynamicTreeContentProviderBase.java 6760a6dc5721175b1dada8f30fd9da05f7bcc4b3 GREEN DynamicTreeContentProviderBase.java 6760a6dc5721175b1dada8f30fd9da05f7bcc4b3 GREEN
DynamicTreeItem.java 75dc5534b119ffdb3c10a65810c2a0f330b7955e GREEN DynamicTreeItem.java 75dc5534b119ffdb3c10a65810c2a0f330b7955e GREEN
DynamicTreeTableUIProviderBase.java ab6ab0335f24913f26b15e523dfd56b699f92f0f YELLOW DynamicTreeTableUIProviderBase.java c6e2e137c6b8afbb81e0a90b7642571e7e2364cd YELLOW
DynamicTreeTableViewer.java 3d91b1bd43393f5d0733a253a85436b8255526ae YELLOW DynamicTreeTableViewer.java 3d91b1bd43393f5d0733a253a85436b8255526ae YELLOW
DynamicTreeUIProviderBase.java e9b68607683de279d0cb8712a28dc131c5c33ece GREEN DynamicTreeUIProviderBase.java e9b68607683de279d0cb8712a28dc131c5c33ece GREEN
DynamicTreeViewer.java 725f41f4fb4b6bfa813f010fb9083ab02eea164a GREEN DynamicTreeViewer.java 725f41f4fb4b6bfa813f010fb9083ab02eea164a GREEN
......
...@@ -159,7 +159,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -159,7 +159,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
* The element to be checked * The element to be checked
* @return Whether the column is editable * @return Whether the column is editable
*/ */
public boolean isElementEditable(int column, T element) { public boolean isEditable(int column, T element) {
return isEditable(column); return isEditable(column);
} }
...@@ -479,7 +479,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -479,7 +479,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
protected boolean canEdit(T element) { protected boolean canEdit(T element) {
return isElementEditable(columnIndex, element); return DynamicTreeTableUIProviderBase.this.isEditable(columnIndex, element);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment