diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/CoreEditPartConfigurator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/CoreEditPartConfigurator.java
index ca129bdcf..899f01dcb 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/CoreEditPartConfigurator.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/CoreEditPartConfigurator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 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
@@ -33,7 +33,7 @@
  */
 public final class CoreEditPartConfigurator implements IEditPartConfigurator {
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		Object model = editPart.getModel();
 		// double click
 		if (GlobalState.isComponent(model)) {
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java
index 903c78f31..72372d9d4 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.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
@@ -39,7 +39,7 @@ public final class GenericContainersConfigurator implements IEditPartConfigurato
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		if (editPart.getModel() instanceof JavaInfo) {
 			JavaInfo component = (JavaInfo) editPart.getModel();
 			configureComponent(editPart, component);
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java
index 58071a879..ded8d0a3f 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.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
@@ -45,7 +45,7 @@ public final class GenericContainersConfigurator implements IEditPartConfigurato
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		if (editPart.getModel() instanceof JavaInfo) {
 			JavaInfo component = (JavaInfo) editPart.getModel();
 			configureComponent(editPart, component);
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java
index bb7758c59..8c9ca2252 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.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
@@ -31,5 +31,5 @@ public interface IEditPartConfigurator {
 	/**
 	 * Configures given {@link EditPart}.
 	 */
-	void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart);
+	void configure(EditPart context, EditPart editPart);
 }
diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/RcpPolicyConfigurator.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/RcpPolicyConfigurator.java
index 7d41c4c90..284929405 100644
--- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/RcpPolicyConfigurator.java
+++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/RcpPolicyConfigurator.java
@@ -22,6 +22,7 @@
 import org.eclipse.wb.internal.swt.model.widgets.ControlInfo;
 
 import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
 
 /**
  * Configures RCP related {@link EditPart}'s.
@@ -31,7 +32,7 @@
  */
 public final class RcpPolicyConfigurator implements IEditPartConfigurator {
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		((DesignEditPart) editPart).addRequestProcessor(FieldEditorDropRequestProcessor.INSTANCE);
 		// allow drop Action on MenuManager
 		if (editPart instanceof IMenuObjectEditPart menuEditPart) {
@@ -40,9 +41,9 @@ public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPar
 			}
 		}
 		// allow drop ControlDecoration on ControlInfo
-		if (editPart.getModel() instanceof ControlInfo) {
-			ControlInfo control = (ControlInfo) editPart.getModel();
-			editPart.installEditPolicy(new ControlDecorationDropLayoutEditPolicy(control));
+		if (editPart.getModel() instanceof ControlInfo control) {
+			EditPolicy editPolicy = new ControlDecorationDropLayoutEditPolicy(control);
+			editPart.installEditPolicy(editPolicy.getClass(), editPolicy);
 		}
 	}
 }
diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/policy/RcpPolicyConfigurator.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/policy/RcpPolicyConfigurator.java
index 2eea9830a..643eb1f66 100644
--- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/policy/RcpPolicyConfigurator.java
+++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/policy/RcpPolicyConfigurator.java
@@ -20,6 +20,7 @@
 import org.eclipse.wb.internal.swt.model.widgets.ControlInfo;
 
 import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
 
 /**
  * Configures RCP related {@link EditPart}'s.
@@ -29,15 +30,15 @@
  */
 public final class RcpPolicyConfigurator implements IEditPartConfigurator {
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		// allow drop Action on MenuManager
 		if (editPart.getModel() instanceof MenuManagerInfo) {
 			((DesignTreeEditPart) editPart).addRequestProcessor(ActionDropRequestProcessor.INSTANCE);
 		}
 		// allow drop ControlDecoration on ControlInfo
-		if (editPart.getModel() instanceof ControlInfo) {
-			ControlInfo control = (ControlInfo) editPart.getModel();
-			editPart.installEditPolicy(new ControlDecorationDropLayoutEditPolicy(control));
+		if (editPart.getModel() instanceof ControlInfo control) {
+			EditPolicy editPolicy = new ControlDecorationDropLayoutEditPolicy(control);
+			editPart.installEditPolicy(editPolicy.getClass(), editPolicy);
 		}
 	}
 }
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java
index ca7de882d..5f23babed 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.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
@@ -29,12 +29,13 @@
  */
 public final class ActionDropPolicyConfigurator implements IEditPartConfigurator {
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		// drop ActionInfo on javax.swing.AbstractButton
 		if (editPart.getModel() instanceof ComponentInfo) {
 			ComponentInfo component = (ComponentInfo) editPart.getModel();
 			if (AbstractButton.class.isAssignableFrom(component.getDescription().getComponentClass())) {
-				editPart.installEditPolicy(new ActionDropButtonLayoutEditPolicy(component));
+				EditPolicy editPolicy = new ActionDropButtonLayoutEditPolicy(component);
+				editPart.installEditPolicy(editPolicy.getClass(), editPolicy);
 			}
 		}
 	}
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java
index 2fa67d5b0..01bc0c83c 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.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
@@ -32,7 +32,7 @@
  */
 public final class MenuDropPolicyConfigurator implements IEditPartConfigurator {
 	@Override
-	public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) {
+	public void configure(EditPart context, EditPart editPart) {
 		// drop JMenuBar on JFrame, JDialog and JApply
 		if (editPart.getModel() instanceof ContainerInfo) {
 			ContainerInfo container = (ContainerInfo) editPart.getModel();
@@ -41,13 +41,15 @@ public void configure(EditPart context, org.eclipse.wb.gef.core.EditPart editPar
 					|| JInternalFrame.class.isAssignableFrom(componentClass)
 					|| JDialog.class.isAssignableFrom(componentClass)
 					|| Activator.isAssignableFromJApplet(componentClass)) {
-				editPart.installEditPolicy(new MenuBarDropLayoutEditPolicy(container));
+				EditPolicy editPolicy = new MenuBarDropLayoutEditPolicy(container);
+				editPart.installEditPolicy(editPolicy.getClass(), editPolicy);
 			}
 		}
 		// drop JPopupMenu on any java.awt.Component
 		if (editPart.getModel() instanceof ComponentInfo) {
 			ComponentInfo component = (ComponentInfo) editPart.getModel();
-			editPart.installEditPolicy(new MenuPopupDropLayoutEditPolicy(component));
+			EditPolicy editPolicy = new MenuPopupDropLayoutEditPolicy(component);
+			editPart.installEditPolicy(editPolicy.getClass(), editPolicy);
 		}
 	}
 }