Merge pull request liferay#104 from gamerson/pr-103

INTELLIJ-46 update to gradle 4.10.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Sep 06 13:50:02 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

src/main/java/com/liferay/ide/idea/core/LiferayProjectTypeService.java

@@ -17,7 +17,6 @@
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
-import com.intellij.openapi.project.DefaultProjectTypeEP;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectType;
 
@@ -38,35 +37,28 @@ public static LiferayProjectTypeService getInstance(@NotNull Project project) {
 		return ServiceManager.getService(project, LiferayProjectTypeService.class);
 	}
 
-	@Nullable
-	public static ProjectType getProjectType(@Nullable Project project) {
+	@NotNull
+	public static ProjectType getProjectType(@NotNull Project project) {
 		ProjectType projectType;
 
-		if (project != null) {
-			projectType = getInstance(project)._projectType;
+		projectType = getInstance(project)._projectType;
 
-			if (projectType != null) {
-				return projectType;
-			}
+		if (projectType != null) {
+			return projectType;
 		}
 
-		boolean validGradleWorkspaceLocation = LiferayWorkspaceUtil.isValidGradleWorkspaceLocation(
-			project.getBasePath());
-
-		if (validGradleWorkspaceLocation) {
+		if (LiferayWorkspaceUtil.isValidGradleWorkspaceLocation(project.getBasePath())) {
 			return new ProjectType(LiferayProjectType.LIFERAY_GRADLE_WORKSPACE);
 		}
 
-		boolean validMavenWorkspaceLocation = LiferayWorkspaceUtil.isValidMavenWorkspaceLocation(project);
-
-		if (validMavenWorkspaceLocation) {
+		if (LiferayWorkspaceUtil.isValidMavenWorkspaceLocation(project)) {
 			return new ProjectType(LiferayProjectType.LIFERAY_MAVEN_WORKSPACE);
 		}
 
-		return DefaultProjectTypeEP.getDefaultProjectType();
+		throw new RuntimeException(MessagesBundle.message("invalid.workspace.location", project.getBasePath()));
 	}
 
-	public static void setProjectType(@NotNull Project project, @Nullable ProjectType projectType) {
+	public static void setProjectType(@NotNull Project project, @NotNull ProjectType projectType) {
 		getInstance(project).loadState(projectType);
 	}
 
@@ -77,8 +69,8 @@ public ProjectType getState() {
 	}
 
 	@Override
-	public void loadState(ProjectType state) {
-		_projectType = state;
+	public void loadState(@NotNull ProjectType projectType) {
+		_projectType = projectType;
 	}
 
 	private ProjectType _projectType;

src/main/java/com/liferay/ide/idea/ui/actions/AbstractLiferayGradleTaskAction.java

@@ -32,6 +32,7 @@
 import com.intellij.util.execution.ParametersListUtil;
 
 import com.liferay.ide.idea.util.CoreUtil;
+import com.liferay.ide.idea.util.LiferayWorkspaceUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -115,11 +116,14 @@ public void onSuccess() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	protected boolean isEnabledAndVisible(AnActionEvent anActionEvent) {
 		Project project = anActionEvent.getProject();
 
-		VirtualFile baseDir = project.getBaseDir();
+		VirtualFile baseDir = LiferayWorkspaceUtil.getWorkspaceVirtualFile(project);
+
+		if (baseDir == null) {
+			return false;
+		}
 
 		VirtualFile gradleFile = baseDir.findChild("build.gradle");
 

src/main/java/com/liferay/ide/idea/ui/actions/DeployGradleModuleAction.java

@@ -35,12 +35,15 @@ public DeployGradleModuleAction() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	protected boolean isEnabledAndVisible(AnActionEvent anActionEvent) {
 		Project project = anActionEvent.getProject();
 		VirtualFile virtualFile = getVirtualFile(anActionEvent);
 
-		VirtualFile baseDir = project.getBaseDir();
+		VirtualFile baseDir = LiferayWorkspaceUtil.getWorkspaceVirtualFile(project);
+
+		if (baseDir == null) {
+			return false;
+		}
 
 		VirtualFile gradleFile = baseDir.findChild("build.gradle");
 

src/main/java/com/liferay/ide/idea/ui/actions/InitBundleMavenAction.java

@@ -49,13 +49,12 @@ protected void handleProcessTerminated(Project project) {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	protected boolean isEnabledAndVisible(AnActionEvent anActionEvent) {
 		if (super.isEnabledAndVisible(anActionEvent)) {
 			VirtualFile rootDir = getVirtualFile(anActionEvent);
 			Project project = anActionEvent.getProject();
 
-			if ((rootDir != null) && rootDir.equals(project.getBaseDir())) {
+			if ((rootDir != null) && rootDir.equals(LiferayWorkspaceUtil.getWorkspaceVirtualFile(project))) {
 				return true;
 			}
 		}

src/main/java/com/liferay/ide/idea/ui/actions/WatchGradleModuleAction.java

@@ -101,7 +101,7 @@ protected boolean isEnabledAndVisible(AnActionEvent anActionEvent) {
 
 		VirtualFile virtualFile = getVirtualFile(anActionEvent);
 
-		if (virtualFile == null) {
+		if ((project == null) || (virtualFile == null)) {
 			return false;
 		}
 

src/main/java/com/liferay/ide/idea/ui/modules/LiferayModuleBuilder.java

@@ -22,7 +22,6 @@
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.module.StdModuleTypes;
-import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectType;
 import com.intellij.openapi.roots.ModifiableRootModel;
@@ -106,7 +105,7 @@ public void setType(String type) {
 	}
 
 	@Override
-	public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException {
+	public void setupRootModel(ModifiableRootModel rootModel) {
 		Project project = rootModel.getProject();
 
 		ProjectType liferayProjectType = LiferayProjectTypeService.getProjectType(project);
@@ -123,9 +122,9 @@ public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationEx
 		sb.append("\" ");
 
 		String typeId = liferayProjectType.getId();
-		Boolean mavenModule = false;
+		boolean mavenModule = false;
 
-		if ((liferayProjectType != null) && typeId.equals(LiferayProjectType.LIFERAY_MAVEN_WORKSPACE)) {
+		if (typeId.equals(LiferayProjectType.LIFERAY_MAVEN_WORKSPACE)) {
 			sb.append("-b ");
 			sb.append("maven ");
 

src/main/java/com/liferay/ide/idea/ui/modules/ext/LiferayModuleExtBuilder.java

@@ -112,7 +112,7 @@ public void setupRootModel(ModifiableRootModel rootModel) {
 		_overrideFilesPanel.doFinish(virtualFile);
 
 		ExternalSystemUtil.refreshProject(
-			project, GradleConstants.SYSTEM_ID, LiferayWorkspaceUtil.getWorkspaceLocationPath(project), false,
+			project, GradleConstants.SYSTEM_ID, project.getBasePath(), false,
 			ProgressExecutionMode.IN_BACKGROUND_ASYNC);
 	}
 

src/main/java/com/liferay/ide/idea/util/LiferayWorkspaceUtil.java

@@ -60,7 +60,6 @@ public static String getHomeDir(String location) {
 	}
 
 	@Nullable
-	@SuppressWarnings("deprecation")
 	public static String getLiferayVersion(Project project) {
 		PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(project);
 
@@ -70,7 +69,11 @@ public static String getLiferayVersion(Project project) {
 			return liferayVersion;
 		}
 
-		VirtualFile projectRoot = project.getBaseDir();
+		VirtualFile projectRoot = getWorkspaceVirtualFile(project);
+
+		if (projectRoot == null) {
+			return null;
+		}
 
 		VirtualFile settingsVirtualFile = projectRoot.findFileByRelativePath("/.blade/settings.properties");
 
@@ -89,15 +92,16 @@ public static String getLiferayVersion(Project project) {
 		return liferayVersion;
 	}
 
-	@SuppressWarnings("deprecation")
+	@Nullable
 	public static String getMavenProperty(Project project, String key, String defaultValue) {
 		if (!isValidMavenWorkspaceLocation(project)) {
 			return null;
 		}
 
 		MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(project);
 
-		MavenProject mavenWorkspaceProject = mavenProjectsManager.findContainingProject(project.getBaseDir());
+		MavenProject mavenWorkspaceProject = mavenProjectsManager.findContainingProject(
+			getWorkspaceVirtualFile(project));
 
 		if (mavenWorkspaceProject == null) {
 			return defaultValue;
@@ -135,15 +139,20 @@ public static VirtualFile getModuleExtDirFile(Project project) {
 		File file = new File(moduleExtDir);
 
 		if (!file.isAbsolute()) {
-			file = new File(getWorkspaceLocation(project), moduleExtDir);
+			String projectBasePath = project.getBasePath();
+
+			if (projectBasePath == null) {
+				return null;
+			}
+
+			file = new File(projectBasePath, moduleExtDir);
 		}
 
 		LocalFileSystem localFileSystem = LocalFileSystem.getInstance();
 
 		return localFileSystem.findFileByPath(file.getPath());
 	}
 
-	@SuppressWarnings("rawtypes")
 	public static List<LibraryData> getTargetPlatformArtifacts(Project project) {
 		ProjectDataManager projectDataManager = ProjectDataManager.getInstance();
 
@@ -161,7 +170,7 @@ public static List<LibraryData> getTargetPlatformArtifacts(Project project) {
 
 			List<LibraryData> libraryData = new ArrayList<>(dataNodes.size());
 
-			for (DataNode child : dataNodes) {
+			for (DataNode<?> child : dataNodes) {
 				if (!ProjectKeys.LIBRARY.equals(child.getKey())) {
 					continue;
 				}
@@ -194,18 +203,28 @@ public static String getTargetPlatformVersion(Project project) {
 		return _getGradleProperty(location, WorkspaceConstants.DEFAULT_TARGET_PLATFORM_VERSION_PROPERTY, null);
 	}
 
-	@SuppressWarnings("deprecation")
-	public static File getWorkspaceLocation(Project project) {
-		VirtualFile baseDir = project.getBaseDir();
+	@Nullable
+	public static VirtualFile getWorkspaceVirtualFile(@Nullable Project project) {
+		if (project == null) {
+			return null;
+		}
 
-		return new File(baseDir.getPath());
-	}
+		String projectBasePath = project.getBasePath();
 
-	public static String getWorkspaceLocationPath(Project project) {
-		return getWorkspaceLocation(project).getPath();
+		if (projectBasePath == null) {
+			return null;
+		}
+
+		LocalFileSystem fileSystem = LocalFileSystem.getInstance();
+
+		return fileSystem.findFileByPath(projectBasePath);
 	}
 
-	public static boolean isValidGradleWorkspaceLocation(String location) {
+	public static boolean isValidGradleWorkspaceLocation(@Nullable String location) {
+		if (location == null) {
+			return false;
+		}
+
 		File workspaceDir = new File(location);
 
 		File buildGradle = new File(workspaceDir, _BUILD_GRADLE_FILE_NAME);
@@ -220,18 +239,13 @@ public static boolean isValidGradleWorkspaceLocation(String location) {
 
 		Matcher matcher = _patternWorkspacePlugin.matcher(settingsContent);
 
-		if (matcher.matches()) {
-			return true;
-		}
-
-		return false;
+		return matcher.matches();
 	}
 
 	public static boolean isValidGradleWorkspaceProject(Project project) {
-		return isValidGradleWorkspaceLocation(getWorkspaceLocation(project).getPath());
+		return isValidGradleWorkspaceLocation(project.getBasePath());
 	}
 
-	@SuppressWarnings("deprecation")
 	public static boolean isValidMavenWorkspaceLocation(Project project) {
 		if (project == null) {
 			return false;
@@ -244,7 +258,13 @@ public static boolean isValidMavenWorkspaceLocation(Project project) {
 				return false;
 			}
 
-			MavenProject mavenWorkspaceProject = mavenProjectsManager.findContainingProject(project.getBaseDir());
+			VirtualFile workspaceVirtualFile = getWorkspaceVirtualFile(project);
+
+			if (workspaceVirtualFile == null) {
+				return false;
+			}
+
+			MavenProject mavenWorkspaceProject = mavenProjectsManager.findContainingProject(workspaceVirtualFile);
 
 			if (mavenWorkspaceProject == null) {
 				return false;

src/main/resources/messages/Messages.properties

@@ -5,4 +5,5 @@ modules.ext.override.jar.undefined=Unable to get source jar in current context.
 modules.ext.refresh.tip=Refresh current Gradle project
 modules.ext.targetPlatform.mention=No Target Platform configuration claimed in gradle.properties.
 orderEntry.fix.add.library.to.gradle=Add Liferay library ''{0}'' to gradle
-orderEntry.fix.family.add.library.to.gradle=Add Liferay library to gradle
+orderEntry.fix.family.add.library.to.gradle=Add Liferay library to gradle
+invalid.workspace.location={0}: is not a valid Liferay Gradle Workspace either a valid Liferay Maven Workspace.