Bug 512748 - OperationCanceledException in NestingNotifyingWorkspaceCommandStack.handleError

- Capture OperationCanceledException in ReferenceDialog and MultipleValueEditor
- Correct method name (was partly in french): API break, but major revision number has changed

2 files changed, 31 insertions, 22 deletions

diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
index 575b9038a5e..04115a8c099 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
@@ -275,7 +275,7 @@ public class MultipleValueEditor<T extends IElementSelector> extends AbstractLis
 			}
 		}
 
-		updateBoutons();
+		updateButtons();
 
 	}
 
@@ -405,20 +405,24 @@ public class MultipleValueEditor<T extends IElementSelector> extends AbstractLis
 		if (e.widget == null) {
 			return;
 		}
-		if (e.widget == add) {
-			if (this.upperBound == MANY || modelProperty.size() < this.upperBound) {
-				addAction();
+		try {
+			if (e.widget == add) {
+				if (this.upperBound == MANY || modelProperty.size() < this.upperBound) {
+					addAction();
+				}
+			} else if (e.widget == remove) {
+				removeAction();
+			} else if (e.widget == up) {
+				upAction();
+			} else if (e.widget == down) {
+				downAction();
+			} else if (e.widget == edit) {
+				editAction();
 			}
-		} else if (e.widget == remove) {
-			removeAction();
-		} else if (e.widget == up) {
-			upAction();
-		} else if (e.widget == down) {
-			downAction();
-		} else if (e.widget == edit) {
-			editAction();
+		} catch (OperationCanceledException canceledException) {
+			// do nothing, this exception occurs whenever one of the actions above
+			// gets canceled
 		}
-
 		updateControls();
 	}
 
@@ -728,7 +732,7 @@ public class MultipleValueEditor<T extends IElementSelector> extends AbstractLis
 		this.upperBound = upperBound;
 	}
 
-	public void updateBoutons() {
+	public void updateButtons() {
 		/* Disable the button 'add' if the upperBound is reached */
 		if (this.upperBound != MANY) {
 			if (modelProperty.size() >= this.upperBound) {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
index 95775b4483d..70c69048c01 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
@@ -434,14 +434,19 @@ public class ReferenceDialog extends AbstractReferenceDialog implements Selectio
 	@Override
 	public void widgetSelected(SelectionEvent e) {
 		Widget widget = e.widget;
-		if (widget == browseValuesButton) {
-			browseAction();
-		} else if (widget == createInstanceButton) {
-			createAction();
-		} else if (widget == editInstanceButton) {
-			editAction();
-		} else if (widget == unsetButton) {
-			unsetAction();
+		try {
+			if (widget == browseValuesButton) {
+				browseAction();
+			} else if (widget == createInstanceButton) {
+				createAction();
+			} else if (widget == editInstanceButton) {
+				editAction();
+			} else if (widget == unsetButton) {
+				unsetAction();
+			}
+		} catch (OperationCanceledException canceledException) {
+			// do nothing, this exception occurs whenever one of the actions above
+			// gets canceled
 		}
 	}