[GEF] Harmonize CreateRequest with GEF class

In the GEF CreateRequest, the factory needs to be explicitly set via the
`setFactory(CreationFactory)` method, rather than as a constructor
argument. Additionally, the distinction between new and selected object
is not needed and thus can be removed.

Author: ptziegler

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/AbstractCreateRequest.java

@@ -13,7 +13,6 @@
 package org.eclipse.wb.gef.core.requests;
 
 import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.Request;
 import org.eclipse.gef.requests.DropRequest;
 import org.eclipse.gef.requests.LocationRequest;
 
@@ -54,19 +53,4 @@ public Dimension getSize() {
 	public void setSize(Dimension size) {
 		m_size = size;
 	}
-
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// State
-	//
-	////////////////////////////////////////////////////////////////////////////
-	/**
-	 * Copies state from given {@link Request} into this one.
-	 */
-	public void copyStateFrom(Request _source) {
-		if (_source instanceof AbstractCreateRequest source) {
-			setLocation(source.getLocation());
-			setSize(source.getSize());
-		}
-	}
 }

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java

@@ -23,9 +23,8 @@
  */
 public class CreateRequest extends AbstractCreateRequest {
 	private static final int SNAP_TO = 16;
-	private final CreationFactory m_factory;
+	private CreationFactory m_factory;
 	private Object m_newObject;
-	private Object m_selectObject;
 	private int m_flags = 0;
 
 	////////////////////////////////////////////////////////////////////////////
@@ -36,9 +35,8 @@ public class CreateRequest extends AbstractCreateRequest {
 	/**
 	 * Constructs a {@link CreateRequest} with the specified <i>type</i> and <i>factory</i>.
 	 */
-	public CreateRequest(CreationFactory factory) {
+	public CreateRequest() {
 		super(RequestConstants.REQ_CREATE);
-		m_factory = factory;
 	}
 
 	////////////////////////////////////////////////////////////////////////////
@@ -52,24 +50,26 @@ public CreateRequest(CreationFactory factory) {
 	public Object getNewObject() {
 		if (m_newObject == null) {
 			m_newObject = m_factory.getNewObject();
-			m_selectObject = m_newObject;
 		}
 		return m_newObject;
 	}
 
 	/**
-	 * @return the object that should be selected after finishing create operation. By default return
-	 *         same as {@link #getNewObject()}.
+	 * Returns the CreationFactory for this request.
+	 *
+	 * @return the CreationFactory
 	 */
-	public Object getSelectObject() {
-		return m_selectObject;
+	protected CreationFactory getFactory() {
+		return m_factory;
 	}
 
 	/**
-	 * Sets the object that should be selected after finishing create operation.
+	 * Sets the factory to be used when creating the new object.
+	 *
+	 * @param factory the factory
 	 */
-	public void setSelectObject(Object object) {
-		m_selectObject = object;
+	public void setFactory(CreationFactory factory) {
+		m_factory = factory;
 	}
 
 	////////////////////////////////////////////////////////////////////////////

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

@@ -75,7 +75,9 @@ public final CreationFactory getFactory() {
 	 */
 	@Override
 	protected Request createTargetRequest() {
-		return new CreateRequest(m_factory);
+		CreateRequest request = new CreateRequest();
+		request.setFactory(getFactory());
+		return request;
 	}
 
 	@Override
@@ -91,7 +93,7 @@ protected String getCommandName() {
 	@Override
 	protected void selectAddedObjects() {
 		CreateRequest request = (CreateRequest) getTargetRequest();
-		Object model = request.getSelectObject();
+		Object model = request.getNewObject();
 		if (model != null) {
 			EditPartViewer viewer = getCurrentViewer();
 			if (viewer != null) {

org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/FieldEditorDropRequestProcessor.java

@@ -53,16 +53,16 @@ public Request process(EditPart editPart, Request request) throws Exception {
 			if (editorCreateRequest.getNewObject() instanceof FieldEditorInfo) {
 				final FieldEditorInfo editor = (FieldEditorInfo) editorCreateRequest.getNewObject();
 				final CompositeInfo composite = page.schedule_CREATE(editor);
-				// after CREATE select "composite"
-				editorCreateRequest.setSelectObject(composite);
 				// prepare CreateRequest, that creates our ActionInfo
-				CreateRequest createRequest = new CreateRequest(new SimpleFactory<>(CompositeInfo.class) {
+				CreateRequest createRequest = new CreateRequest();
+				createRequest.setFactory(new SimpleFactory<>(CompositeInfo.class) {
 					@Override
 					public CompositeInfo getNewObject() {
 						return composite;
 					}
 				});
-				createRequest.copyStateFrom(editorCreateRequest);
+				createRequest.setLocation(editorCreateRequest.getLocation());
+				createRequest.setSize(editorCreateRequest.getSize());
 				return createRequest;
 			}
 		}

org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/action/ActionDropRequestProcessor.java

@@ -56,14 +56,16 @@ public Request process(final EditPart editPart, Request request) throws Exceptio
 			final ActionInfo action = actionDropRequest.getAction();
 			scheduleActionItemSelection(actionDropRequest);
 			// prepare CreateRequest, that creates our ActionInfo
-			CreateRequest createRequest = new CreateRequest(new SimpleFactory<>(ActionInfo.class) {
+			CreateRequest createRequest = new CreateRequest();
+			createRequest.setFactory(new SimpleFactory<>(ActionInfo.class) {
 				@Override
 				public ActionInfo getNewObject() {
 					return action;
 				}
 			});
 			// OK, we have CreateRequest
-			createRequest.copyStateFrom(actionDropRequest);
+			createRequest.setLocation(actionDropRequest.getLocation());
+			createRequest.setSize(actionDropRequest.getSize());
 			return createRequest;
 		}
 		// no, we don't know this request

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/AbstractLayoutRequestValidatorTest.java

@@ -21,6 +21,7 @@
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.SimpleFactory;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -82,12 +83,14 @@ protected static void assert_validateCreateRequest(ILayoutRequestValidator valid
 			boolean expected,
 			EditPart host,
 			final Object child) {
-		assertEquals(expected, validator.validateCreateRequest(host, new CreateRequest(null) {
+		CreateRequest request = new CreateRequest();
+		request.setFactory(new SimpleFactory<>(Object.class) {
 			@Override
 			public Object getNewObject() {
 				return child;
 			}
-		}));
+		});
+		assertEquals(expected, validator.validateCreateRequest(host, request));
 	}
 
 	protected static void assert_validatePasteRequest(ILayoutRequestValidator validator,

org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2026 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
@@ -12,11 +12,10 @@
  *******************************************************************************/
 package org.eclipse.wb.tests.gef;
 
-import org.eclipse.wb.gef.core.requests.AbstractCreateRequest;
-import org.eclipse.wb.gef.core.tools.AbstractCreationTool;
-
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.tools.TargetingTool;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,8 +25,8 @@
  *
  */
 public abstract class AbstractCreationToolTest extends RequestTestCase {
-	protected AbstractCreateRequest m_request;
-	protected AbstractCreationTool m_tool;
+	protected Request m_request;
+	protected TargetingTool m_tool;
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -44,6 +43,10 @@ public void setUp() throws Exception {
 
 	protected abstract void configureTestCase();
 
+	protected abstract void setSize(Dimension d);
+
+	protected abstract void setLocation(Point p);
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Tests
@@ -70,7 +73,7 @@ public void test_Move_DND() throws Exception {
 		// enter in "editPart"
 		{
 			m_sender.moveTo(60, 60);
-			m_request.setLocation(new Point(60, 60));
+			setLocation(new Point(60, 60));
 			//
 			expectedLogger.log(editPart, new String[]{
 					"getTargetEditPart",
@@ -83,7 +86,7 @@ public void test_Move_DND() throws Exception {
 		// exit from "editPart" and enter in "childEditPart1"
 		{
 			m_sender.moveTo(120, 120);
-			m_request.setLocation(new Point(120, 120));
+			setLocation(new Point(120, 120));
 			//
 			expectedLogger.log(
 					childEditPart1,
@@ -100,7 +103,7 @@ public void test_Move_DND() throws Exception {
 		{
 			m_sender.moveTo(130, 130);
 			//
-			m_request.setLocation(new Point(130, 130));
+			setLocation(new Point(130, 130));
 			//
 			expectedLogger.log(childEditPart1, new String[]{
 					"getTargetEditPart",
@@ -118,8 +121,8 @@ public void test_Move_DND() throws Exception {
 		{
 			m_sender.dragTo(200, 200);
 			//
-			m_request.setLocation(new Point(130, 130));
-			m_request.setSize(new Dimension(70, 70));
+			setLocation(new Point(130, 130));
+			setSize(new Dimension(70, 70));
 			//
 			expectedLogger.log(
 					childEditPart1,
@@ -129,8 +132,8 @@ public void test_Move_DND() throws Exception {
 			////////////////////////////////////////////////////////////////
 			m_sender.dragTo(330, 140);
 			//
-			m_request.setLocation(new Point(130, 130));
-			m_request.setSize(new Dimension(200, 10));
+			setLocation(new Point(130, 130));
+			setSize(new Dimension(200, 10));
 			//
 			expectedLogger.log(
 					childEditPart1,
@@ -142,8 +145,8 @@ public void test_Move_DND() throws Exception {
 		{
 			m_sender.endDrag();
 			//
-			m_request.setLocation(new Point(130, 130));
-			m_request.setSize(new Dimension(200, 10));
+			setLocation(new Point(130, 130));
+			setSize(new Dimension(200, 10));
 			//
 			expectedLogger.log(childEditPart1, "eraseTargetFeedback", m_request);
 			expectedLogger.log(childEditPart2, new String[]{
@@ -178,7 +181,7 @@ public void test_Move_DND_InvalidInput() throws Exception {
 		{
 			m_sender.moveTo(70, 70);
 			//
-			m_request.setLocation(new Point(70, 70));
+			setLocation(new Point(70, 70));
 			//
 			expectedLogger.log(editPart, new String[]{
 					"getTargetEditPart",
@@ -192,7 +195,7 @@ public void test_Move_DND_InvalidInput() throws Exception {
 		{
 			m_sender.click(70, 70, 2);
 			//
-			m_request.setLocation(new Point(70, 70));
+			setLocation(new Point(70, 70));
 			//
 			expectedLogger.log(editPart, "eraseTargetFeedback", m_request);
 			assertLoggers(expectedLogger, actualLogger);
@@ -207,7 +210,7 @@ public void test_Move_DND_InvalidInput() throws Exception {
 			m_domain.setActiveTool(m_tool);
 			m_sender.moveTo(90, 90);
 			//
-			m_request.setLocation(new Point(90, 90));
+			setLocation(new Point(90, 90));
 			//
 			expectedLogger.log(editPart, new String[]{
 					"getTargetEditPart",
@@ -226,17 +229,17 @@ public void test_Move_DND_InvalidInput() throws Exception {
 		{
 			m_sender.dragTo(100, 100);
 			//
-			m_request.setLocation(new Point(90, 90));
-			m_request.setSize(new Dimension(10, 10));
+			setLocation(new Point(90, 90));
+			setSize(new Dimension(10, 10));
 			//
 			expectedLogger.log(editPart, new String[]{"showTargetFeedback", "getCommand"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// click invalid button during drag process
 		{
 			m_sender.click(100, 100, 3);
-			m_request.setLocation(new Point(90, 90));
-			m_request.setSize(new Dimension(10, 10));
+			setLocation(new Point(90, 90));
+			setSize(new Dimension(10, 10));
 			//
 			expectedLogger.log(editPart, "eraseTargetFeedback", m_request);
 			assertLoggers(expectedLogger, actualLogger);

org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolTest.java

@@ -15,6 +15,8 @@
 import org.eclipse.wb.gef.core.requests.CreateRequest;
 import org.eclipse.wb.gef.core.tools.CreationTool;
 
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.requests.CreationFactory;
 import org.eclipse.gef.requests.SimpleFactory;
 
@@ -47,6 +49,17 @@ public String toString() {
 		m_tool = new CreationTool(factory);
 		m_domain.setActiveTool(m_tool);
 		// create request
-		m_request = new CreateRequest(factory);
+		m_request = new CreateRequest();
+		((CreateRequest) m_request).setFactory(factory);
+	}
+
+	@Override
+	protected void setSize(Dimension d) {
+		((CreateRequest) m_request).setSize(d);
+	}
+
+	@Override
+	protected void setLocation(Point p) {
+		((CreateRequest) m_request).setLocation(p);
 	}
 }

org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/PasteToolTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2026 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
@@ -15,6 +15,9 @@
 import org.eclipse.wb.gef.core.requests.PasteRequest;
 import org.eclipse.wb.gef.core.tools.PasteTool;
 
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+
 /**
  * @author lobas_av
  *
@@ -39,4 +42,14 @@ protected void selectAddedObjects() {
 		// create request
 		m_request = new PasteRequest(memento);
 	}
+
+	@Override
+	protected void setSize(Dimension d) {
+		((PasteRequest) m_request).setSize(d);
+	}
+
+	@Override
+	protected void setLocation(Point p) {
+		((PasteRequest) m_request).setLocation(p);
+	}
 }