From ebfd01bf1b37d8286e85fb4a6d380085190df63b Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Fri, 30 Apr 2021 16:17:19 +0800 Subject: [PATCH] IDE-4957 improve logic --- .../src/com/liferay/ide/maven/core/MavenUtil.java | 4 +--- .../core/NewMavenJSFModuleProjectProvider.java | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/MavenUtil.java b/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/MavenUtil.java index d9a039dd12..26ebba2b87 100644 --- a/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/MavenUtil.java +++ b/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/MavenUtil.java @@ -80,7 +80,6 @@ import org.eclipse.m2e.core.project.IProjectConfigurationManager; import org.eclipse.m2e.core.project.LocalProjectScanner; import org.eclipse.m2e.core.project.MavenProjectInfo; -import org.eclipse.m2e.core.project.MavenUpdateRequest; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.wtp.ProjectUtils; @@ -597,8 +596,7 @@ protected IStatus run(IProgressMonitor monitor) { projectConfigurationManager.importProjects(projectsToImport, importConfiguration, monitor); - projectConfigurationManager.updateProjectConfiguration( - new MavenUpdateRequest(project, false, true), monitor); + projectConfigurationManager.updateProjectConfiguration(project, monitor); } catch (Exception e) { return LiferayMavenCore.createErrorStatus("Error Updating project:" + project.getName(), e); diff --git a/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/NewMavenJSFModuleProjectProvider.java b/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/NewMavenJSFModuleProjectProvider.java index 225d97b9a8..f0ed649dae 100644 --- a/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/NewMavenJSFModuleProjectProvider.java +++ b/maven/plugins/com.liferay.ide.maven.core/src/com/liferay/ide/maven/core/NewMavenJSFModuleProjectProvider.java @@ -25,6 +25,7 @@ import java.io.File; +import java.util.Objects; import java.util.Properties; import org.apache.maven.archetype.ArchetypeGenerationRequest; @@ -69,12 +70,8 @@ public IStatus createNewProject(NewLiferayJSFModuleProjectOp op, IProgressMonito NewLiferayProjectProvider projectProvider = get(op.getProjectProvider()); - String projectType = projectProvider.getShortName(); - - if (projectType.equals("maven-jsf")) { - IPath pomPath = projectLocation.append(IMavenConstants.POM_FILE_NAME); - - File pomFile = FileUtil.getFile(pomPath); + if (Objects.equals("maven-jsf", projectProvider.getShortName())) { + File pomFile = FileUtil.getFile(projectLocation.append(IMavenConstants.POM_FILE_NAME)); try { Model mavenModel = MavenUtil.getMavenModel(pomFile); @@ -83,10 +80,10 @@ public IStatus createNewProject(NewLiferayJSFModuleProjectOp op, IProgressMonito String parentArtifactId = parent.getArtifactId(); - if (parentArtifactId.equals("com.liferay.faces.archetype.parent")) { + if (Objects.equals(parentArtifactId, "com.liferay.faces.archetype.parent")) { mavenModel.setParent(null); - MavenUtil.updateMavenPom(mavenModel, pomPath.toFile()); + MavenUtil.updateMavenPom(mavenModel, pomFile); } } catch (Exception exception) {