Bug 486902 - Cancelling model changes done in a CustomFeature logs an

error stack trace

Change-Id: I7ad75531fa95803c3441cff701be5823d17f2348

1 files changed, 3 insertions, 4 deletions

diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
index b20f3f2b..83f2e57f 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * <copyright>
  *
- * Copyright (c) 2005, 2012 SAP AG.
+ * Copyright (c) 2005, 2018 SAP AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
  *    mwenz - Bug 324859 - Need Undo/Redo support for Non-EMF based domain objects
  *    mwenz - Bug 340627 - Features should be able to indicate cancellation
  *    mwenz - Bug 351053 - Remove the need for WorkspaceCommandStackImpl
+ *    mwenz - Bug 486902 - Cancelling model changes done in a CustomFeature logs an error stack trace
  *
  * </copyright>
  *
@@ -139,13 +140,11 @@ public class GFCommandStack extends CommandStack implements CommandStackListener
 		} catch (RollbackException e) {
 			if (e.getStatus().getSeverity() == IStatus.CANCEL) {
 				// Just log it as info (operation was cancelled on purpose) 
-				T.racer().log(IStatus.INFO, "GFCommandStack.execute(Command) " + e, e); //$NON-NLS-1$
+				T.racer().log(IStatus.INFO, "Command execution was cancelled: " + e.getMessage()); //$NON-NLS-1$
 			} else {
-				// Just log it as an error
 				T.racer().error("GFCommandStack.execute(Command) " + e, e); //$NON-NLS-1$
 			}
 		} catch (Exception e) {
-			// Just log it as an error
 			T.racer().error("GFCommandStack.execute(Command) " + e, e); //$NON-NLS-1$
 		}
 		tbp.postExecute(executionInfo);