From 4d0b8a4628995af9b23cef93f02045d9af14f95f Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 8 Sep 2026 06:36:19 +0200 Subject: [PATCH] [GEF] Deprecate CreateRequest for removal The main difference between the official class and our fork is that we distinguish between the created object and the selected object. However, this is only ever used in the `FieldEditorDropRequest`, where both object happen to be the same. Meaning there is no functional difference that we depend on. Note that the constructor for the GEF request is slightly different. It doesn't expect the factory as argument, but the request type. --- .../nonvisual/NonVisualLayoutEditPolicy.java | 2 +- .../policy/nonvisual/NonVisualValidator.java | 2 +- .../policy/ArrayObjectRequestValidator.java | 2 +- .../policies/ILayoutRequestValidator.java | 2 +- .../core/requests/AbstractCreateRequest.java | 16 ---- .../wb/gef/core/requests/CreateRequest.java | 82 +++---------------- .../gef/core/tools/AbstractCreationTool.java | 4 +- .../wb/gef/core/tools/CreationTool.java | 51 ++---------- .../graphical/policies/LayoutEditPolicy.java | 2 +- .../gef/tree/policies/LayoutEditPolicy.java | 2 +- .../flow/AbstractFlowLayoutEditPolicy.java | 12 ++- .../AbstractPositionLayoutEditPolicy.java | 10 ++- .../AbstractLayoutRequestValidator.java | 10 ++- .../BorderOfChildLayoutRequestValidator.java | 10 ++- .../CachingLayoutRequestValidator.java | 10 ++- .../validator/LayoutRequestValidators.java | 2 +- .../AbsoluteBasedLayoutEditPolicy.java | 2 +- .../AbstractContainerRequestValidator.java | 2 +- .../SimpleContainerLayoutEditPolicy.java | 2 +- .../gef/policy/menu/MenuLayoutEditPolicy.java | 2 +- .../menu/SubmenuAwareLayoutEditPolicy.java | 2 +- .../policy/menu/MenuItemLayoutEditPolicy.java | 2 +- .../policy/menu/MenuLayoutEditPolicy.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../group/gef/GroupLayoutEditPolicy2.java | 2 +- org.eclipse.wb.rcp/META-INF/MANIFEST.MF | 2 +- .../forms/FormHeadLayoutEditPolicy.java | 2 +- .../grid/TableWrapLayoutEditPolicy.java | 2 +- ...ControlDecorationDropLayoutEditPolicy.java | 2 +- .../FieldEditorDropRequestProcessor.java | 9 +- .../action/ActionDropRequestProcessor.java | 8 +- .../ScrolledCompositeLayoutEditPolicy.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../FormLayout/gef/FormLayoutEditPolicy.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../MigLayout/gef/MigLayoutEditPolicy.java | 2 +- org.eclipse.wb.swing/META-INF/MANIFEST.MF | 4 +- .../ActionDropButtonLayoutEditPolicy.java | 4 +- .../layout/AbsoluteLayoutEditPolicy.java | 2 +- .../policy/layout/DropLayoutEditPolicy.java | 4 +- .../policy/layout/SpringLayoutEditPolicy.java | 4 +- .../layout/gbl/GridBagLayoutEditPolicy.java | 2 +- .../menu/MenuBarDropLayoutEditPolicy.java | 2 +- .../menu/MenuPopupDropLayoutEditPolicy.java | 2 +- .../gefTree/policy/DropLayoutEditPolicy.java | 4 +- .../swing/palette/ActionUseEntryInfo.java | 6 +- org.eclipse.wb.swt/META-INF/MANIFEST.MF | 2 +- .../layout/AbsoluteLayoutEditPolicy.java | 2 +- .../policy/layout/DropLayoutEditPolicy.java | 4 +- .../layout/form/FormLayoutEditPolicy.java | 2 +- .../form/FormLayoutEditPolicyClassic.java | 2 +- .../layout/grid/GridLayoutEditPolicy.java | 2 +- .../menu/MenuBarDropLayoutEditPolicy.java | 2 +- .../gefTree/policy/DropLayoutEditPolicy.java | 4 +- .../menu/MenuBarDropLayoutEditPolicy.java | 4 +- org.eclipse.wb.tests/META-INF/MANIFEST.MF | 2 +- .../AbstractLayoutRequestValidatorTest.java | 9 +- .../tests/gef/AbstractCreationToolTest.java | 73 +++++++++-------- .../wb/tests/gef/CreationToolTest.java | 17 +++- .../wb/tests/gef/GefCursorTestCase.java | 2 +- .../eclipse/wb/tests/gef/PasteToolTest.java | 15 +++- .../eclipse/wb/tests/gef/RequestsTest.java | 14 +--- 62 files changed, 205 insertions(+), 259 deletions(-) diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualLayoutEditPolicy.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualLayoutEditPolicy.java index 8e1048b11..24dce45ed 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualLayoutEditPolicy.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualLayoutEditPolicy.java @@ -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; @@ -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; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java index 7ff87a94c..dff5ba72a 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java @@ -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; @@ -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; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/policy/ArrayObjectRequestValidator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/policy/ArrayObjectRequestValidator.java index e47aaf439..f935c238a 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/policy/ArrayObjectRequestValidator.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/policy/ArrayObjectRequestValidator.java @@ -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; @@ -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 array object. diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/ILayoutRequestValidator.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/ILayoutRequestValidator.java index da9387117..4495245ac 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/ILayoutRequestValidator.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/ILayoutRequestValidator.java @@ -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}, diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/AbstractCreateRequest.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/AbstractCreateRequest.java index a293057ea..65d9ce625 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/AbstractCreateRequest.java +++ b/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()); - } - } } \ No newline at end of file diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java index d3d2da644..890678d62 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/requests/CreateRequest.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.requests; -import org.eclipse.gef.RequestConstants; import org.eclipse.gef.requests.CreationFactory; /** @@ -20,13 +19,11 @@ * * @author lobas_av * @coverage gef.core + * @deprecated Use {@link org.eclipse.gef.requests.CreateRequest CreateRequest} + * directly. */ -public class CreateRequest extends AbstractCreateRequest { - private static final int SNAP_TO = 16; - private final CreationFactory m_factory; - private Object m_newObject; - private Object m_selectObject; - private int m_flags = 0; +@Deprecated(since = "2026-12", forRemoval = true) +public class CreateRequest extends org.eclipse.gef.requests.CreateRequest { //////////////////////////////////////////////////////////////////////////// // @@ -36,66 +33,9 @@ public class CreateRequest extends AbstractCreateRequest { /** * Constructs a {@link CreateRequest} with the specified type and factory. */ + @Deprecated(since="2026-12", forRemoval = true) public CreateRequest(CreationFactory factory) { - super(RequestConstants.REQ_CREATE); - m_factory = factory; - } - - //////////////////////////////////////////////////////////////////////////// - // - // Access - // - //////////////////////////////////////////////////////////////////////////// - /** - * Gets the new object from the factory and returns that object. - */ - 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()}. - */ - public Object getSelectObject() { - return m_selectObject; - } - - /** - * Sets the object that should be selected after finishing create operation. - */ - public void setSelectObject(Object object) { - m_selectObject = object; - } - - //////////////////////////////////////////////////////////////////////////// - // - // Snap to horizontal axis - // - //////////////////////////////////////////////////////////////////////////// - - /** - * Used to set whether snap-to is being performed. - * - * @param value true 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 true if snap-to is enabled - * - * @return true if the request is for a creation with snap-to - * enabled - */ - public boolean isSnapToEnabled() { - return (m_flags & SNAP_TO) != 0; + setFactory(factory); } //////////////////////////////////////////////////////////////////////////// @@ -104,20 +44,19 @@ public boolean isSnapToEnabled() { // //////////////////////////////////////////////////////////////////////////// @Override + @Deprecated(since="2026-12", forRemoval = true) 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(")"); @@ -128,6 +67,7 @@ public String toString() { * @return the string presentation of given {@link Object} or "" if * any exception happened. */ + @Deprecated(since="2026-12", forRemoval = true) protected static String safeToString(Object o) { try { return o == null ? null : o.toString(); diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java index e43f27d3f..8a558540b 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java @@ -74,8 +74,8 @@ protected boolean handleButtonUp(int button) { protected boolean handleMove() { updateTargetRequest(); updateTargetUnderMouse(); - showTargetFeedback(); setCurrentCommand(getCommand()); + showTargetFeedback(); return true; } @@ -91,8 +91,8 @@ protected boolean handleDragStarted() { protected boolean handleDragInProgress() { if (isInState(STATE_DRAG_IN_PROGRESS)) { updateTargetRequest(); - showTargetFeedback(); setCurrentCommand(getCommand()); + showTargetFeedback(); } return true; } diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java index 961bb7279..88888529c 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java @@ -12,12 +12,9 @@ *******************************************************************************/ 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.CreationFactory; /** @@ -29,8 +26,7 @@ * @author lobas_av * @coverage gef.core */ -public class CreationTool extends AbstractCreationTool { - private final CreationFactory m_factory; +public class CreationTool extends org.eclipse.gef.tools.CreationTool { //////////////////////////////////////////////////////////////////////////// // @@ -38,7 +34,7 @@ public class CreationTool extends AbstractCreationTool { // //////////////////////////////////////////////////////////////////////////// public CreationTool(CreationFactory factory) { - m_factory = factory; + super(factory); } //////////////////////////////////////////////////////////////////////////// @@ -50,7 +46,7 @@ public CreationTool(CreationFactory factory) { public void activate() { super.activate(); try { - if (m_factory instanceof DesignCreationFactory factory) { + if (getFactory() instanceof DesignCreationFactory factory) { factory.activate(); } } catch (Throwable e) { @@ -61,45 +57,8 @@ public void activate() { /** * @return the {@link CreationFactory} used to create the new {@link EditPart}'s. */ - public final CreationFactory getFactory() { - return m_factory; - } - - //////////////////////////////////////////////////////////////////////////// - // - // Request - // - //////////////////////////////////////////////////////////////////////////// - /** - * Creates a {@link CreateRequest} and sets this tool's factory on the request. - */ - @Override - protected Request createTargetRequest() { - return new CreateRequest(m_factory); - } - @Override - protected String getCommandName() { - return REQ_CREATE; - } - - //////////////////////////////////////////////////////////////////////////// - // - // Selection - // - //////////////////////////////////////////////////////////////////////////// - @Override - protected void selectAddedObjects() { - CreateRequest request = (CreateRequest) getTargetRequest(); - Object model = request.getSelectObject(); - if (model != null) { - EditPartViewer viewer = getCurrentViewer(); - if (viewer != null) { - EditPart editPart = viewer.getEditPartRegistry().get(model); - if (editPart != null) { - viewer.select(editPart); - } - } - } + public final CreationFactory getFactory() { + return super.getFactory(); } } \ No newline at end of file diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/LayoutEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/LayoutEditPolicy.java index d4a97f4a1..af9feb1dc 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/LayoutEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/LayoutEditPolicy.java @@ -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; @@ -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; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/policies/LayoutEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/policies/LayoutEditPolicy.java index 563776ada..7c11e1d18 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/policies/LayoutEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/policies/LayoutEditPolicy.java @@ -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; @@ -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; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/flow/AbstractFlowLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/flow/AbstractFlowLayoutEditPolicy.java index e6f636960..791fa016d 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/flow/AbstractFlowLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/flow/AbstractFlowLayoutEditPolicy.java @@ -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; @@ -31,6 +30,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; @@ -133,11 +133,19 @@ private Object getReferenceObject(Request request) { // Commands: create // //////////////////////////////////////////////////////////////////////////// + /** + * @since 1.26 + */ @Override protected final Command getCreateCommand(CreateRequest request) { return getCreateCommand(request.getNewObject(), getReferenceObject(request)); } + @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}. */ @@ -489,7 +497,7 @@ private EditPart getInsertionReference(Request request) { reference = GenericsUtils.getNextOrNull(children, m_reference); } // skip moving children - if (request instanceof AbstractCreateRequest) { + if (request instanceof AbstractCreateRequest || request instanceof CreateRequest) { return reference; } else { List selectedEditParts = getHost().getViewer().getSelectedEditParts(); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java index 2b4b8d563..ccf9d0be7 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java @@ -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; @@ -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; @@ -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) { @@ -208,6 +211,11 @@ protected final Command getCreateCommand(CreateRequest request) { return null; } + @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}. */ diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/AbstractLayoutRequestValidator.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/AbstractLayoutRequestValidator.java index db25a9004..f93dd58ae 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/AbstractLayoutRequestValidator.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/AbstractLayoutRequestValidator.java @@ -13,7 +13,6 @@ package org.eclipse.wb.core.gef.policy.validator; 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.description.IComponentDescription; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; @@ -22,6 +21,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.List; @@ -38,11 +38,19 @@ public abstract class AbstractLayoutRequestValidator implements ILayoutRequestVa // ILayoutRequestValidator // //////////////////////////////////////////////////////////////////////////// + /** + * @since 1.26 + */ @Override public boolean validateCreateRequest(EditPart host, CreateRequest request) { return validate(host, request.getNewObject()); } + @Deprecated(since = "2026-12", forRemoval = true) + public boolean validateCreateRequest(EditPart host, org.eclipse.wb.gef.core.requests.CreateRequest request) { + return validateCreateRequest(host, (CreateRequest) request); + } + @Override public boolean validatePasteRequest(final EditPart host, final PasteRequest request) { return ExecutionUtils.runObjectLog(() -> { diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/BorderOfChildLayoutRequestValidator.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/BorderOfChildLayoutRequestValidator.java index 77ec37f01..c2aa2f321 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/BorderOfChildLayoutRequestValidator.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/BorderOfChildLayoutRequestValidator.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; 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.utils.state.GlobalState; import org.eclipse.wb.internal.core.utils.state.IParametersProvider; @@ -26,6 +25,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.DropRequest; import java.util.List; @@ -57,11 +57,19 @@ private BorderOfChildLayoutRequestValidator() { // ILayoutRequestValidator // //////////////////////////////////////////////////////////////////////////// + /** + * @since 1.26 + */ @Override public boolean validateCreateRequest(EditPart host, CreateRequest request) { return isTargetingToHost_containerSelected(host, request); } + @Deprecated(since = "2026-12", forRemoval = true) + public boolean validateCreateRequest(EditPart host, org.eclipse.wb.gef.core.requests.CreateRequest request) { + return validateCreateRequest(host, (CreateRequest) request); + } + @Override public boolean validatePasteRequest(EditPart host, PasteRequest request) { return isTargetingToHost_containerSelected(host, request); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/CachingLayoutRequestValidator.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/CachingLayoutRequestValidator.java index 7f2a40a12..1365dafe9 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/CachingLayoutRequestValidator.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/CachingLayoutRequestValidator.java @@ -13,12 +13,12 @@ package org.eclipse.wb.core.gef.policy.validator; 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; import org.eclipse.gef.Request; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.HashMap; import java.util.Map; @@ -46,6 +46,9 @@ public CachingLayoutRequestValidator(ILayoutRequestValidator validator) { // ILayoutRequestValidator // //////////////////////////////////////////////////////////////////////////// + /** + * @since 1.26 + */ @Override public boolean validateCreateRequest(EditPart host, CreateRequest request) { Map cache = getCache(request); @@ -57,6 +60,11 @@ public boolean validateCreateRequest(EditPart host, CreateRequest request) { return cachedResult; } + @Deprecated(since = "2026-12", forRemoval = true) + public boolean validateCreateRequest(EditPart host, org.eclipse.wb.gef.core.requests.CreateRequest request) { + return validateCreateRequest(host, (CreateRequest) request); + } + @Override public boolean validatePasteRequest(final EditPart host, final PasteRequest request) { Map cache = getCache(request); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/LayoutRequestValidators.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/LayoutRequestValidators.java index b6c33bf0d..d3bc0ae71 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/LayoutRequestValidators.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/validator/LayoutRequestValidators.java @@ -13,12 +13,12 @@ package org.eclipse.wb.core.gef.policy.validator; 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; import org.eclipse.gef.Request; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; /** * Factory for creating {@link ILayoutRequestValidator}'s. diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedLayoutEditPolicy.java index de67f3298..54f3cd4f8 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedLayoutEditPolicy.java @@ -27,7 +27,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -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; @@ -56,6 +55,7 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.GroupRequest; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/AbstractContainerRequestValidator.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/AbstractContainerRequestValidator.java index bfdaa37af..932bb531f 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/AbstractContainerRequestValidator.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/AbstractContainerRequestValidator.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.core.gef.policy.layout.generic; 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.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.model.generic.AbstractContainer; @@ -22,6 +21,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SimpleContainerLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SimpleContainerLayoutEditPolicy.java index 704c10a00..76db91e54 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SimpleContainerLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SimpleContainerLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.core.model.ObjectInfo; 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.model.generic.SimpleContainer; @@ -28,6 +27,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 java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java index 9a6fc9fb9..76668fdaf 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java @@ -16,7 +16,6 @@ import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; 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.model.menu.IMenuInfo; @@ -28,6 +27,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 java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/SubmenuAwareLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/SubmenuAwareLayoutEditPolicy.java index 42f1df619..e9060e517 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/SubmenuAwareLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/SubmenuAwareLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; 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.gef.part.menu.MenuEditPart; @@ -32,6 +31,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.DropRequest; /** diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuItemLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuItemLayoutEditPolicy.java index 57598647c..d8447e643 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuItemLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuItemLayoutEditPolicy.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.ObjectInfo; 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.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.model.menu.IMenuItemInfo; @@ -25,6 +24,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 java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuLayoutEditPolicy.java index c3aaa8ca4..de99cafbc 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/policy/menu/MenuLayoutEditPolicy.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.ObjectInfo; 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.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.model.menu.IMenuInfo; @@ -25,6 +24,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 java.util.List; diff --git a/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF b/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF index 2737373cd..c2d48bc4d 100644 --- a/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.layout.group;singleton:=true -Bundle-Version: 1.10.200.qualifier +Bundle-Version: 1.10.300.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy @@ -14,7 +14,7 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.jface;bundle-version="[3.34.0,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.core.java;bundle-version="[1.13.100,2.0.0)", org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", org.eclipse.gef;bundle-version="[3.21.100,4.0.0)" diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java index 185f5eb88..3c00ba93a 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java @@ -21,7 +21,6 @@ import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfoUtils; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; -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; @@ -43,6 +42,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.swt.graphics.Image; import org.netbeans.modules.form.layoutdesign.LayoutComponent; diff --git a/org.eclipse.wb.rcp/META-INF/MANIFEST.MF b/org.eclipse.wb.rcp/META-INF/MANIFEST.MF index 1aeed1bcc..3619aec60 100644 --- a/org.eclipse.wb.rcp/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.rcp/META-INF/MANIFEST.MF @@ -93,7 +93,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.13.300,4.0.0)", org.eclipse.search;bundle-version="[3.16.200,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.core.ui;bundle-version="[1.10.800,2.0.0)", org.eclipse.wb.core.java;bundle-version="[1.15.0,2.0.0)", org.eclipse.wb.swt;bundle-version="[1.10.100,2.0.0)", diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/FormHeadLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/FormHeadLayoutEditPolicy.java index f941c6eaf..712186a12 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/FormHeadLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/FormHeadLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils2; import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils2.IPasteProcessor; 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.rcp.model.forms.FormInfo; @@ -28,6 +27,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 java.util.List; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java index 1a04310b5..3722460e5 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; 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.utils.state.GlobalState; @@ -38,6 +37,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.jface.action.IMenuManager; import java.util.List; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/ControlDecorationDropLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/ControlDecorationDropLayoutEditPolicy.java index 7cf366c39..606c14b7d 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/ControlDecorationDropLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/ControlDecorationDropLayoutEditPolicy.java @@ -16,7 +16,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.rcp.model.jface.ControlDecorationInfo; import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; @@ -25,6 +24,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 java.util.List; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/FieldEditorDropRequestProcessor.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/FieldEditorDropRequestProcessor.java index 71a8ef592..d69b569f7 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/FieldEditorDropRequestProcessor.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/FieldEditorDropRequestProcessor.java @@ -14,13 +14,13 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.gef.core.RequestProcessor; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.internal.rcp.model.jface.FieldEditorInfo; import org.eclipse.wb.internal.rcp.model.jface.FieldLayoutPreferencePageInfo; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.SimpleFactory; /** @@ -54,15 +54,16 @@ public Request process(EditPart editPart, Request request) throws Exception { 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; } } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/action/ActionDropRequestProcessor.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/action/ActionDropRequestProcessor.java index 7a33bf74b..03d54a15d 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/action/ActionDropRequestProcessor.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/jface/action/ActionDropRequestProcessor.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.broadcast.JavaEventListener; import org.eclipse.wb.gef.core.RequestProcessor; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.internal.rcp.model.jface.action.ActionContributionItemInfo; import org.eclipse.wb.internal.rcp.model.jface.action.ActionInfo; import org.eclipse.wb.internal.rcp.model.jface.action.ContributionItemInfo; @@ -23,6 +22,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.SimpleFactory; /** @@ -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 diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/ScrolledCompositeLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/ScrolledCompositeLayoutEditPolicy.java index fd1978dcd..c64098a7d 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/ScrolledCompositeLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/ScrolledCompositeLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils2; import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils2.IPasteProcessor; 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.rcp.model.widgets.ScrolledCompositeInfo; @@ -27,6 +26,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; /** * Implementation of {@link LayoutEditPolicy} for {@link ScrolledCompositeInfo}. diff --git a/org.eclipse.wb.swing.FormLayout/META-INF/MANIFEST.MF b/org.eclipse.wb.swing.FormLayout/META-INF/MANIFEST.MF index 0f740d8ad..3576d63f6 100644 --- a/org.eclipse.wb.swing.FormLayout/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swing.FormLayout/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Export-Package: org.eclipse.wb.internal.swing.FormLayout;x-friends:="org.eclipse Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.21.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.swing;bundle-version="[1.12.0,2.0.0)", org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", org.eclipse.gef;bundle-version="[3.21.100,4.0.0)" diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java index 12393b6c0..9bfa7be77 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; 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; @@ -43,6 +42,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.jface.action.IMenuManager; import java.util.List; diff --git a/org.eclipse.wb.swing.MigLayout/META-INF/MANIFEST.MF b/org.eclipse.wb.swing.MigLayout/META-INF/MANIFEST.MF index 0e82ae8d1..79d375450 100644 --- a/org.eclipse.wb.swing.MigLayout/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swing.MigLayout/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.swing;bundle-version="[1.10.200,2.0.0)", org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", org.eclipse.gef;bundle-version="[3.21.100,4.0.0)" diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java index f9938ab31..55d0c15e3 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java @@ -23,7 +23,6 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; 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.gef.graphical.policies.SelectionEditPolicy; @@ -47,6 +46,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.jface.action.IMenuManager; import java.util.List; diff --git a/org.eclipse.wb.swing/META-INF/MANIFEST.MF b/org.eclipse.wb.swing/META-INF/MANIFEST.MF index 9cb961550..54446855c 100644 --- a/org.eclipse.wb.swing/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swing/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.swing;singleton:=true -Bundle-Version: 1.13.100.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.wb.internal.swing.Activator Bundle-Vendor: %providerName @@ -106,7 +106,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.13.300,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)";visibility:=reexport, + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)";visibility:=reexport, org.eclipse.wb.core.ui;bundle-version="[1.10.800,2.0.0)";visibility:=reexport, org.eclipse.wb.core.java;bundle-version="[1.15.0,2.0.0)";visibility:=reexport, org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropButtonLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropButtonLayoutEditPolicy.java index 6e6fc1c81..d82236cf1 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropButtonLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropButtonLayoutEditPolicy.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 @@ -16,13 +16,13 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.model.bean.ActionInfo; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; import javax.swing.AbstractButton; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java index a40cc0007..592e63aec 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.AbsoluteBasedLayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.AbsoluteLayoutSelectionEditPolicy; @@ -39,6 +38,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/DropLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/DropLayoutEditPolicy.java index 889554034..cc34abb15 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/DropLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/DropLayoutEditPolicy.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 @@ -16,13 +16,13 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.internal.swing.model.layout.LayoutInfo; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; /** * Implementation of {@link LayoutEditPolicy} for dropping {@link LayoutInfo} on diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java index 10a1d91fd..9738deaa0 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * 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,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions.AbstractAlignmentActionsSupport; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions.ComplexAlignmentActionsSupport; @@ -32,6 +31,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java index 4541309b0..7c2a2173b 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; 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.model.clipboard.JavaInfoMemento; @@ -41,6 +40,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.jface.action.IMenuManager; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java index b93f3737f..43b2c92e2 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java @@ -16,7 +16,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator.LayoutRequestValidatorStubFalse; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.GefMessages; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; @@ -34,6 +33,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; import javax.swing.JDialog; import javax.swing.JFrame; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuPopupDropLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuPopupDropLayoutEditPolicy.java index a10f2fa5a..4501e2739 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuPopupDropLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuPopupDropLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfo; 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.model.clipboard.JavaInfoMemento; @@ -32,6 +31,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 java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/policy/DropLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/policy/DropLayoutEditPolicy.java index d8f5f6dd8..d6c78cae6 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/policy/DropLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/policy/DropLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 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 @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swing.gefTree.policy; import org.eclipse.wb.core.gef.command.EditCommand; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.internal.swing.model.layout.LayoutInfo; @@ -22,6 +21,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; /** * Implementation of {@link LayoutEditPolicy} for dropping {@link LayoutInfo} on diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/ActionUseEntryInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/ActionUseEntryInfo.java index 754cc7ec6..76867e0ec 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/ActionUseEntryInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/palette/ActionUseEntryInfo.java @@ -88,10 +88,6 @@ public ActionInfo getNewObject() { } }; // return tool - return new CreationTool(factory) { - @Override - protected void selectAddedObjects() { - } - }; + return new CreationTool(factory); } } diff --git a/org.eclipse.wb.swt/META-INF/MANIFEST.MF b/org.eclipse.wb.swt/META-INF/MANIFEST.MF index f8b2381bb..dad3a8eec 100644 --- a/org.eclipse.wb.swt/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swt/META-INF/MANIFEST.MF @@ -60,7 +60,7 @@ Export-Package: org.eclipse.wb.internal.swt;x-friends:="org.eclipse.wb.os.linux, org.eclipse.wb.internal.swt.utils Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.core.java;bundle-version="[1.15.0,2.0.0)", org.eclipse.pde.core;bundle-version="[3.18.100,4.0.0)", org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)", diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java index 8848546db..750b7e6fc 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swt.gef.policy.layout; import org.eclipse.wb.core.gef.command.EditCommand; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.AbsoluteLayoutSelectionEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions.AbstractAlignmentActionsSupport; @@ -30,6 +29,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DropLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DropLayoutEditPolicy.java index 41ebff80d..41323f21b 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DropLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DropLayoutEditPolicy.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 @@ -16,13 +16,13 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; /** * Implementation of {@link LayoutEditPolicy} for dropping {@link LayoutInfo} on diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java index 0a4da894c..0f8eed8a9 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.helpers.BroadcastListenerHelper; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions.AbstractAlignmentActionsSupport; import org.eclipse.wb.internal.core.gef.policy.layout.absolute.actions.ComplexAlignmentActionsSupport; @@ -41,6 +40,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.TabFolder; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java index b256dc570..e443bc387 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java @@ -27,7 +27,6 @@ import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; 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; @@ -62,6 +61,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.jface.action.IMenuManager; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java index 183ea12ea..baeca9aef 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.policies.IRefreshableEditPolicy; -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.model.clipboard.JavaInfoMemento; @@ -41,6 +40,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.jface.action.IMenuManager; import java.util.List; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/menu/MenuBarDropLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/menu/MenuBarDropLayoutEditPolicy.java index 3e13623d1..f9b5c19d3 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/menu/MenuBarDropLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/menu/MenuBarDropLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator.LayoutRequestValidatorStubFalse; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.EnvironmentUtils; import org.eclipse.wb.internal.core.gef.part.DesignRootEditPart; @@ -39,6 +38,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.swt.graphics.FontMetrics; /** diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/DropLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/DropLayoutEditPolicy.java index 51c0ad711..8d62ab76b 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/DropLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/DropLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 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 @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swt.gefTree.policy; import org.eclipse.wb.core.gef.command.EditCommand; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; @@ -22,6 +21,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; /** * Implementation of {@link LayoutEditPolicy} for dropping {@link LayoutInfo} on diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/menu/MenuBarDropLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/menu/MenuBarDropLayoutEditPolicy.java index b99880c81..a96785b87 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/menu/MenuBarDropLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/policy/menu/MenuBarDropLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 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,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator.LayoutRequestValidatorStubFalse; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.internal.swt.model.widgets.menu.MenuInfo; @@ -23,6 +22,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.requests.CreateRequest; /** * {@link LayoutEditPolicy} allowing drop "bar" {@link MenuInfo} on Shell. diff --git a/org.eclipse.wb.tests/META-INF/MANIFEST.MF b/org.eclipse.wb.tests/META-INF/MANIFEST.MF index 79d1df3fa..097462bf1 100644 --- a/org.eclipse.wb.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)", org.eclipse.nebula.widgets.grid;bundle-version="[1.1.1,2.0.0)", org.eclipse.nebula.widgets.pshelf;bundle-version="[1.1.0,2.0.0)", org.eclipse.swtbot.eclipse.finder;bundle-version="[4.2.0,5.0.0)", - org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)", + org.eclipse.wb.core;bundle-version="[1.26.0,2.0.0)", org.eclipse.wb.core.java;bundle-version="[1.13.100,2.0.0)", org.eclipse.wb.swing;bundle-version="[1.10.200,2.0.0)", org.eclipse.wb.swing.FormLayout;bundle-version="[1.12.100,2.0.0)", diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/AbstractLayoutRequestValidatorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/AbstractLayoutRequestValidatorTest.java index 7915a686d..49de5454b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/AbstractLayoutRequestValidatorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/editor/validator/AbstractLayoutRequestValidatorTest.java @@ -14,13 +14,14 @@ 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.clipboard.JavaInfoMemento; import org.eclipse.wb.tests.designer.swing.SwingModelTest; import org.eclipse.gef.EditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; +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, diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java index af5c567c0..680095635 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java +++ b/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,20 +73,20 @@ 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", "getTargetEditPart", "showTargetFeedback", - "showTargetFeedback", - "getCommand"}, m_request); + "getCommand", + "showTargetFeedback"}, m_request); assertLoggers(expectedLogger, actualLogger); } // 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, @@ -92,21 +95,21 @@ public void test_Move_DND() throws Exception { expectedLogger.log(editPart, "eraseTargetFeedback", m_request); expectedLogger.log(childEditPart1, new String[]{ "showTargetFeedback", - "showTargetFeedback", - "getCommand"}, m_request); + "getCommand", + "showTargetFeedback"}, m_request); assertLoggers(expectedLogger, actualLogger); } // move into "childEditPart1" { m_sender.moveTo(130, 130); // - m_request.setLocation(new Point(130, 130)); + setLocation(new Point(130, 130)); // expectedLogger.log(childEditPart1, new String[]{ "getTargetEditPart", "getTargetEditPart", - "showTargetFeedback", - "getCommand"}, m_request); + "getCommand", + "showTargetFeedback"}, m_request); assertLoggers(expectedLogger, actualLogger); } // start drag process @@ -118,23 +121,23 @@ 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, - new String[]{"showTargetFeedback", "getCommand"}, + new String[] { "getCommand", "showTargetFeedback" }, m_request); assertLoggers(expectedLogger, actualLogger); //////////////////////////////////////////////////////////////// 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, - new String[]{"showTargetFeedback", "getCommand"}, + new String[] { "getCommand", "showTargetFeedback" }, m_request); assertLoggers(expectedLogger, actualLogger); } @@ -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,21 +181,21 @@ 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", "getTargetEditPart", "showTargetFeedback", - "showTargetFeedback", - "getCommand"}, m_request); + "getCommand", + "showTargetFeedback"}, m_request); assertLoggers(expectedLogger, actualLogger); } // click into "editPart" invalid button { 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,14 +210,14 @@ 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", "getTargetEditPart", "showTargetFeedback", - "showTargetFeedback", - "getCommand"}, m_request); + "getCommand", + "showTargetFeedback"}, m_request); assertLoggers(expectedLogger, actualLogger); } // start drag process @@ -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); + expectedLogger.log(editPart, new String[] { "getCommand", "showTargetFeedback" }, 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); diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolTest.java index d942f2a57..11bd36688 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolTest.java @@ -12,9 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -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.CreateRequest; 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); } } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java index 317c70016..c4a63c528 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.DesignEditPart; import org.eclipse.wb.gef.graphical.handles.MoveHandle; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -33,6 +32,7 @@ import org.eclipse.gef.Tool; import org.eclipse.gef.commands.Command; import org.eclipse.gef.handles.ResizeHandle; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/PasteToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/PasteToolTest.java index 8e57c0068..1bc4a90c7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/PasteToolTest.java +++ b/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); + } } \ No newline at end of file diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java index d6a350f2f..72987a979 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/RequestsTest.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.core.requests.PasteRequest; import org.eclipse.wb.gef.graphical.DesignEditPart; @@ -26,6 +25,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gef.requests.CreationFactory; import org.eclipse.gef.requests.GroupRequest; import org.eclipse.gef.requests.LocationRequest; @@ -213,7 +213,8 @@ public Integer getNewObject() { return Integer.valueOf(273); } }; - CreateRequest request = new CreateRequest(factory); + CreateRequest request = new CreateRequest(); + request.setFactory(factory); // // check new CreateRequest assertSame(RequestConstants.REQ_CREATE, request.getType()); @@ -233,15 +234,6 @@ public Integer getNewObject() { assertEquals(273, newObject); assertSame(newObject, request.getNewObject()); assertNotSame(newObject, factory.getNewObject()); - // - // check replacing "selectObject" - { - Object otherObject = new Object(); - assertSame(newObject, request.getSelectObject()); - request.setSelectObject(otherObject); - assertSame(newObject, request.getNewObject()); - assertSame(otherObject, request.getSelectObject()); - } } @Test