Skip to content

Commit dbdfa7d

Browse files
committed
[GEF] SideLocator should extend RelativeLocator directly
We shouldn't use our own `AbstractRelativeLocator` when we can use the official class directly.
1 parent 9dba7f7 commit dbdfa7d

2 files changed

Lines changed: 23 additions & 10 deletions

File tree

org.eclipse.wb.core/.settings/.api_filters

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,18 @@
5555
</message_arguments>
5656
</filter>
5757
</resource>
58+
<resource path="src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java" type="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy">
59+
<filter id="338792546">
60+
<message_arguments>
61+
<message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
62+
<message_argument value="createMoveHandle()"/>
63+
</message_arguments>
64+
</filter>
65+
<filter id="576720909">
66+
<message_arguments>
67+
<message_argument value="SelectionEditPolicy"/>
68+
<message_argument value="AbstractGridSelectionEditPolicy"/>
69+
</message_arguments>
70+
</filter>
71+
</resource>
5872
</component>

org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import org.eclipse.wb.core.model.IAbstractComponentInfo;
2020
import org.eclipse.wb.core.model.ObjectInfo;
2121
import org.eclipse.wb.core.model.broadcast.ObjectEventListener;
22-
import org.eclipse.wb.draw2d.AbstractRelativeLocator;
23-
import org.eclipse.wb.draw2d.RelativeLocator;
2422
import org.eclipse.wb.gef.core.IEditPartViewer;
2523
import org.eclipse.wb.gef.graphical.handles.MoveHandle;
2624
import org.eclipse.wb.gef.graphical.handles.SquareHandle;
@@ -33,6 +31,7 @@
3331
import org.eclipse.draw2d.Locator;
3432
import org.eclipse.draw2d.PositionConstants;
3533
import org.eclipse.draw2d.RectangleFigure;
34+
import org.eclipse.draw2d.RelativeLocator;
3635
import org.eclipse.draw2d.geometry.Dimension;
3736
import org.eclipse.draw2d.geometry.Interval;
3837
import org.eclipse.draw2d.geometry.Point;
@@ -592,13 +591,13 @@ protected Color getBorderColor() {
592591
protected final Locator createComponentLocator(int direction, double percent) {
593592
IFigure reference = getHostFigure();
594593
if (direction == PositionConstants.WEST) {
595-
return new RelativeLocator(reference, 0, percent);
594+
return new org.eclipse.wb.draw2d.RelativeLocator(reference, 0, percent);
596595
} else if (direction == PositionConstants.EAST) {
597-
return new RelativeLocator(reference, 1, percent);
596+
return new org.eclipse.wb.draw2d.RelativeLocator(reference, 1, percent);
598597
} else if (direction == PositionConstants.NORTH) {
599-
return new RelativeLocator(reference, percent, percent);
598+
return new org.eclipse.wb.draw2d.RelativeLocator(reference, percent, percent);
600599
} else if (direction == PositionConstants.SOUTH) {
601-
return new RelativeLocator(reference, percent, 1);
600+
return new org.eclipse.wb.draw2d.RelativeLocator(reference, percent, 1);
602601
}
603602
throw new IllegalArgumentException("Unknown direction: " + direction);
604603
}
@@ -607,14 +606,14 @@ protected final Locator createComponentLocator(int direction, double percent) {
607606
* @return {@link Locator} that positions handles on component's cells side.
608607
*/
609608
protected final Locator createCellLocator(int direction, double percent) {
610-
class SideLocator extends AbstractRelativeLocator {
609+
class SideLocator extends RelativeLocator {
611610
public SideLocator(double relativeX, double relativeY) {
612-
super(relativeX, relativeY);
611+
super(getHost().getFigure(), relativeX, relativeY);
613612
}
614613

615614
@Override
616-
protected Rectangle getReferenceRectangle() {
617-
return getComponentCellBounds_atFeedback();
615+
protected Rectangle getReferenceBox() {
616+
return getComponentCellBounds();
618617
}
619618
}
620619
//

0 commit comments

Comments
 (0)