From 59c5f8eb692f067c87bdbcd03350ed53aad59446 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 29 Sep 2026 19:31:13 +0200 Subject: [PATCH] [Draw2D] Deprecate forked Layer class for removal This also replaces all references with the official class where possible. --- .../policy/TabOrderContainerEditPolicy.java | 2 +- org.eclipse.wb.core/.settings/.api_filters | 59 +++++++++++++++++++ .../draw2d/CustomTooltipProvider.java | 2 +- .../wb/internal/draw2d/IRootFigure.java | 3 +- .../wb/internal/draw2d/RootFigure.java | 3 +- .../gef/core/policies/DesignEditPolicy.java | 2 +- .../policies/SelectionEditPolicy.java | 2 +- .../gef/graphical/GraphicalViewer.java | 2 +- .../internal/gef/graphical/RootEditPart.java | 2 +- .../controls/palette/PaletteComposite.java | 2 +- .../gef/figure/AbstractPositionFeedback.java | 10 +++- .../gef/figure/GhostPositionFeedback.java | 9 ++- .../gef/figure/SolidPositionFeedback.java | 11 +++- .../wb/core/gef/figure/TextFeedback.java | 29 ++++++++- .../AbstractHeaderLayoutEditPolicy.java | 3 +- .../AbstractHeaderSelectionEditPolicy.java | 3 +- .../wb/core/gef/policy/PolicyUtils.java | 2 +- .../AbstractPositionLayoutEditPolicy.java | 2 +- .../internal/core/editor/DesignComposite.java | 2 +- .../AbsoluteBasedLayoutEditPolicy.java | 2 +- .../gef/policy/menu/MenuLayoutEditPolicy.java | 2 +- .../policy/menu/MenuSelectionEditPolicy.java | 2 +- .../menu/SubmenuAwareLayoutEditPolicy.java | 2 +- .../layout/ColumnsLayoutEditPolicy.java | 2 +- .../header/layout/RowsLayoutEditPolicy.java | 2 +- .../layout/ColumnsLayoutEditPolicy.java | 2 +- .../header/layout/RowsLayoutEditPolicy.java | 2 +- .../DimensionSelectionEditPolicy.java | 2 +- .../layout/ColumnsLayoutEditPolicy.java | 2 +- .../header/layout/RowsLayoutEditPolicy.java | 2 +- .../DimensionSelectionEditPolicy.java | 2 +- .../layout/ColumnsLayoutEditPolicy.java | 2 +- .../header/layout/RowsLayoutEditPolicy.java | 2 +- .../DimensionSelectionEditPolicy.java | 2 +- .../AbstractDimensionSelectionEditPolicy.java | 2 +- .../layout/form/AnchorFiguresClassic.java | 2 +- .../form/FormHeaderLayoutEditPolicy.java | 2 +- .../form/FormLayoutEditPolicyClassic.java | 2 +- .../layout/ColumnsLayoutEditPolicy.java | 2 +- .../header/layout/RowsLayoutEditPolicy.java | 2 +- .../wb/tests/draw2d/FigureEventTest.java | 2 +- .../eclipse/wb/tests/draw2d/LayerTest.java | 3 +- .../wb/tests/draw2d/RootFigureTest.java | 2 +- .../eclipse/wb/tests/gef/GraphicalRobot.java | 2 +- 44 files changed, 152 insertions(+), 49 deletions(-) diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/TabOrderContainerEditPolicy.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/TabOrderContainerEditPolicy.java index 2697d6b268..bd4397ce62 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/TabOrderContainerEditPolicy.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/TabOrderContainerEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.policies.DesignEditPolicy; import org.eclipse.wb.internal.core.DesignerPlugin; @@ -27,6 +26,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.GraphicalEditPart; diff --git a/org.eclipse.wb.core/.settings/.api_filters b/org.eclipse.wb.core/.settings/.api_filters index 96c3a88ee5..dc1ac08fe7 100644 --- a/org.eclipse.wb.core/.settings/.api_filters +++ b/org.eclipse.wb.core/.settings/.api_filters @@ -1,5 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/CustomTooltipProvider.java b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/CustomTooltipProvider.java index e9537430d9..35ac8d2fe4 100644 --- a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/CustomTooltipProvider.java +++ b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/CustomTooltipProvider.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.wb.internal.draw2d; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.core.utils.ui.GridDataFactory; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/IRootFigure.java b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/IRootFigure.java index 302d5320aa..4a8879e237 100644 --- a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/IRootFigure.java +++ b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/IRootFigure.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.internal.draw2d; -import org.eclipse.wb.draw2d.Layer; - import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import java.util.List; diff --git a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/RootFigure.java b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/RootFigure.java index bdab7bc4df..2f4cb33439 100644 --- a/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/RootFigure.java +++ b/org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/RootFigure.java @@ -12,10 +12,9 @@ *******************************************************************************/ package org.eclipse.wb.internal.draw2d; -import org.eclipse.wb.draw2d.Layer; - import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/DesignEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/DesignEditPolicy.java index 893385148b..e49261ae61 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/DesignEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/policies/DesignEditPolicy.java @@ -14,12 +14,12 @@ import org.eclipse.wb.core.gef.policy.IDesignEditPolicy; import org.eclipse.wb.core.gef.policy.IEditPolicyListener; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.GraphicalEditPolicy; import org.eclipse.draw2d.EventListenerList; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.LayerConstants; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java index 5f9b44ab76..8b5a8b7812 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java @@ -13,11 +13,11 @@ package org.eclipse.wb.gef.graphical.policies; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.policies.DesignEditPolicy; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartListener; import org.eclipse.gef.EditPolicy; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java index f60377b772..bfa997c94a 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.graphical; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.core.gef.DesignKeyHandler; import org.eclipse.wb.internal.draw2d.FigureCanvas; import org.eclipse.wb.internal.draw2d.IRootFigure; @@ -21,6 +20,7 @@ import org.eclipse.draw2d.ExclusionSearch; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.TreeSearch; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditDomain; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java index 2fe7bd7552..ce0d3259bd 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.graphical; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.DesignEditPart; import org.eclipse.wb.internal.draw2d.RootFigure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.gef.DragTracker; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java index f873e3be81..e14b5c6548 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java @@ -14,7 +14,6 @@ package org.eclipse.wb.core.controls.palette; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.draw2d.PaletteFigure; import org.eclipse.wb.internal.core.editor.constants.CoreImages; import org.eclipse.wb.internal.core.utils.GenericsUtils; @@ -28,6 +27,7 @@ import org.eclipse.draw2d.FigureUtilities; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.MouseEvent; import org.eclipse.draw2d.MouseListener; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/AbstractPositionFeedback.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/AbstractPositionFeedback.java index 7c0168e324..dbf98c2ed9 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/AbstractPositionFeedback.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/AbstractPositionFeedback.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.figure; -import org.eclipse.wb.draw2d.Layer; - import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; @@ -39,6 +38,13 @@ public abstract class AbstractPositionFeedback { // Constructor // //////////////////////////////////////////////////////////////////////////// + public AbstractPositionFeedback(org.eclipse.wb.draw2d.Layer layer, Rectangle bounds, String hint) { + this((Layer) layer, bounds, hint); + } + + /** + * @since 1.26 + */ public AbstractPositionFeedback(Layer layer, Rectangle bounds, String hint) { m_layer = layer; m_hint = hint; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/GhostPositionFeedback.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/GhostPositionFeedback.java index 7bf043a31e..fb84b14010 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/GhostPositionFeedback.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/GhostPositionFeedback.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.figure; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.draw2d.SemiTransparentFigure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Color; @@ -39,6 +39,13 @@ public final class GhostPositionFeedback extends AbstractPositionFeedback { // Constructor // //////////////////////////////////////////////////////////////////////////// + public GhostPositionFeedback(org.eclipse.wb.draw2d.Layer layer, Rectangle bounds, String hint) { + this((Layer) layer, bounds, hint); + } + + /** + * @since 1.26 + */ public GhostPositionFeedback(Layer layer, Rectangle bounds, String hint) { super(layer, bounds, hint); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/SolidPositionFeedback.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/SolidPositionFeedback.java index 8468b831a9..114f6bd370 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/SolidPositionFeedback.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/SolidPositionFeedback.java @@ -12,11 +12,10 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.figure; -import org.eclipse.wb.draw2d.Layer; - import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Color; @@ -38,6 +37,14 @@ public final class SolidPositionFeedback extends AbstractPositionFeedback { // //////////////////////////////////////////////////////////////////////////// @Deprecated(forRemoval = true, since = "2026-06") + public SolidPositionFeedback(org.eclipse.wb.draw2d.Layer layer, Rectangle bounds, String hint) { + this((Layer) layer, bounds, hint); + } + + /** + * @since 1.26 + */ + @Deprecated(forRemoval = true, since = "2026-06") public SolidPositionFeedback(Layer layer, Rectangle bounds, String hint) { super(layer, bounds, hint); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/TextFeedback.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/TextFeedback.java index 4dded9308f..f6c0532d4a 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/TextFeedback.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/figure/TextFeedback.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 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,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.figure; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.draw2d.VerticalLabel; import org.eclipse.draw2d.Border; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.CompoundBorder; import org.eclipse.draw2d.Label; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.geometry.Dimension; @@ -42,6 +42,19 @@ public final class TextFeedback { // Constructor // //////////////////////////////////////////////////////////////////////////// + + /** + * @deprecated Use {@link #TextFeedback(Layer, boolean)} instead. This + * constructor will be removed after the 2028-12 release. + */ + @Deprecated(forRemoval = true, since = "2026-12") + public TextFeedback(org.eclipse.wb.draw2d.Layer layer, boolean isHorizontal) { + this((Layer) layer, isHorizontal); + } + + /** + * @since 1.26 + */ public TextFeedback(Layer layer, boolean isHorizontal) { m_layer = layer; // create label @@ -56,6 +69,18 @@ public TextFeedback(Layer layer, boolean isHorizontal) { } } + /** + * @deprecated Use {@link #TextFeedback(Layer)} instead. This constructor will + * be removed after the 2028-12 release. + */ + @Deprecated(forRemoval = true, since = "2026-12") + public TextFeedback(org.eclipse.wb.draw2d.Layer layer) { + this((Layer) layer); + } + + /** + * @since 1.26 + */ public TextFeedback(Layer layer) { this(layer, true); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java index 3fac1d2064..378d41ce8c 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.header; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; +import org.eclipse.draw2d.Layer; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -56,6 +56,7 @@ protected boolean isRequestCondition(Request request) { //////////////////////////////////////////////////////////////////////////// /** * @return the {@link Layer} from main {@link EditPartViewer} with given id. + * @since 1.26 */ protected final Layer getMainLayer(String layerId) { return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java index 960a2d3bfd..6f2aefca1c 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java @@ -13,12 +13,12 @@ package org.eclipse.wb.core.gef.header; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.Locator; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPartViewer; @@ -55,6 +55,7 @@ public AbstractHeaderSelectionEditPolicy(LayoutEditPolicy mainPolicy) { //////////////////////////////////////////////////////////////////////////// /** * @return the {@link Layer} from main {@link EditPartViewer} with given id. + * @since 1.26 */ protected final Layer getMainLayer(String layerId) { return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java index b34e4ab758..2e0774cc10 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java @@ -14,7 +14,6 @@ import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.internal.core.DesignerPlugin; @@ -26,6 +25,7 @@ import org.eclipse.draw2d.CompoundBorder; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java index a85503eccb..fcd9755cfc 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java @@ -16,11 +16,11 @@ import org.eclipse.wb.core.gef.figure.TextFeedback; import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.requests.PasteRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.DesignerPlugin; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignComposite.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignComposite.java index 3c9c094739..c0cfb838bd 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignComposite.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignComposite.java @@ -21,7 +21,6 @@ import org.eclipse.wb.core.controls.flyout.PluginFlyoutPreferences; import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.ICommandExceptionHandler; import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.editor.structure.DesignComponentsComposite; @@ -36,6 +35,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.Layer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; 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 54f3cd4f8b..66c2c5f315 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 @@ -25,7 +25,6 @@ import org.eclipse.wb.core.model.broadcast.ObjectEventListener; import org.eclipse.wb.core.model.broadcast.ObjectInfoDelete; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.PasteRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -41,6 +40,7 @@ import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.Polyline; import org.eclipse.draw2d.PositionConstants; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java index 76668fdafc..efc2b167e4 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuLayoutEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.core.gef.policy.menu; import org.eclipse.wb.core.gef.policy.layout.flow.AbstractFlowLayoutEditPolicy; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.PasteRequest; @@ -23,6 +22,7 @@ import org.eclipse.wb.internal.core.model.menu.IMenuPolicy; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; +import org.eclipse.draw2d.Layer; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuSelectionEditPolicy.java index 117e13cabd..ce827719de 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/menu/MenuSelectionEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.core.gef.policy.menu; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -21,6 +20,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Handle; 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 e9060e5173..1cac2bf0f0 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.PasteRequest; @@ -27,6 +26,7 @@ import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java index 2f0269d98c..dd00b0d2df 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.rcp.gef.GefMessages; import org.eclipse.wb.internal.rcp.gef.policy.forms.layout.grid.TableWrapLayoutEditPolicy; @@ -31,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java index eb2d3056b3..0a86ac4c86 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.rcp.gef.GefMessages; import org.eclipse.wb.internal.rcp.gef.policy.forms.layout.grid.TableWrapLayoutEditPolicy; @@ -31,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java index f271a3c97e..809fd7b8c5 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.GefMessages; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormLayoutInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java index 1ea5481f7a..6ee0e95fcc 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.GefMessages; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormRowInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; 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 f7df708c8e..3c835f7d39 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 @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swing.FormLayout.gef.header.selection; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -22,6 +21,7 @@ import org.eclipse.wb.internal.swing.FormLayout.model.FormLayoutInfo; import org.eclipse.wb.internal.swing.gef.policy.layout.header.selection.AbstractDimensionSelectionEditPolicy; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.Handle; import org.eclipse.gef.LayerConstants; diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java index a4758aad39..f4b5877698 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.MigLayout.gef.GefMessages; import org.eclipse.wb.internal.swing.MigLayout.gef.MigLayoutEditPolicy; @@ -28,6 +27,7 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java index 8fc0ed2b29..4ac3ff2601 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.MigLayout.gef.GefMessages; import org.eclipse.wb.internal.swing.MigLayout.gef.MigLayoutEditPolicy; @@ -28,6 +27,7 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; 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 fe96ab7c7c..dc6a912971 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -25,6 +24,7 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; import org.eclipse.wb.internal.swing.gef.policy.layout.header.selection.AbstractDimensionSelectionEditPolicy; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java index 61f7895068..247deae690 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.GefMessages; import org.eclipse.wb.internal.swing.gef.policy.layout.gbl.GridBagLayoutEditPolicy; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.ColumnInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java index a85b97d0bb..268386e4de 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.GefMessages; import org.eclipse.wb.internal.swing.gef.policy.layout.gbl.GridBagLayoutEditPolicy; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.RowInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; 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 9db39c36c3..c982556b56 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.figure.TextFeedback; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.layout.gbl.header.edit.DimensionHeaderEditPart; @@ -22,6 +21,7 @@ import org.eclipse.wb.internal.swing.model.layout.gbl.AbstractGridBagLayoutInfo; import org.eclipse.wb.internal.swing.model.layout.gbl.DimensionInfo; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.Handle; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/header/selection/AbstractDimensionSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/header/selection/AbstractDimensionSelectionEditPolicy.java index 351868d2f5..9988c18d8f 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/header/selection/AbstractDimensionSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/header/selection/AbstractDimensionSelectionEditPolicy.java @@ -14,13 +14,13 @@ import org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java index de54a2b446..3ca6e19918 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils; import org.eclipse.wb.core.gef.policy.layout.generic.AbstractPopupFigure; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.internal.core.gef.policy.snapping.PlacementUtils; @@ -24,6 +23,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; 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 5afd98e277..fc69dd1b76 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 @@ -16,7 +16,6 @@ import org.eclipse.wb.core.gef.header.AbstractHeaderLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.DesignerPlugin; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.draw2d.geometry.Transposer; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java index e443bc387b..064dfe878c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java @@ -24,7 +24,6 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.PasteRequest; @@ -48,6 +47,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.Polyline; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java index 348f5814f2..6260dacab3 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.gef.GefMessages; import org.eclipse.wb.internal.swt.gef.policy.layout.grid.GridLayoutEditPolicy; @@ -31,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java index a88dee2073..ea1315ef74 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java @@ -19,7 +19,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.gef.GefMessages; import org.eclipse.wb.internal.swt.gef.policy.layout.grid.GridLayoutEditPolicy; @@ -31,6 +30,7 @@ import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java index df7ce8ad20..00a69aed40 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/FigureEventTest.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.tests.draw2d; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.draw2d.FigureCanvas; import org.eclipse.wb.internal.draw2d.RootFigure; import org.eclipse.wb.tests.gef.EventSender; import org.eclipse.wb.tests.gef.TestLogger; import org.eclipse.draw2d.Figure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.MouseEvent; import org.eclipse.draw2d.MouseListener; import org.eclipse.draw2d.MouseMotionListener; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java index f9b4467733..ee372d06bb 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/LayerTest.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.tests.draw2d; -import org.eclipse.wb.draw2d.Layer; - import org.eclipse.draw2d.Figure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.geometry.Rectangle; import org.junit.jupiter.api.Test; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java index 68f518c77f..486d6a3a3b 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/draw2d/RootFigureTest.java @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.wb.tests.draw2d; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.internal.draw2d.RootFigure; import org.eclipse.wb.tests.gef.TestLogger; import org.eclipse.draw2d.DeferredUpdateManager; import org.eclipse.draw2d.Figure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.UpdateListener; import org.eclipse.draw2d.UpdateManager; import org.eclipse.draw2d.geometry.Dimension; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java index 741ee6e60e..51a377c6e6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java @@ -13,7 +13,6 @@ package org.eclipse.wb.tests.gef; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.core.tools.PasteTool; @@ -29,6 +28,7 @@ import org.eclipse.wb.tests.utils.AutoScroller; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Layer; import org.eclipse.draw2d.Polyline; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension;