From 08a4b22b19d247c679b2420e4d45b8e90e4f58a1 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 8 Jul 2025 17:40:29 +0200 Subject: [PATCH] [GEF] Cleanup usage of WindowBuilder Figure in Swing Components Update all fields and methods to use IFigure when possible. --- .../FormLayout/gef/header/edit/ColumnHeaderEditPart.java | 4 ++-- .../swing/FormLayout/gef/header/edit/RowHeaderEditPart.java | 4 ++-- .../gef/header/selection/DimensionSelectionEditPolicy.java | 2 +- .../FormLayout/gef/header/selection/ResizeHintFigure.java | 5 +++-- .../MigLayout/gef/header/edit/ColumnHeaderEditPart.java | 4 ++-- .../swing/MigLayout/gef/header/edit/RowHeaderEditPart.java | 4 ++-- .../gef/header/selection/DimensionSelectionEditPolicy.java | 2 +- .../MigLayout/gef/header/selection/ResizeHintFigure.java | 5 +++-- .../wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java | 3 ++- .../wb/internal/swing/gef/part/box/BoxGlueEditPart.java | 3 ++- .../swing/gef/part/box/BoxGlueHorizontalEditPart.java | 3 ++- .../internal/swing/gef/part/box/BoxGlueVerticalEditPart.java | 3 ++- .../wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java | 3 ++- .../swing/gef/part/box/BoxStrutHorizontalEditPart.java | 3 ++- .../swing/gef/part/box/BoxStrutVerticalEditPart.java | 3 ++- .../gef/policy/component/box/StrutSelectionEditPolicy.java | 3 +-- .../policy/layout/gbl/header/edit/ColumnHeaderEditPart.java | 4 ++-- .../gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java | 4 ++-- .../gbl/header/selection/DimensionSelectionEditPolicy.java | 2 +- .../swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java | 5 +++-- 20 files changed, 39 insertions(+), 30 deletions(-) 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 e59fe54c4..f8128a4f3 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 @@ -67,8 +67,8 @@ public ColumnHeaderEditPart(FormLayoutInfo layout, FormColumnInfo column, IFigur // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure newFigure = new Figure() { + protected IFigure createFigure() { + IFigure newFigure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 c2be8d029..07a7ed86b 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 @@ -67,8 +67,8 @@ public RowHeaderEditPart(FormLayoutInfo layout, FormRowInfo row, IFigure contain // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure newFigure = new Figure() { + protected IFigure createFigure() { + IFigure newFigure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 80c135944..f42c266b3 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 @@ -126,7 +126,7 @@ protected final T getDimension() { // Resize // //////////////////////////////////////////////////////////////////////////// - private Figure m_lineFeedback; + private IFigure m_lineFeedback; private ResizeHintFigure m_feedback; private ChangeBoundsRequest m_lastResizeRequest; protected Command m_resizeCommand; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/ResizeHintFigure.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/ResizeHintFigure.java index 7b6875425..fcde0d8da 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/ResizeHintFigure.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/ResizeHintFigure.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 @@ -23,6 +23,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.Insets; import org.eclipse.swt.graphics.Font; @@ -30,7 +31,7 @@ import java.text.MessageFormat; /** - * {@link Figure} for displaying {@link FormLayoutInfo} header resize. + * {@link IFigure} for displaying {@link FormLayoutInfo} header resize. * * @author scheglov_ke * @coverage swing.FormLayout.header 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 02fcf936a..f80bcf6e9 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 @@ -72,8 +72,8 @@ public ColumnHeaderEditPart(MigLayoutInfo layout, MigColumnInfo column, IFigure // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure newFigure = new Figure() { + protected IFigure createFigure() { + IFigure newFigure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 73f69d0a4..11f5e9fe3 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 @@ -72,8 +72,8 @@ public RowHeaderEditPart(MigLayoutInfo layout, MigRowInfo row, IFigure container // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure newFigure = new Figure() { + protected IFigure createFigure() { + IFigure newFigure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 58c7e5a0d..a6777ade8 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 @@ -131,7 +131,7 @@ protected final T getDimension() { //////////////////////////////////////////////////////////////////////////// private SizeElement m_resizeSizeElement; private String m_resizeSizeUnit; - private Figure m_lineFeedback; + private IFigure m_lineFeedback; private ResizeHintFigure m_feedback; private ChangeBoundsRequest m_lastResizeRequest; protected Command m_resizeCommand; diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/ResizeHintFigure.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/ResizeHintFigure.java index c6cf40160..006bac74f 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/ResizeHintFigure.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/ResizeHintFigure.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 @@ -23,6 +23,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.SWTGraphics; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Insets; @@ -31,7 +32,7 @@ import org.eclipse.swt.widgets.Shell; /** - * {@link Figure} for displaying {@link MigLayoutInfo} header resize. + * {@link IFigure} for displaying {@link MigLayoutInfo} header resize. * * @author scheglov_ke * @coverage swing.MigLayout.header diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java index 5a974b36d..bcadf9037 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java @@ -19,6 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.JTabbedPaneInfo; import org.eclipse.wb.internal.swing.model.component.JTabbedPaneTabInfo; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; @@ -59,7 +60,7 @@ protected void updateModel() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure(); } diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java index a9f080e7a..fea3914dc 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java @@ -18,6 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -56,7 +57,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java index 4e6fa2d50..2abb71e04 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java @@ -18,6 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -56,7 +57,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java index eed7f558a..bb13db8ea 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java @@ -18,6 +18,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -56,7 +57,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java index 1aaa4348d..ec19cd303 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java @@ -19,6 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -58,7 +59,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java index 56b244815..1d5413505 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java @@ -19,6 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -60,7 +61,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java index e702e8bdb..20f313de3 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java @@ -19,6 +19,7 @@ import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPolicy; @@ -58,7 +59,7 @@ protected void createEditPolicies() { // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { + protected IFigure createFigure() { return new Figure() { @Override protected void paintClientArea(Graphics graphics) { 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 6aa49b7a6..364167ef1 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.gef.figure.TextFeedback; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.RectangleFigure; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; @@ -110,7 +109,7 @@ public void eraseSourceFeedback(Request request) { // Resize // //////////////////////////////////////////////////////////////////////////// - private Figure m_sizeFeedback; + private IFigure m_sizeFeedback; private TextFeedback m_textFeedback; /** 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 17b18425c..6e222809a 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 @@ -65,8 +65,8 @@ public ColumnHeaderEditPart(AbstractGridBagLayoutInfo layout, // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure figure = new Figure() { + protected IFigure createFigure() { + IFigure figure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 3b2f0bb7b..d64d0aee3 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 @@ -66,8 +66,8 @@ public RowHeaderEditPart(AbstractGridBagLayoutInfo layout, RowInfo row, IFigure // //////////////////////////////////////////////////////////////////////////// @Override - protected Figure createFigure() { - Figure figure = new Figure() { + protected IFigure createFigure() { + IFigure figure = new Figure() { @Override protected void paintClientArea(Graphics graphics) { Rectangle r = getClientArea(); 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 1634e3f4d..b8205f5be 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 @@ -122,7 +122,7 @@ protected final T getDimension() { // Resize // //////////////////////////////////////////////////////////////////////////// - private Figure m_lineFeedback; + private IFigure m_lineFeedback; private TextFeedback m_feedback; protected Command m_resizeCommand; 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 41749b483..6bfe3e987 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 @@ -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 @@ -25,6 +25,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.Insets; @@ -71,7 +72,7 @@ protected ILayoutRequestValidator getRequestValidator() { // Feedback // //////////////////////////////////////////////////////////////////////////// - private Figure m_feedback; + private IFigure m_feedback; @Override protected void showLayoutTargetFeedback(Request request) {