Skip to content

Undeprecate updateToolbar() in FilteredTree and call again on refresh #2767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Undeprecate updateToolbar() in FilteredTree and call again on refresh #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions ...es/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,15 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
int treeHeight = getViewer().getTree().getBounds().height;
int numVisibleItems = treeHeight / getViewer().getTree().getItemHeight();
long stopTime = SOFT_MAX_EXPAND_TIME + System.currentTimeMillis();

updateToolbar(true);

if (items.length > 0
&& recursiveExpand(items, monitor, stopTime, new int[] { numVisibleItems })) {
return Status.CANCEL_STATUS;
}
} else {
updateToolbar(false);
}
} finally {
// done updating the tree - set redraw back to true
Expand Down Expand Up @@ -310,10 +315,6 @@ private boolean recursiveExpand(TreeItem[] items, IProgressMonitor monitor, long
};
}

/**
* @deprecated As of 4.13 not used anymore
*/
@Deprecated(since = "2025-03", forRemoval = true)
protected void updateToolbar(boolean visible) {
// nothing to do
}
Expand Down
7 changes: 5 additions & 2 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/dialogs/FilteredTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,15 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
int treeHeight = getViewer().getTree().getBounds().height;
int numVisibleItems = treeHeight / getViewer().getTree().getItemHeight();
long stopTime = SOFT_MAX_EXPAND_TIME + System.currentTimeMillis();

updateToolbar(true);

if (items.length > 0
&& recursiveExpand(items, monitor, stopTime, new int[] { numVisibleItems })) {
return Status.CANCEL_STATUS;
}
} else {
updateToolbar(false);
}
} finally {
// done updating the tree - set redraw back to true
Expand Down Expand Up @@ -488,9 +493,7 @@ private boolean recursiveExpand(TreeItem[] items, IProgressMonitor monitor, long
* override.
*
* @param visible boolean
* @deprecated As of 4.13 not used anymore
*/
@Deprecated(since = "2025-03", forRemoval = true)
protected void updateToolbar(boolean visible) {
// nothing to do
}
Expand Down
Loading