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 447c90592..a9172dca6 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 @@ -16,7 +16,6 @@ import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.core.model.ITopBoundsSupport; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.handles.Handle; @@ -25,6 +24,7 @@ import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.gef.graphical.tools.ResizeTracker; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -139,7 +139,7 @@ protected void showResizeFeedback(ChangeBoundsRequest request) { // prepare feedback bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); sanitizeBounds(bounds); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); diff --git a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/draw2d/RelativeLocator.java b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/draw2d/RelativeLocator.java index c1eee9c5c..9409ee106 100644 --- a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/draw2d/RelativeLocator.java +++ b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/draw2d/RelativeLocator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 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,28 +12,29 @@ *******************************************************************************/ package org.eclipse.wb.draw2d; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; /** - * Implementation of {@link AbstractRelativeLocator} that uses some {@link Figure} as reference. + * Implementation of {@link AbstractRelativeLocator} that uses some {@link IFigure} as reference. * * @author lobas_av * @coverage gef.draw2d */ public final class RelativeLocator extends AbstractRelativeLocator { - private final Figure m_reference; + private final IFigure m_reference; //////////////////////////////////////////////////////////////////////////// // // Constructors // //////////////////////////////////////////////////////////////////////////// - public RelativeLocator(Figure reference, double relativeX, double relativeY) { + public RelativeLocator(IFigure reference, double relativeX, double relativeY) { super(relativeX, relativeY); m_reference = reference; } - public RelativeLocator(Figure reference, int location) { + public RelativeLocator(IFigure reference, int location) { super(location); m_reference = reference; } diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java index c2f3f74b0..2e0360930 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.gef.graphical.policies; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; @@ -46,9 +45,9 @@ public GraphicalEditPart getHost() { // //////////////////////////////////////////////////////////////////////////// /** - * Convenience method to return the host's {@link Figure}. + * Convenience method to return the host's {@link IFigure}. */ - protected final Figure getHostFigure() { + protected final IFigure getHostFigure() { return getHost().getFigure(); } @@ -82,17 +81,17 @@ protected Layer getFeedbackLayer() { } /** - * Adds the specified {@link Figure} to the {@link IEditPartViewer#FEEDBACK_LAYER}. + * Adds the specified {@link IFigure} to the {@link IEditPartViewer#FEEDBACK_LAYER}. */ - protected final void addFeedback(Figure figure) { + protected final void addFeedback(IFigure figure) { getFeedbackLayer().add(figure); } /** - * Removes the specified {@link Figure} to the {@link IEditPartViewer#FEEDBACK_LAYER} + * Removes the specified {@link IFigure} to the {@link IEditPartViewer#FEEDBACK_LAYER} * . */ - protected final void removeFeedback(Figure figure) { + protected final void removeFeedback(IFigure figure) { getFeedbackLayer().remove(figure); } 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 573faba2c..36b813d37 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2025 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.core.gef.policy.layout.flow; import org.eclipse.wb.core.gef.policy.PolicyUtils; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Polyline; import org.eclipse.wb.gef.core.requests.AbstractCreateRequest; @@ -25,6 +24,7 @@ import org.eclipse.wb.internal.core.utils.GenericsUtils; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Transposer; @@ -373,7 +373,7 @@ public int compare(EditPart part_1, EditPart part_2) { private void showLayoutTargetFeedback_noReference(boolean horizontal, boolean rtl) { Polyline feedbackLine = getLineFeedback(); - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); Rectangle bounds = hostFigure.getBounds().getCopy(); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); // prepare points @@ -506,8 +506,8 @@ private static Point getLocationFromRequest(Request request) { } /** - * @return absolute bounds of given {@link EditPart}'s {@link Figure}, transposed if needed by - * layout. + * @return absolute bounds of given {@link EditPart}'s {@link IFigure}, + * transposed if needed by layout. */ private static Rectangle getAbsoluteBounds(boolean horizontal, EditPart editPart) { Rectangle bounds = PolicyUtils.getAbsoluteBounds((GraphicalEditPart) editPart); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractColumnSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractColumnSelectionEditPolicy.java index 66104e75c..a17fbdae2 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractColumnSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractColumnSelectionEditPolicy.java @@ -26,6 +26,7 @@ import org.eclipse.wb.gef.graphical.tools.ResizeTracker; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -153,7 +154,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java index 2d9c7971e..cc9088ac7 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java @@ -599,7 +599,7 @@ protected Color getBorderColor() { * @return {@link Locator} that positions handles on component side. */ protected final Locator createComponentLocator(int direction, double percent) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); if (direction == PositionConstants.WEST) { return new RelativeLocator(reference, 0, percent); } else if (direction == PositionConstants.EAST) { 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 1db1d3ab0..bcd83a68d 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -372,7 +372,7 @@ private void showMoveFeedback(ChangeBoundsRequest request) { // is this edit parts moved by using a keyboard boolean isKeyboardMoving = isKeyboardMoving(); // prepare dots feedback if enabled - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); if (m_dotsFeedback == null) { if ((useGridSnapping() || isKeyboardMoving()) && isShowGridFeedback()) { m_dotsFeedback = new DotsFeedback<>(this, hostFigure); @@ -664,7 +664,7 @@ private void showCreationFeedback(CreateRequest request) { m_startLocation = widgetBounds.getLocation(); } // - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); // create dots feedback if (m_dotsFeedback == null) { if (useGridSnapping() || isKeyboardMoving()) { diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/DotsFeedback.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/DotsFeedback.java index b531ccf51..a68b37b43 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/DotsFeedback.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/DotsFeedback.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 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 @@ -17,6 +17,7 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; /** @@ -34,7 +35,7 @@ public class DotsFeedback extends Figure { // Constructor // //////////////////////////////////////////////////////////////////////////// - public DotsFeedback(AbsoluteBasedLayoutEditPolicy layoutEditPolicy, Figure hostFigure) { + public DotsFeedback(AbsoluteBasedLayoutEditPolicy layoutEditPolicy, IFigure hostFigure) { m_layoutEditPolicy = layoutEditPolicy; // prepare bounds to draw on client-area only Rectangle bounds = hostFigure.getBounds().getCopy(); 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 2d4c31d8d..c54d37738 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2025 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.core.gef.policy.menu; import org.eclipse.wb.core.gef.policy.PolicyUtils; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.core.model.menu.IMenuObjectInfo; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; @@ -98,7 +98,7 @@ public org.eclipse.wb.gef.core.EditPart getTargetEditPart(Request request) { return null; } // prepare location in figure - Figure figure = getHostFigure(); + IFigure figure = getHostFigure(); Point location = ((DropRequest) request).getLocation().getCopy(); FigureUtils.translateAbsoluteToFigure2(figure, location); // if request's mouse location are in middle 1/3 height (width) of figure then return getHost() 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 dd0d091df..4045fe248 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 @@ -29,6 +29,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -151,7 +152,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/ColumnHeaderEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/ColumnHeaderEditPart.java index 9498a4bdb..7ce679e63 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/ColumnHeaderEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/ColumnHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -28,6 +28,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -51,7 +52,7 @@ public final class ColumnHeaderEditPart extends Dimensio //////////////////////////////////////////////////////////////////////////// public ColumnHeaderEditPart(ITableWrapLayoutInfo layout, TableWrapColumnInfo column, - Figure containerFigure) { + IFigure containerFigure) { super(layout, column, containerFigure); } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/DimensionHeaderEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/DimensionHeaderEditPart.java index b0f439228..bff6596cb 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/DimensionHeaderEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/DimensionHeaderEditPart.java @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.header.Headers; import org.eclipse.wb.core.gef.header.IHeaderMenuProvider; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.tools.ParentTargetDragEditPartTracker; @@ -27,6 +26,7 @@ import org.eclipse.wb.internal.rcp.model.forms.layout.table.TableWrapDimensionInfo; import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -52,7 +52,7 @@ public abstract class DimensionHeaderEditPart extends Gr //////////////////////////////////////////////////////////////////////////// protected final ITableWrapLayoutInfo m_layout; protected final TableWrapDimensionInfo m_dimension; - private final Figure m_containerFigure; + private final IFigure m_containerFigure; //////////////////////////////////////////////////////////////////////////// // @@ -61,7 +61,7 @@ public abstract class DimensionHeaderEditPart extends Gr //////////////////////////////////////////////////////////////////////////// public DimensionHeaderEditPart(ITableWrapLayoutInfo layout, TableWrapDimensionInfo dimension, - Figure containerFigure) { + IFigure containerFigure) { m_layout = layout; m_dimension = dimension; m_containerFigure = containerFigure; @@ -88,7 +88,7 @@ public final TableWrapDimensionInfo getDimension() { } /** - * @return the offset of {@link Figure} with headers relative to the absolute layer. + * @return the offset of {@link IFigure} with headers relative to the absolute layer. */ public final Point getOffset() { Point offset = new Point(0, 0); diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/RowHeaderEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/RowHeaderEditPart.java index d1f866a81..092de205b 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/RowHeaderEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/edit/RowHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -28,6 +28,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -51,7 +52,7 @@ public final class RowHeaderEditPart extends DimensionHe //////////////////////////////////////////////////////////////////////////// public RowHeaderEditPart(ITableWrapLayoutInfo layout, TableWrapRowInfo row, - Figure containerFigure) { + IFigure containerFigure) { super(layout, row, containerFigure); } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/selection/DimensionSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/selection/DimensionSelectionEditPolicy.java index 750001da1..485886363 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/selection/DimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/selection/DimensionSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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.rcp.gef.policy.forms.layout.grid.header.selection; import org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; @@ -91,7 +90,7 @@ protected final TableWrapDimensionInfo getDimension() { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds); 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 ac90e261d..61f4b6d3c 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 @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.rcp.gef.policy.layout; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; @@ -25,6 +24,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.Cursors; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; @@ -86,7 +86,7 @@ protected void showSelection() { // add navigate feedback if (m_navigationFigure == null) { m_navigationFigure = new StackLayoutNavigationFigure(this); - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); Rectangle bounds = hostFigure.getBounds().getCopy(); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); { diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/rcp/perspective/AbstractPartSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/rcp/perspective/AbstractPartSelectionEditPolicy.java index 8b752ef8d..e64a8c8d5 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/rcp/perspective/AbstractPartSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/rcp/perspective/AbstractPartSelectionEditPolicy.java @@ -164,7 +164,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds XXX Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = m_line.getPartBounds().getCopy(); bounds = request.getTransformedRectangle(bounds); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/SashFormSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/SashFormSelectionEditPolicy.java index 4ed6ea513..64a5f50c5 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/SashFormSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/SashFormSelectionEditPolicy.java @@ -28,6 +28,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -163,7 +164,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/TreeTreeColumnSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/TreeTreeColumnSelectionEditPolicy.java index 1a54305a3..3a865f573 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/TreeTreeColumnSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/widgets/TreeTreeColumnSelectionEditPolicy.java @@ -26,6 +26,7 @@ import org.eclipse.wb.internal.rcp.model.widgets.ITreeColumnInfo; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -143,7 +144,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); } diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/ColumnHeaderEditPart.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/ColumnHeaderEditPart.java index 95f3255e5..e59fe54c4 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/ColumnHeaderEditPart.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/ColumnHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -27,6 +27,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -55,7 +56,7 @@ public class ColumnHeaderEditPart extends DimensionHeaderEditPart //////////////////////////////////////////////////////////////////////////// protected final FormLayoutInfo m_layout; protected final T m_dimension; - private final Figure m_containerFigure; + private final IFigure m_containerFigure; //////////////////////////////////////////////////////////////////////////// // // Constructor // //////////////////////////////////////////////////////////////////////////// - public DimensionHeaderEditPart(FormLayoutInfo layout, T dimension, Figure containerFigure) { + public DimensionHeaderEditPart(FormLayoutInfo layout, T dimension, IFigure containerFigure) { m_layout = layout; m_dimension = dimension; m_containerFigure = containerFigure; @@ -99,7 +99,8 @@ public final T getDimension() { } /** - * @return the offset of {@link Figure} with headers relative to the absolute layer. + * @return the offset of {@link IFigure} with headers relative to the absolute + * layer. */ public final Point getOffset() { Point offset = new Point(0, 0); diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/RowHeaderEditPart.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/RowHeaderEditPart.java index a79332870..c2be8d029 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/RowHeaderEditPart.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/RowHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -27,6 +27,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -55,7 +56,7 @@ public class RowHeaderEditPart extends DimensionHeaderEditPart { // Constructor // //////////////////////////////////////////////////////////////////////////// - public RowHeaderEditPart(FormLayoutInfo layout, FormRowInfo row, Figure containerFigure) { + public RowHeaderEditPart(FormLayoutInfo layout, FormRowInfo row, IFigure containerFigure) { super(layout, row, containerFigure); m_row = row; } diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java index a24e9fd86..80c135944 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java @@ -168,7 +168,7 @@ public void showSourceFeedback(Request request) { // prepare feedback bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = changeBoundsRequest.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); } @@ -261,7 +261,7 @@ public void performRequest(Request request) { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds); diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/ColumnHeaderEditPart.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/ColumnHeaderEditPart.java index 52e3ec503..21f3a567d 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/ColumnHeaderEditPart.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/ColumnHeaderEditPart.java @@ -29,6 +29,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -60,7 +61,7 @@ public class ColumnHeaderEditPart extends DimensionHeaderEditPart // Constructor // //////////////////////////////////////////////////////////////////////////// - public ColumnHeaderEditPart(MigLayoutInfo layout, MigColumnInfo column, Figure containerFigure) { + public ColumnHeaderEditPart(MigLayoutInfo layout, MigColumnInfo column, IFigure containerFigure) { super(layout, column, containerFigure); m_column = column; } diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/DimensionHeaderEditPart.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/DimensionHeaderEditPart.java index 8e04cc941..7f1f81f4e 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/DimensionHeaderEditPart.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/DimensionHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.header.Headers; import org.eclipse.wb.core.gef.header.IHeaderMenuProvider; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.tools.ParentTargetDragEditPartTracker; @@ -23,6 +22,7 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigDimensionInfo; import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -55,14 +55,14 @@ public abstract class DimensionHeaderEditPart extend //////////////////////////////////////////////////////////////////////////// protected final MigLayoutInfo m_layout; protected final T m_dimension; - private final Figure m_containerFigure; + private final IFigure m_containerFigure; //////////////////////////////////////////////////////////////////////////// // // Constructor // //////////////////////////////////////////////////////////////////////////// - public DimensionHeaderEditPart(MigLayoutInfo layout, T dimension, Figure containerFigure) { + public DimensionHeaderEditPart(MigLayoutInfo layout, T dimension, IFigure containerFigure) { m_layout = layout; m_dimension = dimension; m_containerFigure = containerFigure; @@ -94,7 +94,8 @@ public final T getDimension() { } /** - * @return the offset of {@link Figure} with headers relative to the absolute layer. + * @return the offset of {@link IFigure} with headers relative to the absolute + * layer. */ public final Point getOffset() { Point offset = new Point(0, 0); diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/RowHeaderEditPart.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/RowHeaderEditPart.java index 1562041d2..d714b588a 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/RowHeaderEditPart.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/RowHeaderEditPart.java @@ -29,6 +29,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -60,7 +61,7 @@ public class RowHeaderEditPart extends DimensionHeaderEditPart { // Constructor // //////////////////////////////////////////////////////////////////////////// - public RowHeaderEditPart(MigLayoutInfo layout, MigRowInfo row, Figure containerFigure) { + public RowHeaderEditPart(MigLayoutInfo layout, MigRowInfo row, IFigure containerFigure) { super(layout, row, containerFigure); m_row = row; } diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java index 67ea11c94..58c7e5a0d 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java @@ -173,7 +173,7 @@ public void showSourceFeedback(Request request) { // prepare feedback bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = changeBoundsRequest.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); } @@ -354,7 +354,7 @@ public void performRequest(Request request) { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds); diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/component/box/StrutSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/component/box/StrutSelectionEditPolicy.java index 7687e8158..6aa49b7a6 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/component/box/StrutSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/component/box/StrutSelectionEditPolicy.java @@ -27,6 +27,7 @@ import org.eclipse.wb.internal.swing.model.layout.BoxSupport; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; @@ -146,7 +147,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); } 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 20d4fc3d5..28a3fee9c 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 @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.gef.policy.layout; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; @@ -25,6 +24,7 @@ import org.eclipse.wb.internal.swing.model.layout.CardLayoutInfo; import org.eclipse.draw2d.Cursors; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -86,7 +86,7 @@ protected void showSelection() { // add navigate feedback if (m_navigationFigure == null) { m_navigationFigure = new CardNavigationFigure(this); - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); Rectangle bounds = hostFigure.getBounds().getCopy(); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); m_navigationFigure.setBounds(new Rectangle(bounds.right() diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/ColumnHeaderEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/ColumnHeaderEditPart.java index 6223d6ab1..17b18425c 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/ColumnHeaderEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/ColumnHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -28,6 +28,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -53,7 +54,7 @@ public final class ColumnHeaderEditPart extends DimensionHeaderEditPart extends G //////////////////////////////////////////////////////////////////////////// protected final AbstractGridBagLayoutInfo m_layout; protected final T m_dimension; - private final Figure m_containerFigure; + private final IFigure m_containerFigure; //////////////////////////////////////////////////////////////////////////// // @@ -57,7 +57,7 @@ public abstract class DimensionHeaderEditPart extends G //////////////////////////////////////////////////////////////////////////// public DimensionHeaderEditPart(AbstractGridBagLayoutInfo layout, T dimension, - Figure containerFigure) { + IFigure containerFigure) { m_layout = layout; m_dimension = dimension; m_containerFigure = containerFigure; @@ -89,7 +89,8 @@ public final T getDimension() { } /** - * @return the offset of {@link Figure} with headers relative to the absolute layer. + * @return the offset of {@link IFigure} with headers relative to the absolute + * layer. */ public final Point getOffset() { Point offset = new Point(0, 0); diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java index f68675413..3b2f0bb7b 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -29,6 +29,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -54,7 +55,7 @@ public final class RowHeaderEditPart extends DimensionHeaderEditPart { // Constructor // //////////////////////////////////////////////////////////////////////////// - public RowHeaderEditPart(AbstractGridBagLayoutInfo layout, RowInfo row, Figure containerFigure) { + public RowHeaderEditPart(AbstractGridBagLayoutInfo layout, RowInfo row, IFigure containerFigure) { super(layout, row, containerFigure); m_row = row; } diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/selection/DimensionSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/selection/DimensionSelectionEditPolicy.java index 32d06e3d9..1634e3f4d 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/selection/DimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/selection/DimensionSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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 @@ -152,7 +152,7 @@ public void showSourceFeedback(Request request) { // prepare feedback bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = changeBoundsRequest.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); } @@ -225,7 +225,7 @@ protected final int getDimensionSize(Interval[] intervals) { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/TableTableColumnSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/TableTableColumnSelectionEditPolicy.java index d5ad6a40a..a86066b3d 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/TableTableColumnSelectionEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/TableTableColumnSelectionEditPolicy.java @@ -27,6 +27,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ITableColumnInfo; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -147,7 +148,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds.shrink(-1, -1)); } 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 e0b1b4d23..a494cd893 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 @@ -30,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; @@ -156,7 +157,7 @@ private void showResizeFeedback(ChangeBoundsRequest request) { // prepare bounds Rectangle bounds; { - Figure hostFigure = getHostFigure(); + IFigure hostFigure = getHostFigure(); bounds = request.getTransformedRectangle(hostFigure.getBounds()); FigureUtils.translateFigureToAbsolute(hostFigure, bounds); } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderEditPart.java index d90bbbff3..a79a46312 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderEditPart.java @@ -24,6 +24,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PointList; @@ -40,7 +41,7 @@ public class FormHeaderEditPart extends GraphicalEditPar private final boolean isHorizontal; private final IFormLayoutInfo layout; private final Transposer t; - private final Figure containerFigure; + private final IFigure containerFigure; //////////////////////////////////////////////////////////////////////////// // @@ -50,7 +51,7 @@ public class FormHeaderEditPart extends GraphicalEditPar public FormHeaderEditPart(IFormLayoutInfo layout, Object model, boolean isHorizontal, - Figure containerFigure) { + IFigure containerFigure) { super(); this.layout = layout; this.isHorizontal = isHorizontal; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java index 3bb61b583..3a7f6cb2f 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java @@ -30,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.ICompositeInfo; import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.draw2d.geometry.Transposer; @@ -220,7 +221,7 @@ private void translateToModel(Translatable t) { /** * @return the offset of {@link Figure} with headers relative to the absolute layer. */ - public static Point getOffset(Figure containerFigure, ICompositeInfo composite) { + public static Point getOffset(IFigure containerFigure, ICompositeInfo composite) { Point offset = new Point(0, 0); FigureUtils.translateFigureToAbsolute2(containerFigure, offset); offset.performTranslate(composite.getClientAreaInsets()); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderSelectionEditPolicy.java index c28ebe8dc..03630e954 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderSelectionEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 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.gef.policy.layout.form; import org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; @@ -70,7 +69,7 @@ protected List createSelectionHandles() { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds); 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 971eb3f57..7ebaf6adb 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 @@ -1166,7 +1166,7 @@ private void translateModelToFeedback(Translatable t) { private void installQuadrantHandler() { mouseQuadrant = -1; - final Figure figure = getHostFigure(); + final IFigure figure = getHostFigure(); // add mouse listener mouseMotionListener = new MouseMotionListener.Stub() { @Override diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/ColumnHeaderEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/ColumnHeaderEditPart.java index 594b856df..ea6a67dc2 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/ColumnHeaderEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/ColumnHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -29,6 +29,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -52,7 +53,7 @@ public final class ColumnHeaderEditPart extends Dimensio //////////////////////////////////////////////////////////////////////////// public ColumnHeaderEditPart(IGridLayoutInfo layout, GridColumnInfo column, - Figure containerFigure) { + IFigure containerFigure) { super(layout, column, containerFigure); } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/DimensionHeaderEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/DimensionHeaderEditPart.java index 25fe2422c..0ef6f7042 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/DimensionHeaderEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/DimensionHeaderEditPart.java @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.header.Headers; import org.eclipse.wb.core.gef.header.IHeaderMenuProvider; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.tools.ParentTargetDragEditPartTracker; @@ -27,6 +26,7 @@ import org.eclipse.wb.internal.swt.model.layout.grid.IGridLayoutInfo; import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -52,7 +52,7 @@ public abstract class DimensionHeaderEditPart extends Gr //////////////////////////////////////////////////////////////////////////// protected final IGridLayoutInfo m_layout; protected final GridDimensionInfo m_dimension; - private final Figure m_containerFigure; + private final IFigure m_containerFigure; //////////////////////////////////////////////////////////////////////////// // @@ -61,7 +61,7 @@ public abstract class DimensionHeaderEditPart extends Gr //////////////////////////////////////////////////////////////////////////// public DimensionHeaderEditPart(IGridLayoutInfo layout, GridDimensionInfo dimension, - Figure containerFigure) { + IFigure containerFigure) { m_layout = layout; m_dimension = dimension; m_containerFigure = containerFigure; @@ -88,7 +88,7 @@ public final GridDimensionInfo getDimension() { } /** - * @return the offset of {@link Figure} with headers relative to the absolute layer. + * @return the offset of {@link IFigure} with headers relative to the absolute layer. */ public final Point getOffset() { Point offset = new Point(0, 0); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/RowHeaderEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/RowHeaderEditPart.java index ef11aecaf..429be1d87 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/RowHeaderEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/edit/RowHeaderEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -28,6 +28,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TextUtilities; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Interval; @@ -49,7 +50,7 @@ public final class RowHeaderEditPart extends DimensionHe // Constructor // //////////////////////////////////////////////////////////////////////////// - public RowHeaderEditPart(IGridLayoutInfo layout, GridRowInfo row, Figure containerFigure) { + public RowHeaderEditPart(IGridLayoutInfo layout, GridRowInfo row, IFigure containerFigure) { super(layout, row, containerFigure); } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/selection/DimensionSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/selection/DimensionSelectionEditPolicy.java index b7937342b..cd22cf9e0 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/selection/DimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/selection/DimensionSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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.gef.policy.layout.grid.header.selection; import org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; @@ -91,7 +90,7 @@ protected final GridDimensionInfo getDimension() { private class HeaderMoveHandleLocator implements Locator { @Override public void relocate(IFigure target) { - Figure reference = getHostFigure(); + IFigure reference = getHostFigure(); Rectangle bounds = reference.getBounds().getCopy(); FigureUtils.translateFigureToFigure(reference, target, bounds); target.setBounds(bounds);