Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -46,6 +46,7 @@ public CompatibilityWorkbenchWindowAdvisor(WorkbenchAdvisor wbAdvisor,
}

@Override
@Deprecated
public void preWindowOpen() {
wbAdvisor.preWindowOpen(getWindowConfigurer());
}
Expand All @@ -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);
}
Expand All @@ -94,6 +102,7 @@ public IAdaptable getDefaultPageInput() {
}

@Override
@Deprecated
public void createWindowContents(Shell shell) {
wbAdvisor.createWindowContents(getWindowConfigurer(), shell);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -143,6 +143,7 @@ public void testThreading() {
WorkbenchAdvisor advisor = new RCPTestWorkbenchAdvisor(1) {

@Override
@Deprecated
public void createWindowContents(
IWorkbenchWindowConfigurer configurer, Shell shell) {
ensureThread();
Expand Down Expand Up @@ -179,6 +180,7 @@ public void eventLoopIdle(Display display) {
}

@Override
@Deprecated
public void fillActionBars(IWorkbenchWindow window,
IActionBarConfigurer configurer, int flags) {
ensureThread();
Expand Down Expand Up @@ -210,13 +212,15 @@ public void initialize(IWorkbenchConfigurer configurer) {
}

@Override
@Deprecated
public boolean isApplicationMenu(
IWorkbenchWindowConfigurer configurer, String menuId) {
ensureThread();
return super.isApplicationMenu(configurer, menuId);
}

@Override
@Deprecated
public void openIntro(IWorkbenchWindowConfigurer configurer) {
ensureThread();
super.openIntro(configurer);
Expand All @@ -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();
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -110,26 +110,30 @@ 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);
addOperation(FILL_ACTION_BARS);
}

@Override
@Deprecated
public void postWindowRestore(IWorkbenchWindowConfigurer configurer)
throws WorkbenchException {
super.postWindowRestore(configurer);
addOperation(POST_WINDOW_RESTORE);
}

@Override
@Deprecated
public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
super.postWindowOpen(configurer);
addOperation(POST_WINDOW_OPEN);
Expand All @@ -142,6 +146,7 @@ public void postStartup() {
}

@Override
@Deprecated
public boolean preWindowShellClose(IWorkbenchWindowConfigurer configurer) {
if (!super.preWindowShellClose(configurer)) {
return false;
Expand Down
Loading