Skip to content

Use SubMonintor in FileBufferOperationAction #2575

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

Closed
wants to merge 2 commits into from
Closed

Use SubMonintor in FileBufferOperationAction #2575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0d589
Use SubMonintor in FileBufferOperationAction
vogella Dec 3, 2024
30b1302
Version bump(s) for 4.35 stream
eclipse-platform-bot Dec 3, 2024
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true
Bundle-Version: 3.19.0.qualifier
Bundle-Version: 3.19.100.qualifier
Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
21 changes: 8 additions & 13 deletions ...les/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,20 +198,15 @@ protected IStatus run(IProgressMonitor monitor) {
}

protected final IPath[] generateLocations(IFile[] files, IProgressMonitor progressMonitor) {
progressMonitor.beginTask(TextEditorMessages.FileBufferOperationAction_collectionFiles_label, files.length);
try {
Set<IPath> locations= new HashSet<>();
for (IFile file : files) {
IPath fullPath = file.getFullPath();
if (isAcceptableLocation(fullPath))
locations.add(fullPath);
progressMonitor.worked(1);
}
return locations.toArray(new IPath[locations.size()]);

} finally {
progressMonitor.done();
SubMonitor subMonitor= SubMonitor.convert(progressMonitor, TextEditorMessages.FileBufferOperationAction_collectionFiles_label, files.length);
Set<IPath> locations= new HashSet<>();
for (IFile file : files) {
IPath fullPath= file.getFullPath();
if (isAcceptableLocation(fullPath))
locations.add(fullPath);
subMonitor.worked(1);
}
return locations.toArray(new IPath[locations.size()]);
}

/**
Expand Down
Loading