Use quotes on project name #1600

Also fix 2 additional properties ending in blanks. One can be removed, the other should be trimmed and the blank be added in code.
eclipse-m2e · Nov 11, 2023 · 3bb89ee · 3bb89ee
1 parent 7b152e5
commit 3bb89ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/Messages.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/Messages.java
@@ -200,10 +200,6 @@ public class Messages extends NLS {
 
   public static String ProjectConfigurationManager_error_rename;
 
-  public static String ProjectConfigurationManager_error_resolve;
-
-  public static String ProjectConfigurationManager_error_resolve2;
-
   public static String ProjectConfigurationManager_error_targetDir;
 
   public static String ProjectConfigurationManager_error_unable_archetype;

diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/messages.properties b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/messages.properties
@@ -1,6 +1,6 @@
 AbstractLifecycleMapping_could_not_update_project_configuration=Could not update project {0} configuration
 AbstractMavenRuntime_unknownProject=Not a Maven project {0}
-AbstractProjectConfigurator_error_missing_nature=Project does not have required nature 
+AbstractProjectConfigurator_error_missing_nature=Project does not have required nature
 AbstractTransferListenerAdapter_4=0% {0}
 AbstractTransferListenerAdapter_byte=B
 AbstractTransferListenerAdapter_cancelled=Transfer is canceled
@@ -91,8 +91,6 @@ PomFileContentDescriber_error=Internal Error: XML parser configuration error dur
 ProjectConfigurationManager_0=Can't get canonical file for {0}
 ProjectConfigurationManager_error_failed=Failed to create project.
 ProjectConfigurationManager_error_rename=Can't rename {0}
-ProjectConfigurationManager_error_resolve=Could not resolve archetype 
-ProjectConfigurationManager_error_resolve2=\ from any of the configured repositories.
 ProjectConfigurationManager_error_targetDir=\ Target directory {0} already exists.
 ProjectConfigurationManager_error_unable_archetype=Unable to create project from archetype {0}
 ProjectConfigurationManager_task_configuring=Configuring Maven projects
@@ -110,7 +108,7 @@ ProjectConfigurationManager_task_importing2=Importing project {0}
 ProjectConfigurationManager_task_refreshing=Refreshing projects
 ProjectConfigurationManager_task_updating=Updating configuration for {0}
 ProjectConfigurationManager_task_updating_projects=Updating Maven projects
-ProjectRegistryManager_task_project=project {0}
+ProjectRegistryManager_task_project=Project ''{0}''
 ProjectRegistryManager_task_refreshing=Refreshing projects
 ProjectRegistryRefreshJob_task_refreshing=Refreshing Maven model
 ProjectRegistryRefreshJob_title=Updating Maven Dependencies

diff --git a/...e.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java b/...e.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java
@@ -189,7 +189,7 @@ protected <T> T getParameterValue(MavenProject project, String parameter, Class<
 
   protected void assertHasNature(IProject project, String natureId) throws CoreException {
     if(project.getNature(natureId) == null) {
-      throw new CoreException(Status.error(Messages.AbstractProjectConfigurator_error_missing_nature + natureId));
+      throw new CoreException(Status.error(Messages.AbstractProjectConfigurator_error_missing_nature + ' ' + natureId));
     }
   }