From b11e08746124658f20c5c0d8d6b6cd8647bdb71e Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 20 Nov 2018 17:33:35 +0100
Subject: [PATCH] Set null value if available values do not contain the current
value
Issue-Ref: 3470
Issue-Url: https://af3-developer.fortiss.org/issues/3470
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/kernel/ui/extension/base/.ratings | 2 +-
.../kernel/ui/extension/base/EReferencePropertySectionBase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
index 574ffdd72..952d7ac1b 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
@@ -3,7 +3,7 @@ ContextMenuSubMenuContributorBase.java 6275d96fe8690d9d4744bcbaef3c7d14ba8e30ff
DialogMessageHandler.java 8714da09a777c8557de0a5c48ff68c340f9fa91d GREEN
EObjectActionBase.java 4ef9f8be59e64d4838acc9e268d418ba5d94fa1a GREEN
EReferenceListPropertySectionBase.java bbc5f6851842a9cb0af5e9898d9c6e197a36312a YELLOW
-EReferencePropertySectionBase.java 45411fc3bae5b9251fb465ec36fc39f0f4d5dc44 YELLOW
+EReferencePropertySectionBase.java 0548da6778516003257f59d0b4c2b60d458be3b6 YELLOW
EditorBase.java 9c09fff92945256bb8680992ae7bb2c78f47b150 GREEN
IListPropertySection.java a093a8a625d291b8adecec5082e32748a2d99f9e YELLOW
ModelEditorBindingBase.java 4c5ac569c0b6e7678fc8191096b26dfd09fdcb98 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
index 45411fc3b..0548da677 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
@@ -185,7 +185,7 @@ public abstract class EReferencePropertySectionBase<I extends EObject, R extends
// Set initial selection
EObject value = getModelValue(input);
- setSelection(value);
+ setSelection(values.contains(value) ? value : null);
}
/** Sets the selection of the {@link #modelReferenceCombo} . */
--
GitLab