From aba37ba2f865635e5aeb0efb54b0fbbbf39d9841 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Wed, 5 Mar 2025 19:42:14 +0100 Subject: [PATCH 1/2] Don't use SubMonitor when saving project in SaveManager The migration from the IProgressMonitor to the SubMonitor done as part of 40114d2ce9a41cbec7f01d8342d4371a6d970af0 also converts the progress monitor used within the InternalMonitorWrapper. If the parent monitor is a SubMonitor, this calls beginTask() both when the InternalMonitorWrapper is created, as well as explicitly later on. To avoid this, switch back to create a null-safe progress monitor via Policy.monitorFor(...). Closes https://github.com/eclipse-platform/eclipse.platform/issues/1758 --- .../src/org/eclipse/core/internal/resources/SaveManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java index 5e22409aee1..25493cf919c 100644 --- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java +++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java @@ -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 @@ -1188,7 +1188,7 @@ class InternalMonitorWrapper extends ProgressMonitorWrapper { private boolean ignoreCancel; public InternalMonitorWrapper(IProgressMonitor monitor) { - super(SubMonitor.convert(monitor)); + super(Policy.monitorFor(monitor)); } public void ignoreCancelState(boolean ignore) { From a0bb0d52d3b5e7b1ce3c560fba291aca6c7cfd43 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 5 Mar 2025 19:03:41 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- .../bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF index 5c1c77c5daa..aa042e2f420 100644 --- a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF +++ b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF @@ -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