diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java
index 2fca3afbbed3..2ddd423ac3ec 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2015 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -46,6 +46,7 @@ public CompatibilityWorkbenchWindowAdvisor(WorkbenchAdvisor wbAdvisor,
 	}
 
 	@Override
+	@Deprecated
 	public void preWindowOpen() {
 		wbAdvisor.preWindowOpen(getWindowConfigurer());
 	}
@@ -56,35 +57,42 @@ public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer)
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowRestore() throws WorkbenchException {
 		wbAdvisor.postWindowRestore(getWindowConfigurer());
 	}
 
 	@Override
+	@Deprecated
 	public void openIntro() {
 		wbAdvisor.openIntro(getWindowConfigurer());
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowCreate() {
 		wbAdvisor.postWindowCreate(getWindowConfigurer());
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowOpen() {
 		wbAdvisor.postWindowOpen(getWindowConfigurer());
 	}
 
 	@Override
+	@Deprecated
 	public boolean preWindowShellClose() {
 		return wbAdvisor.preWindowShellClose(getWindowConfigurer());
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowClose() {
 		wbAdvisor.postWindowClose(getWindowConfigurer());
 	}
 
+	@Deprecated
 	public boolean isApplicationMenu(String menuId) {
 		return wbAdvisor.isApplicationMenu(getWindowConfigurer(), menuId);
 	}
@@ -94,6 +102,7 @@ public IAdaptable getDefaultPageInput() {
 	}
 
 	@Override
+	@Deprecated
 	public void createWindowContents(Shell shell) {
 		wbAdvisor.createWindowContents(getWindowConfigurer(), shell);
 	}
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/ActionBarConfigurerTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/ActionBarConfigurerTest.java
index f378d86a8620..0b6b8617bccf 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/ActionBarConfigurerTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/ActionBarConfigurerTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006,2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -53,6 +53,7 @@ public void testDefaults() {
 		WorkbenchAdvisor wa = new WorkbenchAdvisorObserver(1) {
 
 			@Override
+			@Deprecated
 			public void fillActionBars(IWorkbenchWindow window,
 					IActionBarConfigurer actionBarConfig, int flags) {
 				super.fillActionBars(window, actionBarConfig, flags);
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/IWorkbenchPageTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/IWorkbenchPageTest.java
index 9be34be3d488..ab8cab3ee8ce 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/IWorkbenchPageTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/IWorkbenchPageTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -66,6 +66,7 @@ public void test70080() {
 		WorkbenchAdvisor wa = new WorkbenchAdvisorObserver(1) {
 
 			@Override
+			@Deprecated
 			public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
 				super.preWindowOpen(configurer);
 				configurer.setShowPerspectiveBar(false);
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchAdvisorTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchAdvisorTest.java
index ba18a54fc3d9..26109f39ed8e 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchAdvisorTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchAdvisorTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -130,18 +130,21 @@ public void windowOpened(IWorkbenchWindow window) {
 			}
 
 			@Override
+			@Deprecated
 			public void preWindowOpen(IWorkbenchWindowConfigurer c) {
 				assertFalse(windowOpenCalled);
 				super.preWindowOpen(c);
 			}
 
 			@Override
+			@Deprecated
 			public void postWindowOpen(IWorkbenchWindowConfigurer c) {
 				assertTrue(windowOpenCalled);
 				super.postWindowOpen(c);
 			}
 
 			@Override
+			@Deprecated
 			public boolean preWindowShellClose(IWorkbenchWindowConfigurer c) {
 				assertFalse(windowCloseCalled);
 				return super.preWindowShellClose(c);
@@ -265,6 +268,7 @@ public void testFillAllActionBar() {
 		WorkbenchAdvisorObserver wa = new WorkbenchAdvisorObserver(1) {
 
 			@Override
+			@Deprecated
 			public void fillActionBars(IWorkbenchWindow window,
 					IActionBarConfigurer configurer, int flags) {
 				super.fillActionBars(window, configurer, flags);
@@ -284,6 +288,7 @@ public void fillActionBars(IWorkbenchWindow window,
 	public void testEmptyProgressRegion() {
 		WorkbenchAdvisorObserver wa = new WorkbenchAdvisorObserver(1) {
 			@Override
+			@Deprecated
 			public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
 				super.preWindowOpen(configurer);
 				configurer.setShowProgressIndicator(false);
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchConfigurerTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchConfigurerTest.java
index 5f432bca07c5..98780cdb3adb 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchConfigurerTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchConfigurerTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -143,6 +143,7 @@ public void testThreading() {
 		WorkbenchAdvisor advisor = new RCPTestWorkbenchAdvisor(1) {
 
 			@Override
+			@Deprecated
 			public void createWindowContents(
 					IWorkbenchWindowConfigurer configurer, Shell shell) {
 				ensureThread();
@@ -179,6 +180,7 @@ public void eventLoopIdle(Display display) {
 			}
 
 			@Override
+			@Deprecated
 			public void fillActionBars(IWorkbenchWindow window,
 					IActionBarConfigurer configurer, int flags) {
 				ensureThread();
@@ -210,6 +212,7 @@ public void initialize(IWorkbenchConfigurer configurer) {
 			}
 
 			@Override
+			@Deprecated
 			public boolean isApplicationMenu(
 					IWorkbenchWindowConfigurer configurer, String menuId) {
 				ensureThread();
@@ -217,6 +220,7 @@ public boolean isApplicationMenu(
 			}
 
 			@Override
+			@Deprecated
 			public void openIntro(IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
 				super.openIntro(configurer);
@@ -241,24 +245,28 @@ public void postStartup() {
 			}
 
 			@Override
+			@Deprecated
 			public void postWindowClose(IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
 				super.postWindowClose(configurer);
 			}
 
 			@Override
+			@Deprecated
 			public void postWindowCreate(IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
 				super.postWindowCreate(configurer);
 			}
 
 			@Override
+			@Deprecated
 			public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
 				super.postWindowOpen(configurer);
 			}
 
 			@Override
+			@Deprecated
 			public void postWindowRestore(IWorkbenchWindowConfigurer configurer)
 					throws WorkbenchException {
 				ensureThread();
@@ -278,12 +286,14 @@ public void preStartup() {
 			}
 
 			@Override
+			@Deprecated
 			public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
 				super.preWindowOpen(configurer);
 			}
 
 			@Override
+			@Deprecated
 			public boolean preWindowShellClose(
 					IWorkbenchWindowConfigurer configurer) {
 				ensureThread();
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchSaveRestoreStateTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchSaveRestoreStateTest.java
index 2675ed3101d4..745a85867bcd 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchSaveRestoreStateTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchSaveRestoreStateTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006, 2016 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -380,11 +380,6 @@ public boolean openWindows() {
 				return true;
 			}
 
-			@Override
-			public void postWindowRestore(IWorkbenchWindowConfigurer configurer) throws WorkbenchException {
-				// TODO Auto-generated method stub
-				super.postWindowRestore(configurer);
-			}
 		};
 
 		int code2 = PlatformUI.createAndRunWorkbench(display, wa2);
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchWindowConfigurerTest.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchWindowConfigurerTest.java
index 2a2aefe58ccb..bdff19e54a6a 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchWindowConfigurerTest.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/WorkbenchWindowConfigurerTest.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -73,6 +73,7 @@ public void testDefaults() {
 		WorkbenchAdvisor wa = new WorkbenchAdvisorObserver(1) {
 
 			@Override
+			@Deprecated
 			public void fillActionBars(IWorkbenchWindow window,
 					IActionBarConfigurer actionBarConfig, int flags) {
 				super.fillActionBars(window, actionBarConfig, flags);
diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/util/WorkbenchAdvisorObserver.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/util/WorkbenchAdvisorObserver.java
index d9433511c61d..b04d3e2a02de 100644
--- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/util/WorkbenchAdvisorObserver.java	
+++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/util/WorkbenchAdvisorObserver.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -110,12 +110,14 @@ public void preStartup() {
 	}
 
 	@Override
+	@Deprecated
 	public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
 		super.preWindowOpen(configurer);
 		addOperation(PRE_WINDOW_OPEN);
 	}
 
 	@Override
+	@Deprecated
 	public void fillActionBars(IWorkbenchWindow window,
 			IActionBarConfigurer configurer, int flags) {
 		super.fillActionBars(window, configurer, flags);
@@ -123,6 +125,7 @@ public void fillActionBars(IWorkbenchWindow window,
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowRestore(IWorkbenchWindowConfigurer configurer)
 			throws WorkbenchException {
 		super.postWindowRestore(configurer);
@@ -130,6 +133,7 @@ public void postWindowRestore(IWorkbenchWindowConfigurer configurer)
 	}
 
 	@Override
+	@Deprecated
 	public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
 		super.postWindowOpen(configurer);
 		addOperation(POST_WINDOW_OPEN);
@@ -142,6 +146,7 @@ public void postStartup() {
 	}
 
 	@Override
+	@Deprecated
 	public boolean preWindowShellClose(IWorkbenchWindowConfigurer configurer) {
 		if (!super.preWindowShellClose(configurer)) {
 			return false;