From d6a903b7e4886d0ae8d24b4240d0fb93d78d51bb Mon Sep 17 00:00:00 2001 From: Fred Bricon Date: Tue, 30 Sep 2014 14:52:49 -0400 Subject: 343038 : support [name] template in project import Signed-off-by: Fred Bricon --- .../org/eclipse/m2e/core/project/ProjectImportConfiguration.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'org.eclipse.m2e.core') diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/ProjectImportConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/ProjectImportConfiguration.java index 883f8ce0..3e2a7d54 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/ProjectImportConfiguration.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/ProjectImportConfiguration.java @@ -39,6 +39,8 @@ public class ProjectImportConfiguration { private static final String VERSION = "\\[version\\]"; //$NON-NLS-1$ + private static final String NAME = "\\[name\\]"; //$NON-NLS-1$ + /** resolver configuration bean */ private ResolverConfiguration resolverConfiguration; @@ -90,10 +92,15 @@ public class ProjectImportConfiguration { if(version == null && model.getParent() != null) { version = model.getParent().getVersion(); } + String name = model.getName(); + if(name == null || name.trim().isEmpty()) { + name = artifactId; + } // XXX needs MavenProjectManager update to resolve groupId and version return projectNameTemplate.replaceAll(GROUP_ID, cleanProjectNameComponent(groupId, true)) .replaceAll(ARTIFACT_ID, cleanProjectNameComponent(artifactId, true)) + .replaceAll(NAME, cleanProjectNameComponent(name, true)) .replaceAll(VERSION, version == null ? "" : cleanProjectNameComponent(version, true)); //$NON-NLS-1$ } -- cgit v1.2.3