[GEF] Replace executeCommand() in EditDomain with CommandStack

The special handling of commands done in the executeCommand() method
should instead be done via a custom CommandStack.

Author: ptziegler

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/actions/CutAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -71,7 +71,7 @@ public void run() throws Exception {
 					CopyAction.doCopy(m_mementos);
 				}
 				// delete
-				m_viewer.getEditDomain().executeCommand(m_command);
+				m_viewer.getEditDomain().getCommandStack().execute(m_command);
 			}
 		});
 	}

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/tools/TabOrderTool.java

@@ -250,7 +250,7 @@ private void deactivateTabContainerPolicy() {
 		if (m_containerPolicy != null) {
 			m_containerPolicy.eraseTargetFeedback(m_containerRequest);
 			if (m_saveTabOrder && m_containerRequest.getCommand() != null) {
-				getDomain().executeCommand(m_containerRequest.getCommand());
+				getDomain().getCommandStack().execute(m_containerRequest.getCommand());
 			}
 		}
 	}

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/Tool.java

@@ -169,7 +169,7 @@ protected final void executeCommand() {
 		if (m_command != null) {
 			Command command = m_command;
 			setCommand(null);
-			getDomain().executeCommand(command);
+			getDomain().getCommandStack().execute(command);
 		}
 	}
 

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditDomain.java

@@ -19,6 +19,7 @@
 import org.eclipse.draw2d.EventListenerList;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CommandStack;
 import org.eclipse.swt.events.MouseEvent;
 
 /**
@@ -32,31 +33,35 @@ public class EditDomain extends org.eclipse.gef.EditDomain {
 	private MouseEvent m_currentMouseEvent;
 	private ICommandExceptionHandler m_exceptionHandler;
 
+	public EditDomain() {
+		setCommandStack(new DesignerCommandStack());
+	}
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Commands/Exceptions
 	//
 	////////////////////////////////////////////////////////////////////////////
 	private Tool m_inCommandTool;
 
-	/**
-	 * Execute given {@link Command} and handle all exceptions.
-	 */
-	public void executeCommand(Command command) {
-		clearToolDuringCommandExecution();
-		try {
-			if (System.getProperty("wbp.EditDomain.simulateCommandException") != null) {
-				throw new Error("Simulated exception.");
-			}
-			command.execute();
-		} catch (Throwable e) {
-			if (m_exceptionHandler != null) {
-				m_exceptionHandler.handleException(e);
-				// exception handler usually recreates viewer, so we should cancel execution on current viewer
-				throw new CancelOperationError();
+	private class DesignerCommandStack extends CommandStack {
+		@Override
+		public void execute(Command command) {
+			clearToolDuringCommandExecution();
+			try {
+				if (System.getProperty("wbp.EditDomain.simulateCommandException") != null) {
+					throw new Error("Simulated exception.");
+				}
+				super.execute(command);
+			} catch (Throwable e) {
+				if (m_exceptionHandler != null) {
+					m_exceptionHandler.handleException(e);
+					// exception handler usually recreates viewer, so we should cancel execution on current viewer
+					throw new CancelOperationError();
+				}
+			} finally {
+				restoreToolAfterCommandExecution();
 			}
-		} finally {
-			restoreToolAfterCommandExecution();
 		}
 	}
 

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/dnd/TreeDropListener.java

@@ -271,7 +271,7 @@ private static Set<? extends EditPart> includeChildren(List<? extends EditPart>
 	private void executeCommand() {
 		if (m_command != null) {
 			try {
-				m_viewer.getEditDomain().executeCommand(m_command);
+				m_viewer.getEditDomain().getCommandStack().execute(m_command);
 			} finally {
 				setCommand(null);
 			}

org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/actions/DeleteAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -63,7 +63,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	@Override
 	public void run() {
-		m_viewer.getEditDomain().executeCommand(m_command);
+		m_viewer.getEditDomain().getCommandStack().execute(m_command);
 	}
 
 	@Override

org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/KeyboardMovingLayoutEditPolicy.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -186,7 +186,7 @@ public void run() {
 											}
 										}
 										// run command
-										getViewer().getEditDomain().executeCommand(command);
+										getViewer().getEditDomain().getCommandStack().execute(command);
 									}
 								} finally {
 									m_isKeyboardMoving = false;

org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapSelectionEditPolicy.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -255,7 +255,7 @@ public void run() throws Exception {
 	 * Executes given {@link RunnableEx} as edit operation.
 	 */
 	private void execute(final RunnableEx runnable) {
-		getHost().getViewer().getEditDomain().executeCommand(new EditCommand(m_component) {
+		getHost().getViewer().getEditDomain().getCommandStack().execute(new EditCommand(m_component) {
 			@Override
 			protected void executeEdit() throws Exception {
 				runnable.run();

org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -147,7 +147,7 @@ public Command getCommand(Request request) {
 		return new Command() {
 			@Override
 			public void execute() {
-				getHost().getViewer().getEditDomain().executeCommand(m_resizeCommand);
+				getHost().getViewer().getEditDomain().getCommandStack().execute(m_resizeCommand);
 			}
 		};
 	}

org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -152,7 +152,7 @@ public Command getCommand(Request request) {
 		return new Command() {
 			@Override
 			public void execute() {
-				getHost().getViewer().getEditDomain().executeCommand(m_resizeCommand);
+				getHost().getViewer().getEditDomain().getCommandStack().execute(m_resizeCommand);
 			}
 		};
 	}