Skip to content

Commit fe1c0be

Browse files
committed
Undeprecate updateToolbar() in FilteredTree and call again on refresh
This partially reverts 3726516 due to which the updateToolbar() method is no longer called by the default refresh job. Subclasses may override updateToolbar() without also overriding doCreateRefreshJob() which in return means that their toolbar is not updated anymore. Because this method is called again, the deprecation tag introduced with 176f503 is also removed
1 parent 84d49c2 commit fe1c0be

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,15 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
259259
int treeHeight = getViewer().getTree().getBounds().height;
260260
int numVisibleItems = treeHeight / getViewer().getTree().getItemHeight();
261261
long stopTime = SOFT_MAX_EXPAND_TIME + System.currentTimeMillis();
262+
263+
updateToolbar(true);
264+
262265
if (items.length > 0
263266
&& recursiveExpand(items, monitor, stopTime, new int[] { numVisibleItems })) {
264267
return Status.CANCEL_STATUS;
265268
}
269+
} else {
270+
updateToolbar(false);
266271
}
267272
} finally {
268273
// done updating the tree - set redraw back to true
@@ -310,10 +315,6 @@ private boolean recursiveExpand(TreeItem[] items, IProgressMonitor monitor, long
310315
};
311316
}
312317

313-
/**
314-
* @deprecated As of 4.13 not used anymore
315-
*/
316-
@Deprecated(since = "2025-03", forRemoval = true)
317318
protected void updateToolbar(boolean visible) {
318319
// nothing to do
319320
}

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/dialogs/FilteredTree.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,15 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
430430
int treeHeight = getViewer().getTree().getBounds().height;
431431
int numVisibleItems = treeHeight / getViewer().getTree().getItemHeight();
432432
long stopTime = SOFT_MAX_EXPAND_TIME + System.currentTimeMillis();
433+
434+
updateToolbar(true);
435+
433436
if (items.length > 0
434437
&& recursiveExpand(items, monitor, stopTime, new int[] { numVisibleItems })) {
435438
return Status.CANCEL_STATUS;
436439
}
440+
} else {
441+
updateToolbar(false);
437442
}
438443
} finally {
439444
// done updating the tree - set redraw back to true
@@ -488,9 +493,7 @@ private boolean recursiveExpand(TreeItem[] items, IProgressMonitor monitor, long
488493
* override.
489494
*
490495
* @param visible boolean
491-
* @deprecated As of 4.13 not used anymore
492496
*/
493-
@Deprecated(since = "2025-03", forRemoval = true)
494497
protected void updateToolbar(boolean visible) {
495498
// nothing to do
496499
}

0 commit comments

Comments
 (0)