diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteComplexSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteComplexSelectionEditPolicy.java
index 292d6a242..75d6cfe74 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteComplexSelectionEditPolicy.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteComplexSelectionEditPolicy.java
@@ -407,6 +407,7 @@ protected void fillMenu(IMenuManager manager) {
 	// Abstract
 	//
 	////////////////////////////////////////////////////////////////////////////
+	@Deprecated
 	protected abstract ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget,
 			int side) throws Exception;
 }
\ No newline at end of file
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/snapping/PlacementsSupport.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/snapping/PlacementsSupport.java
index 0a76387d2..1ff1456bb 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/snapping/PlacementsSupport.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/snapping/PlacementsSupport.java
@@ -1063,6 +1063,7 @@ private boolean isResizeable(IAbstractComponentInfo widget, boolean isHorizontal
 	 * @return the list of widgets which attached to given <code>widget</code> by
 	 *         any side.
 	 */
+	@Deprecated
 	private List<ComponentAttachmentInfo> findAffectedWidgets() throws Exception {
 		List<ComponentAttachmentInfo> attached = new ArrayList<>();
 		// traverse through non-operating widgets.
@@ -1080,6 +1081,7 @@ private List<ComponentAttachmentInfo> findAffectedWidgets() throws Exception {
 		return attached;
 	}
 
+	@Deprecated
 	private boolean checkAttached(IAbstractComponentInfo widget, IAbstractComponentInfo targetWidget,
 			List<ComponentAttachmentInfo> attachedList, int side) throws Exception {
 		if (isAttachedToWidget(widget, targetWidget, side)) {
@@ -1114,6 +1116,7 @@ private void resolveCyclicReferences(boolean isHorizontal) throws Exception {
 		}
 	}
 
+	@Deprecated
 	private void resolveReference(ComponentAttachmentInfo attachment) throws Exception {
 		int side = attachment.getAlignment();
 		IAbstractComponentInfo widget = attachment.getSource();
@@ -1128,6 +1131,7 @@ private void resolveReference(ComponentAttachmentInfo attachment) throws Excepti
 		m_layoutCommands.attachAbsolute(widget, side, distance);
 	}
 
+	@Deprecated
 	private ComponentAttachmentInfo findReferenceToResolve(List<ComponentAttachmentInfo> cyclicList,
 			Pair<ComponentAttachmentInfo, ComponentAttachmentInfo> pair) {
 		if (!m_operatingWidgets.contains(pair.getLeft().getSource())) {
@@ -1136,6 +1140,7 @@ private ComponentAttachmentInfo findReferenceToResolve(List<ComponentAttachmentI
 		return pair.getRight();
 	}
 
+	@Deprecated
 	private Pair<ComponentAttachmentInfo, ComponentAttachmentInfo> getCyclicPair(
 			List<ComponentAttachmentInfo> cyclicList) {
 		ComponentAttachmentInfo first = cyclicList.get(0);
@@ -1152,6 +1157,7 @@ private Pair<ComponentAttachmentInfo, ComponentAttachmentInfo> getCyclicPair(
 		return new Pair<>(first, second);
 	}
 
+	@Deprecated
 	private List<ComponentAttachmentInfo> detectCyclicReferences(boolean isHorizontal) throws Exception {
 		List<ComponentAttachmentInfo> cyclicList = new ArrayList<>();
 		List<IAbstractComponentInfo> widgets = getNonDeletedWidgets();
@@ -1168,6 +1174,7 @@ private List<ComponentAttachmentInfo> detectCyclicReferences(boolean isHorizonta
 		return cyclicList;
 	}
 
+	@Deprecated
 	private void traverseAttachedWidgets(List<ComponentAttachmentInfo> cyclicList,
 			Set<IAbstractComponentInfo> visitedWidgets, IAbstractComponentInfo widget,
 			IAbstractComponentInfo targetWidget, boolean isHorizontal) throws Exception {
diff --git a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupSelectionEditPolicy.java b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupSelectionEditPolicy.java
index 52ad17de2..2ba7c2d72 100644
--- a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupSelectionEditPolicy.java
+++ b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupSelectionEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * 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
@@ -46,9 +46,10 @@ public GroupSelectionEditPolicy(GroupLayoutInfo layout) {
 	////////////////////////////////////////////////////////////////////////////
 
 	@Override
+	@Deprecated
 	protected ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget,
 			int side) throws Exception {
-		return m_layout.getComponentAttachmentInfo(widget, side);
+		return null;
 	}
 
 	@Override
diff --git a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo.java b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo.java
index 36357ee2e..5dce99ebc 100644
--- a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo.java
+++ b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * 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
@@ -15,7 +15,6 @@
 import org.eclipse.wb.core.model.IAbstractComponentInfo;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.broadcast.JavaEventListener;
-import org.eclipse.wb.internal.core.gef.policy.snapping.ComponentAttachmentInfo;
 import org.eclipse.wb.internal.core.gef.policy.snapping.IAbsoluteLayoutCommands;
 import org.eclipse.wb.internal.core.model.creation.CreationSupport;
 import org.eclipse.wb.internal.core.model.description.ComponentDescription;
@@ -135,11 +134,6 @@ public void setExplicitSize(IAbstractComponentInfo widget,
 			int resizeDelta) throws Exception {
 	}
 
-	public ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget,
-			int side) {
-		return null;
-	}
-
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Commands
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringSelectionEditPolicy.java
index 5ce4d46f0..ad48ad1e5 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringSelectionEditPolicy.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringSelectionEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * 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
@@ -47,6 +47,7 @@ public SpringSelectionEditPolicy(SpringLayoutInfo layout) {
 	////////////////////////////////////////////////////////////////////////////
 
 	@Override
+	@Deprecated
 	protected ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget,
 			int side) throws Exception {
 		return m_layout.getComponentAttachmentInfo(widget, side);
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/spring/SpringLayoutInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/spring/SpringLayoutInfo.java
index 9dc4e54c4..3d019dee6 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/spring/SpringLayoutInfo.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/layout/spring/SpringLayoutInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * 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
@@ -255,6 +255,7 @@ public final SpringAttachmentInfo getAttachmentBottom(ComponentInfo component) {
 	// Access
 	//
 	////////////////////////////////////////////////////////////////////////////
+	@Deprecated
 	public ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget, int side)
 			throws Exception {
 		SpringAttachmentInfo attachment = getAttachment(widget, side);
diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicy.java
index 9917e3f95..a3505a43b 100644
--- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicy.java
+++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * 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
@@ -48,6 +48,7 @@ public FormSelectionEditPolicy(IFormLayoutInfo<C> layout) {
 	////////////////////////////////////////////////////////////////////////////
 
 	@Override
+	@Deprecated
 	protected ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget,
 			int side) throws Exception {
 		return m_layout.getComponentAttachmentInfo(widget, side);
diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfoImplAutomatic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfoImplAutomatic.java
index 3446cbf61..8344a1178 100644
--- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfoImplAutomatic.java
+++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/FormLayoutInfoImplAutomatic.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -709,6 +709,7 @@ private static <C extends IControlInfo> void setNewSize(IFormAttachmentInfo<C> a
 	// Access
 	//
 	////////////////////////////////////////////////////////////////////////////
+	@Deprecated
 	public ComponentAttachmentInfo getComponentAttachmentInfo(IAbstractComponentInfo widget, int side)
 			throws Exception {
 		if (m_layout.isManagedObject(widget) && isAttached(widget, side)) {
diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java
index 121fb168a..47db9658f 100644
--- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java
+++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/spring/SpringLayoutTest.java
@@ -261,6 +261,7 @@ public void test_getAttachedToWidget() throws Exception {
 	 * Tests for {@link SpringLayoutInfo#getComponentAttachmentInfo(AbstractComponentInfo, int)}.
 	 */
 	@Test
+	@Deprecated
 	public void test_getComponentAttachmentInfo_parent() throws Exception {
 		ContainerInfo panel =
 				parseContainer(
@@ -297,6 +298,7 @@ public void test_getComponentAttachmentInfo_parent() throws Exception {
 	 * Tests for {@link SpringLayoutInfo#getComponentAttachmentInfo(AbstractComponentInfo, int)}.
 	 */
 	@Test
+	@Deprecated
 	public void test_getComponentAttachmentInfo() throws Exception {
 		ContainerInfo panel =
 				parseContainer(