1919import org .eclipse .wb .core .model .IAbstractComponentInfo ;
2020import org .eclipse .wb .core .model .ObjectInfo ;
2121import org .eclipse .wb .core .model .broadcast .ObjectEventListener ;
22- import org .eclipse .wb .draw2d .AbstractRelativeLocator ;
23- import org .eclipse .wb .draw2d .RelativeLocator ;
2422import org .eclipse .wb .gef .core .IEditPartViewer ;
2523import org .eclipse .wb .gef .graphical .handles .MoveHandle ;
2624import org .eclipse .wb .gef .graphical .handles .SquareHandle ;
3331import org .eclipse .draw2d .Locator ;
3432import org .eclipse .draw2d .PositionConstants ;
3533import org .eclipse .draw2d .RectangleFigure ;
34+ import org .eclipse .draw2d .RelativeLocator ;
3635import org .eclipse .draw2d .geometry .Dimension ;
3736import org .eclipse .draw2d .geometry .Interval ;
3837import 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