eclipse-windowbuilder · ptziegler · Sep 29, 2026
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
@@ -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
@@ -1,5 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.wb.core" version="2">
+    <resource path="src/org/eclipse/wb/core/gef/figure/AbstractPositionFeedback.java" type="org.eclipse.wb.core.gef.figure.AbstractPositionFeedback">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Layer"/>
+                <message_argument value="AbstractPositionFeedback"/>
+                <message_argument value="AbstractPositionFeedback(Layer, Rectangle, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/wb/core/gef/figure/GhostPositionFeedback.java" type="org.eclipse.wb.core.gef.figure.GhostPositionFeedback">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Layer"/>
+                <message_argument value="GhostPositionFeedback"/>
+                <message_argument value="GhostPositionFeedback(Layer, Rectangle, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/wb/core/gef/figure/SolidPositionFeedback.java" type="org.eclipse.wb.core.gef.figure.SolidPositionFeedback">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Layer"/>
+                <message_argument value="SolidPositionFeedback"/>
+                <message_argument value="SolidPositionFeedback(Layer, Rectangle, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/wb/core/gef/figure/TextFeedback.java" type="org.eclipse.wb.core.gef.figure.TextFeedback">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Layer"/>
+                <message_argument value="TextFeedback"/>
+                <message_argument value="TextFeedback(Layer)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Layer"/>
+                <message_argument value="TextFeedback"/>
+                <message_argument value="TextFeedback(Layer, boolean)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java" type="org.eclipse.wb.core.gef.header.AbstractHeaderLayoutEditPolicy">
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.wb.core.gef.header.AbstractHeaderLayoutEditPolicy"/>
+                <message_argument value="getMainLayer(String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java" type="org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy">
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.wb.core.gef.header.AbstractHeaderSelectionEditPolicy"/>
+                <message_argument value="getMainLayer(String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/wb/core/gef/policy/helpers/BroadcastListenerHelper.java" type="org.eclipse.wb.core.gef.policy.helpers.BroadcastListenerHelper">
         <filter comment="Method marked for removal" id="643846161">
             <message_arguments>

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java b/...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
@@ -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/.../src/org/eclipse/wb/core/gef/policy/layout/position/AbstractPositionLayoutEditPolicy.java b/.../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;