From 3bb700f9af73f81ff52876a610bed07f83a5fdf6 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Tue, 26 Nov 2024 16:07:48 +0000 Subject: [PATCH 1/2] Version bump(s) for 4.35 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 ae662334bb6..5c1c77c5daa 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.0.qualifier +Bundle-Version: 3.22.100.qualifier Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin From f85769e95330a0563778c44632f0d82d741b1ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Fri, 15 Nov 2024 12:52:44 +0100 Subject: [PATCH 2/2] More information for "Invalid project description" Error #1619 https://github.com/eclipse-platform/eclipse.platform/issues/1619 --- .../src/org/eclipse/core/internal/resources/Project.java | 2 +- .../src/org/eclipse/core/internal/utils/messages.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java index 872223f6201..99600609b46 100644 --- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java +++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java @@ -192,7 +192,7 @@ public void checkAccessible(int flags) throws CoreException { */ protected void checkDescription(IProject project, IProjectDescription desc, boolean moving) throws CoreException { URI location = desc.getLocationURI(); - String message = Messages.resources_invalidProjDesc; + String message = NLS.bind(Messages.resources_invalidProjDesc, project.getName(), String.valueOf(location)); MultiStatus status = new MultiStatus(ResourcesPlugin.PI_RESOURCES, IResourceStatus.INVALID_VALUE, message, null); status.merge(workspace.validateName(desc.getName(), IResource.PROJECT)); if (moving) { diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties index 0e7bb02cebf..c4bbe1f5d69 100644 --- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties +++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties @@ -215,7 +215,7 @@ resources_invalidCharInName = {0} is an invalid character in resource name ''{1} resources_invalidCharInPath = {0} is an invalid character in path ''{1}''. resources_invalidName = ''{0}'' is an invalid name on this platform. resources_invalidPath = ''{0}'' is an invalid resource path. -resources_invalidProjDesc = Invalid project description. +resources_invalidProjDesc = Invalid project description for project ''{0}'' at ''{1}'' resources_invalidResourceName = ''{0}'' is an invalid resource name. resources_invalidRoot = Root (/) is an invalid resource path. resources_markerNotFound = Marker id {0} not found.