From 2524134c6db616a699f392d919e286d8fe25b762 Mon Sep 17 00:00:00 2001
From: Vincent Lorenzo
Date: Fri, 28 Mar 2014 16:14:49 +0100
Subject: 431503: [Table 2] The Property view of the table generate an
 exception Widget Is Disposed when we try to add Post Action...

---
 .../infra/widgets/editors/MultipleValueEditor.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
index b0694e00bb4..4b23273caa4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
@@ -412,13 +412,10 @@ public class MultipleValueEditor extends AbstractListEditor implements Selection
 					@Override
 					public void run() {
 						Object newElement = referenceFactory.createObject(MultipleValueEditor.this, context);
-						if(newElement == null) {
-							// Cancel the operation
-							throw new OperationCanceledException();
+						if(newElement != null) {
+							modelProperty.add(newElement);
+							commit();
 						}
-						
-						modelProperty.add(newElement);
-						commit();
 					}
 				}, NLS.bind(Messages.MultipleValueEditor_addOperation, labelText));
 			}
@@ -469,7 +466,9 @@ public class MultipleValueEditor extends AbstractListEditor implements Selection
 	@Override
 	protected void commit() {
 		super.commit();
-		treeViewer.refresh();
+		if(!isDisposed()){
+			treeViewer.refresh();
+		}
 	}
 
 	/**
@@ -601,7 +600,9 @@ public class MultipleValueEditor extends AbstractListEditor implements Selection
 	 * @param event
 	 */
 	public void handleChange(ChangeEvent event) {
-		treeViewer.refresh();
+		if(!isDisposed()) {
+			treeViewer.refresh();
+		}
 	}
 
 	@Override
-- 
cgit v1.2.3