diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/selection/TopSelectionEditPolicy.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/selection/TopSelectionEditPolicy.java index 1fbd558ca..88155a0b4 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/selection/TopSelectionEditPolicy.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/selection/TopSelectionEditPolicy.java @@ -18,7 +18,6 @@ import org.eclipse.wb.core.model.ITopBoundsSupport; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; @@ -28,6 +27,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.gef.requests.ChangeBoundsRequest; import java.util.ArrayList; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/handles/ResizeHandle.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/handles/ResizeHandle.java deleted file mode 100644 index eea78d211..000000000 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/handles/ResizeHandle.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * 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 - * https://www.eclipse.org/legal/epl-2.0. - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Google, Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.wb.gef.graphical.handles; - -import org.eclipse.wb.draw2d.RelativeLocator; - -import org.eclipse.draw2d.Cursors; -import org.eclipse.draw2d.Locator; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.GraphicalEditPart; - -/** - * A Handle used to resize a {@link EditPart}s. - * - * @author lobas_av - * @coverage gef.graphical - */ -public class ResizeHandle extends SquareHandle { - private final int m_direction; - - //////////////////////////////////////////////////////////////////////////// - // - // Constructor - // - //////////////////////////////////////////////////////////////////////////// - /** - * Creates a new ResizeHandle for the given {@link GraphicalEditPart}. The direction - * is the relative direction from the center of the owner figure. - */ - public ResizeHandle(GraphicalEditPart owner, int direction) { - this(owner, direction, new RelativeLocator(owner.getFigure(), direction)); - } - - /** - * Creates a new ResizeHandle for the given {@link GraphicalEditPart}. The direction - * is the relative direction from the center of the owner figure. - */ - public ResizeHandle(GraphicalEditPart owner, int direction, Locator locator) { - super(owner, locator); - m_direction = direction; - setCursor(Cursors.getDirectionalCursor(direction)); - } - - //////////////////////////////////////////////////////////////////////////// - // - // Access - // - //////////////////////////////////////////////////////////////////////////// - public int getDirection() { - return m_direction; - } -} \ No newline at end of file diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/selection/NonResizableSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/selection/NonResizableSelectionEditPolicy.java index d9d17bb16..122e3d263 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/selection/NonResizableSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/selection/NonResizableSelectionEditPolicy.java @@ -13,13 +13,13 @@ package org.eclipse.wb.core.gef.policy.selection; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.draw2d.PositionConstants; import org.eclipse.gef.EditPart; import org.eclipse.gef.Handle; +import org.eclipse.gef.handles.ResizeHandle; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java index b001213f2..bfcd77c84 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java @@ -14,7 +14,6 @@ import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.core.gef.policy.snapping.PlacementsSupport; @@ -24,6 +23,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupSelectionEditPolicy2.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupSelectionEditPolicy2.java index dcedc93f2..f547c46ef 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupSelectionEditPolicy2.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupSelectionEditPolicy2.java @@ -21,7 +21,6 @@ import org.eclipse.wb.core.model.ObjectInfoUtils; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.core.DesignerPlugin; @@ -45,6 +44,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/ColumnLayoutSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/ColumnLayoutSelectionEditPolicy.java index 14a23ebe0..42a9d10fd 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/ColumnLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/ColumnLayoutSelectionEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.rcp.model.forms.layout.column.IColumnLayoutDataInfo; @@ -32,6 +31,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.gef.requests.ChangeBoundsRequest; import java.util.ArrayList; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java index 4471252aa..a7d3fb3ff 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java @@ -14,7 +14,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.rcp.model.layout.IStackLayoutInfo; @@ -27,6 +26,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Handle; +import org.eclipse.gef.handles.ResizeHandle; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java index 09682c700..780a052e4 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java @@ -14,7 +14,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; @@ -28,6 +27,7 @@ import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Handle; import org.eclipse.gef.Request; +import org.eclipse.gef.handles.ResizeHandle; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/RowLayoutSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/RowLayoutSelectionEditPolicy.java index b60da6de0..dc52eb00f 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/RowLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/RowLayoutSelectionEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.swt.model.layout.IRowDataInfo; @@ -33,6 +32,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.gef.requests.ChangeBoundsRequest; import java.util.ArrayList; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java index d10ff71ed..93672956c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.internal.core.DesignerPlugin; @@ -57,6 +56,7 @@ import org.eclipse.gef.Handle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; 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 6ddd53cc4..317c70016 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 @@ -15,7 +15,6 @@ 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.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; @@ -33,6 +32,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.Tool; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.handles.ResizeHandle; 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/GraphicalRobot.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java index 71dc392a9..2c4bf8e82 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java @@ -18,7 +18,6 @@ import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.core.tools.PasteTool; import org.eclipse.wb.gef.graphical.handles.MoveHandle; -import org.eclipse.wb.gef.graphical.handles.ResizeHandle; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.wb.gef.graphical.tools.SelectionTool; import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; @@ -44,6 +43,7 @@ import org.eclipse.gef.Tool; import org.eclipse.gef.commands.Command; import org.eclipse.gef.editparts.LayerManager; +import org.eclipse.gef.handles.ResizeHandle; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Text; @@ -238,8 +238,8 @@ public GraphicalRobot beginMove(Object object) { */ public GraphicalRobot toResizeHandle(Object object, final int direction) { Predicate predicate = handle -> { - if (handle instanceof ResizeHandle resizeHandle) { - return resizeHandle.getDirection() == direction; + if (handle instanceof ResizeHandle) { + return ReflectionUtils.getFieldInt(handle, "cursorDirection") == direction; } return false; }; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java index b98200e9e..faa2c4353 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java @@ -91,7 +91,7 @@ public void test_Move() throws Exception { } // move to "ButtonEditPart_NORTH_WEST_ResizeHandle" { - m_sender.moveTo(120, 120); + m_sender.moveTo(100, 100); // m_expectedLogger.setCursor(Cursors.SIZENW); m_actualLogger.assertEquals(m_expectedLogger); @@ -131,14 +131,14 @@ public void test_ResizeTracker() throws Exception { } // move to "ButtonEditPart_NORTH_WEST_ResizeHandle" { - m_sender.moveTo(120, 120); + m_sender.moveTo(100, 100); // m_expectedLogger.setCursor(Cursors.SIZENW); m_actualLogger.assertEquals(m_expectedLogger); } // start drag { - m_sender.startDrag(120, 120, 1); + m_sender.startDrag(100, 100, 1); // m_actualLogger.assertEmpty(); } @@ -157,27 +157,27 @@ public void test_ResizeTracker() throws Exception { } // move to "ShellEditPart" { - m_sender.moveTo(110, 220); + m_sender.moveTo(90, 200); // m_expectedLogger.setCursor(null); m_actualLogger.assertEquals(m_expectedLogger); } // move to "ButtonEditPart_SOUTH_WEST_ResizeHandle" { - m_sender.moveTo(120, 220); + m_sender.moveTo(100, 200); // m_expectedLogger.setCursor(Cursors.SIZESW); m_actualLogger.assertEquals(m_expectedLogger); } // start drag { - m_sender.startDrag(120, 220, 1); + m_sender.startDrag(100, 200, 1); // m_actualLogger.assertEmpty(); } // drag to "ShellEditPart" { - m_sender.dragTo(100, 220); + m_sender.dragTo(80, 200); // m_actualLogger.assertEmpty(); } @@ -190,32 +190,32 @@ public void test_ResizeTracker() throws Exception { } // move to "ButtonEditPart_NORTH_ResizeHandle" { - m_sender.moveTo(220, 120); + m_sender.moveTo(200, 100); // m_expectedLogger.setCursor(Cursors.SIZEN); m_actualLogger.assertEquals(m_expectedLogger); } // start drag { - m_sender.startDrag(220, 120, 1); + m_sender.startDrag(200, 100, 1); // m_actualLogger.assertEmpty(); } // drag to "ShellEditPart" { - m_sender.dragTo(220, 100); + m_sender.dragTo(200, 80); // m_actualLogger.assertEmpty(); } // invalid input { - m_sender.startDrag(220, 100, 2); + m_sender.startDrag(200, 80, 2); // m_actualLogger.assertEmpty(); } // drag to "ShellEditPart" { - m_sender.dragTo(220, 90); + m_sender.dragTo(200, 70); // m_actualLogger.assertEmpty(); } @@ -289,20 +289,20 @@ public void test_ResizeTracker_NoResize() throws Exception { } // move to "EditPart_NORTH_EAST_ResizeHandle" { - m_sender.moveTo(80, 30); + m_sender.moveTo(60, 10); // expectedLogger.setCursor(Cursors.SIZENE); m_actualLogger.assertEquals(expectedLogger); } // start drag { - m_sender.startDrag(80, 30, 1); + m_sender.startDrag(60, 10, 1); // m_actualLogger.assertEmpty(); } // drag { - m_sender.dragTo(90, 30); + m_sender.dragTo(70, 10); // m_actualLogger.assertEmpty(); } @@ -434,26 +434,26 @@ public void test_MarqueeDragTracker() throws Exception { } // move to "ShellEditPart" { - m_sender.moveTo(50, 50); + m_sender.moveTo(30, 30); // m_actualLogger.assertEmpty(); } // use tracker { m_sender.setStateMask(SWT.ALT); - m_sender.startDrag(50, 50, 1); + m_sender.startDrag(30, 30, 1); // m_actualLogger.assertEmpty(); } // drag over "ShellEditPart" { - m_sender.dragTo(100, 100); + m_sender.dragTo(80, 80); // m_actualLogger.assertEmpty(); } // drag over "ButtonEditPart_NORTH_ResizeHandle" { - m_sender.dragTo(220, 120); + m_sender.dragTo(200, 100); // m_actualLogger.assertEmpty(); } @@ -469,7 +469,7 @@ public void test_MarqueeDragTracker() throws Exception { // // move to "ButtonEditPart_NORTH_ResizeHandle" { - m_sender.moveTo(220, 120); + m_sender.moveTo(200, 100); // m_expectedLogger.setCursor(Cursors.SIZEN); m_actualLogger.assertEquals(m_expectedLogger); @@ -477,25 +477,25 @@ public void test_MarqueeDragTracker() throws Exception { // use tracker { m_sender.setStateMask(SWT.ALT); - m_sender.startDrag(220, 120, 1); + m_sender.startDrag(200, 100, 1); // m_actualLogger.assertEmpty(); } // drag { - m_sender.dragTo(230, 130); + m_sender.dragTo(210, 110); // m_actualLogger.assertEmpty(); } // invalid input { - m_sender.startDrag(230, 130, 2); + m_sender.startDrag(210, 110, 2); // m_actualLogger.assertEmpty(); } // drag { - m_sender.dragTo(235, 135); + m_sender.dragTo(215, 115); // m_actualLogger.assertEmpty(); }