Skip to content

[GEF] Cleanup usage of WindowBuilder Figure in Swing Components #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2025
Merged

[GEF] Cleanup usage of WindowBuilder Figure in Swing Components #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ut/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/ColumnHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...ayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/edit/RowHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...lipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions ...t/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/ResizeHintFigure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,14 +23,15 @@

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;

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
Expand Down
4 changes: 2 additions & 2 deletions ...out/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/ColumnHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...Layout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/edit/RowHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...clipse/wb/internal/swing/MigLayout/gef/header/selection/DimensionSelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions ...ut/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/selection/ResizeHintFigure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -59,7 +60,7 @@ protected void updateModel() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure();
}

Expand Down
3 changes: 2 additions & 1 deletion org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -56,7 +57,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 2 additions & 1 deletion ...se.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -56,7 +57,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 2 additions & 1 deletion ...ipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -56,7 +57,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 2 additions & 1 deletion ...eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -58,7 +59,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 2 additions & 1 deletion ...e.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -60,7 +61,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 2 additions & 1 deletion ...pse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -58,7 +59,7 @@ protected void createEditPolicies() {
//
////////////////////////////////////////////////////////////////////////////
@Override
protected Figure createFigure() {
protected IFigure createFigure() {
return new Figure() {
@Override
protected void paintClientArea(Graphics graphics) {
Expand Down
3 changes: 1 addition & 2 deletions .../src/org/eclipse/wb/internal/swing/gef/policy/component/box/StrutSelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -110,7 +109,7 @@ public void eraseSourceFeedback(Request request) {
// Resize
//
////////////////////////////////////////////////////////////////////////////
private Figure m_sizeFeedback;
private IFigure m_sizeFeedback;
private TextFeedback m_textFeedback;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/ColumnHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...rc/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/edit/RowHeaderEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...b/internal/swing/gef/policy/layout/gbl/header/selection/DimensionSelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 3 additions & 2 deletions ....swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuBarDropLayoutEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -71,7 +72,7 @@ protected ILayoutRequestValidator getRequestValidator() {
// Feedback
//
////////////////////////////////////////////////////////////////////////////
private Figure m_feedback;
private IFigure m_feedback;

@Override
protected void showLayoutTargetFeedback(Request request) {
Expand Down
Loading