Skip to content

[GEF] Deprecate CreateRequest for removal #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Sep 18, 2026
Merged

[GEF] Deprecate CreateRequest for removal #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualLayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.eclipse.wb.core.gef.policy.PolicyUtils;
import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
import org.eclipse.wb.internal.core.DesignerPlugin;
Expand All @@ -36,6 +35,7 @@
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;

import org.apache.commons.lang3.ClassUtils;

Expand Down
2 changes: 1 addition & 1 deletion ...b.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.internal.core.gef.part.nonvisual.NonVisualBeanEditPart;
Expand All @@ -27,6 +26,7 @@

import org.eclipse.gef.EditPart;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...ore.java/src/org/eclipse/wb/internal/core/gefTree/policy/ArrayObjectRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.internal.core.model.nonvisual.AbstractArrayObjectInfo;
import org.eclipse.wb.internal.core.model.variable.EmptyVariableSupport;
Expand All @@ -23,6 +22,7 @@

import org.eclipse.gef.EditPart;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;

/**
* Implementation of {@link ILayoutRequestValidator} for validate items for <i>array object</i>.
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/ILayoutRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
*******************************************************************************/
package org.eclipse.wb.gef.core.policies;

import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;

import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;

/**
* Validator for known layout requests {@link Request#REQ_CREATE}, {@link Request#REQ_PASTE},
Expand Down
80 changes: 9 additions & 71 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,16 @@
package org.eclipse.wb.gef.core.requests;

import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.requests.CreationFactory;

/**
* A {@link Request} to create a new object.
*
* @author lobas_av
* @coverage gef.core
* @deprecated Use the GEF request directly.
*/
public class CreateRequest extends AbstractCreateRequest {
private static final int SNAP_TO = 16;
private CreationFactory m_factory;
private Object m_newObject;
private int m_flags = 0;

@Deprecated(forRemoval = true, since = "2026-12")
public class CreateRequest extends org.eclipse.gef.requests.CreateRequest {
////////////////////////////////////////////////////////////////////////////
//
// Constructor
Expand All @@ -35,89 +31,30 @@ public class CreateRequest extends AbstractCreateRequest {
/**
* Constructs a {@link CreateRequest} with the specified <i>type</i> and <i>factory</i>.
*/
@Deprecated(forRemoval = true, since="2026-12")
public CreateRequest() {
super(RequestConstants.REQ_CREATE);
}

////////////////////////////////////////////////////////////////////////////
//
// Access
//
////////////////////////////////////////////////////////////////////////////
/**
* Gets the new object from the factory and returns that object.
*/
public Object getNewObject() {
if (m_newObject == null) {
m_newObject = m_factory.getNewObject();
}
return m_newObject;
}

/**
* Returns the CreationFactory for this request.
*
* @return the CreationFactory
*/
protected CreationFactory getFactory() {
return m_factory;
}

/**
* Sets the factory to be used when creating the new object.
*
* @param factory the factory
*/
public void setFactory(CreationFactory factory) {
m_factory = factory;
}

////////////////////////////////////////////////////////////////////////////
//
// Snap to horizontal axis
//
////////////////////////////////////////////////////////////////////////////

/**
* Used to set whether snap-to is being performed.
*
* @param value <code>true</code> if the request is for a creation with snap-to
* enabled
*/
public void setSnapToEnabled(boolean value) {
m_flags = value ? m_flags | SNAP_TO : m_flags & ~SNAP_TO;
}

/**
* Returns <code>true</code> if snap-to is enabled
*
* @return <code>true</code> if the request is for a creation with snap-to
* enabled
*/
public boolean isSnapToEnabled() {
return (m_flags & SNAP_TO) != 0;
}

////////////////////////////////////////////////////////////////////////////
//
// Object
//
////////////////////////////////////////////////////////////////////////////
@Deprecated(forRemoval = true, since="2026-12")
@Override
public String toString() {
StringBuffer buffer = new StringBuffer("CreateRequest(type=");
buffer.append(getType());
buffer.append(", flags=");
buffer.append(m_flags);
buffer.append(", location=");
buffer.append(getLocation());
buffer.append(", size=");
buffer.append(getSize());
buffer.append(", factory=");
buffer.append(m_factory);
if (m_factory != null) {
buffer.append(getFactory());
if (getFactory() != null) {
buffer.append("[object=");
buffer.append(safeToString(m_factory.getNewObject()));
buffer.append(safeToString(getFactory().getNewObject()));
buffer.append("]");
}
buffer.append(")");
Expand All @@ -128,6 +65,7 @@ public String toString() {
* @return the string presentation of given {@link Object} or "<exception>" if
* any exception happened.
*/
@Deprecated(forRemoval = true, since="2026-12")
protected static String safeToString(Object o) {
try {
return o == null ? null : o.toString();
Expand Down
27 changes: 21 additions & 6 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.Request;
import org.eclipse.gef.SharedCursors;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.LocationRequest;
import org.eclipse.gef.tools.TargetingTool;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
Expand Down Expand Up @@ -47,7 +49,7 @@ protected boolean handleButtonDown(int button) {
if (button == 1) {
if (isInState(STATE_INITIAL)) {
setState(STATE_DRAG);
((AbstractCreateRequest) getTargetRequest()).setLocation(getLocation());
((LocationRequest) getTargetRequest()).setLocation(getLocation());
lockTargetEditPart(getTargetEditPart());
}
} else {
Expand Down Expand Up @@ -115,13 +117,26 @@ protected boolean handleDragInProgress() {
@Override
protected void updateTargetRequest() {
super.updateTargetRequest();
AbstractCreateRequest request = (AbstractCreateRequest) getTargetRequest();
if (isInState(STATE_DRAG_IN_PROGRESS)) {
request.setLocation(getStartLocation());
request.setSize(getDragMoveDelta());
// TODO - can be removed once we use the GEF CreationTool
if (getTargetRequest() instanceof CreateRequest request) {
request.setLocation(getStartLocation());
request.setSize(getDragMoveDelta());
}
if (getTargetRequest() instanceof AbstractCreateRequest request) {
request.setLocation(getStartLocation());
request.setSize(getDragMoveDelta());
}
} else {
request.setSize(null);
request.setLocation(getLocation());
// TODO - can be removed once we use the GEF CreationTool
if (getTargetRequest() instanceof CreateRequest request) {
request.setSize(null);
request.setLocation(getLocation());
}
if (getTargetRequest() instanceof AbstractCreateRequest request) {
request.setSize(null);
request.setLocation(getLocation());
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
*******************************************************************************/
package org.eclipse.wb.gef.core.tools;

import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.DesignCreationFactory;

import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.Request;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.CreationFactory;

/**
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/LayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.eclipse.wb.gef.core.policies.DesignEditPolicy;
import org.eclipse.wb.gef.core.policies.IEditPartDecorationListener;
import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;

import org.eclipse.gef.EditPart;
Expand All @@ -24,6 +23,7 @@
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.GroupRequest;

import java.util.Iterator;
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/policies/LayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import org.eclipse.wb.core.gef.policy.PolicyUtils;
import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.internal.gef.tree.TreeViewer;

Expand All @@ -28,6 +27,7 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.AbstractEditPolicy;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.DropRequest;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
Expand Down
14 changes: 12 additions & 2 deletions ....wb.core/src/org/eclipse/wb/core/gef/policy/layout/flow/AbstractFlowLayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.eclipse.wb.core.gef.policy.PolicyUtils;
import org.eclipse.wb.draw2d.FigureUtils;
import org.eclipse.wb.gef.core.requests.AbstractCreateRequest;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
import org.eclipse.wb.internal.core.utils.GenericsUtils;
Expand All @@ -29,8 +28,10 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.DropRequest;

import java.util.ArrayList;
Expand Down Expand Up @@ -133,11 +134,20 @@ private Object getReferenceObject(Request request) {
// Commands: create
//
////////////////////////////////////////////////////////////////////////////
/**
* @since 1.26
*/
@Override
protected final Command getCreateCommand(CreateRequest request) {
return getCreateCommand(request.getNewObject(), getReferenceObject(request));
}

@SuppressWarnings("removal")
@Deprecated(since = "2026-12", forRemoval = true)
protected final Command getCreateCommand(org.eclipse.wb.gef.core.requests.CreateRequest request) {
return getCreateCommand(request.getNewObject(), getReferenceObject(request));
}

/**
* @return the {@link Command} for {@link Request#REQ_CREATE}.
*/
Expand Down Expand Up @@ -489,7 +499,7 @@ private EditPart getInsertionReference(Request request) {
reference = GenericsUtils.getNextOrNull(children, m_reference);
}
// skip moving children
if (request instanceof AbstractCreateRequest) {
if (request instanceof AbstractCreateRequest || RequestConstants.REQ_CREATE.equals(request.getType())) {
return reference;
} else {
List<? extends EditPart> selectedEditParts = getHost().getViewer().getSelectedEditParts();
Expand Down
11 changes: 10 additions & 1 deletion .../src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.eclipse.wb.core.gef.policy.PolicyUtils;
import org.eclipse.wb.draw2d.FigureUtils;
import org.eclipse.wb.draw2d.Layer;
import org.eclipse.wb.gef.core.requests.CreateRequest;
import org.eclipse.wb.gef.core.requests.PasteRequest;
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
import org.eclipse.wb.internal.core.DesignerPlugin;
Expand All @@ -29,6 +28,7 @@
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.DropRequest;

import java.util.ArrayList;
Expand Down Expand Up @@ -200,6 +200,9 @@ protected Command getCommand(Request request, Object data) {
// Commands: create
//
////////////////////////////////////////////////////////////////////////////
/**
* @since 1.26
*/
@Override
protected final Command getCreateCommand(CreateRequest request) {
if (m_activeFeedback != null) {
Expand All @@ -208,6 +211,12 @@ protected final Command getCreateCommand(CreateRequest request) {
return null;
}

@SuppressWarnings("removal")
@Deprecated(since = "2026-12", forRemoval = true)
protected final Command getCreateCommand(org.eclipse.wb.gef.core.requests.CreateRequest request) {
return getCreateCommand((CreateRequest) request);
}

/**
* @return the {@link Command} for {@link Request#REQ_CREATE}.
*/
Expand Down
Loading
Loading