IDE-4957 improve logic

liferay · Apr 30, 2021 · ebfd01b · ebfd01b
1 parent 431947e
commit ebfd01b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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/...feray.ide.maven.core/src/com/liferay/ide/maven/core/NewMavenJSFModuleProjectProvider.java b/...feray.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<BaseModuleOp> 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) {