Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsma Smaoui2017-02-23 16:39:34 +0000
committerGerrit Code Review @ Eclipse.org2017-02-27 15:04:12 +0000
commit9ff3c96f838daa50157ec4a3bd48a19dc72b6adc (patch)
treecbddd711ccb42caa6e1b8a41458dffae9162a0bb
parent81b493967688276d7d5e8f56d156c099f251fbea (diff)
downloadorg.eclipse.papyrus-9ff3c96f838daa50157ec4a3bd48a19dc72b6adc.tar.gz
org.eclipse.papyrus-9ff3c96f838daa50157ec4a3bd48a19dc72b6adc.tar.xz
org.eclipse.papyrus-9ff3c96f838daa50157ec4a3bd48a19dc72b6adc.zip
Bug 509653 - [Tool] Model explorer direct edit cancelled due to refresh
from SemanticUMLContentProvider * do not trigger refresh if the cell is activated (can not call isCellEditorActive() cause this method is not public) Change-Id: If97c2c4c4bcfae1df2880aa955bda8d486d3497b Signed-off-by: Asma Smaoui <asma.smaoui@cea.fr>
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/SemanticUMLContentProvider.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/SemanticUMLContentProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/SemanticUMLContentProvider.java
index fa0bb6e144a..9f521aea93f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/SemanticUMLContentProvider.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/SemanticUMLContentProvider.java
@@ -381,7 +381,9 @@ public class SemanticUMLContentProvider extends SemanticEMFContentProvider {
// During display, a resource has been loaded (e.g. by a Label provider).
// Schedule an update (in the future, to avoid conflicts with a potential current update)
- if ((viewer != null) && (viewer.getControl() != null) && !viewer.getControl().isDisposed()) {
+
+ // do not trigger a refresh if the widget is activated (in edit mode) Bug 509653
+ if ((viewer != null) && (viewer.getControl() != null) && !viewer.getControl().isDisposed() && !viewer.getControl().isFocusControl()) {
if (pendingRefresh.compareAndSet(null, new Runnable() {
@Override

Back to the top