Skip to content

Don't use SubMonitor when saving project in SaveManager #1759

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
ptziegler merged 2 commits into from
Mar 6, 2025
Merged

Don't use SubMonitor when saving project in SaveManager #1759

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
aba37ba
Don't use SubMonitor when saving project in SaveManager
ptziegler Mar 5, 2025
a0bb0d5
Version bump(s) for 4.36 stream
eclipse-platform-bot Mar 5, 2025
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 resources/bundles/org.eclipse.core.resources/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.core.resources; singleton:=true
Bundle-Version: 3.22.100.qualifier
Bundle-Version: 3.22.200.qualifier
Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions ...ndles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2023 IBM Corporation and others.
* Copyright (c) 2000, 2025 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 @@ -1188,7 +1188,7 @@ class InternalMonitorWrapper extends ProgressMonitorWrapper {
private boolean ignoreCancel;

public InternalMonitorWrapper(IProgressMonitor monitor) {
super(SubMonitor.convert(monitor));
super(Policy.monitorFor(monitor));
Copy link
Contributor Author

@ptziegler ptziegler Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that Policy.monitorFor

eclipse.platform/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Policy.java

Lines 177 to 179 in 8186345

public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
return monitor == null ? new NullProgressMonitor() : monitor;
}

and IProgressMonitor.nullSafe(...)

static IProgressMonitor nullSafe(IProgressMonitor monitor) {
    if (monitor == null) {
        return new NullProgressMonitor();
    }
    return monitor;
}

are functionally identical. It probably makes sense to get rid of the former altogether...

}

public void ignoreCancelState(boolean ignore) {
Expand Down
Loading