INTELLIJ-41 remove unnecessary variable and rename

Seiphon · Jan 24, 2019 · ea2ba2f · ea2ba2f
1 parent 4ae2b59
commit ea2ba2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/liferay/ide/idea/server/portal/PortalBundle.java b/src/main/java/com/liferay/ide/idea/server/portal/PortalBundle.java
@@ -31,7 +31,7 @@ public interface PortalBundle {
 
 	public String[] getRuntimeStartProgArgs();
 
-	public String[] getRuntimeStartVMArgs(Sdk javaJdk);
+	public String[] getRuntimeStartVMArgs(Sdk sdk);
 
 	public String getType();
 

diff --git a/src/main/java/com/liferay/ide/idea/server/portal/PortalTomcatBundle.java b/src/main/java/com/liferay/ide/idea/server/portal/PortalTomcatBundle.java
@@ -77,16 +77,16 @@ public String[] getRuntimeStartProgArgs() {
 	}
 
 	@Override
-	public String[] getRuntimeStartVMArgs(Sdk javaJdk) {
-		return _getRuntimeVMArgs(javaJdk);
+	public String[] getRuntimeStartVMArgs(Sdk sdk) {
+		return _getRuntimeVMArgs(sdk);
 	}
 
 	@Override
 	public String getType() {
 		return "tomcat";
 	}
 
-	private String[] _getRuntimeVMArgs(Sdk javaJdk) {
+	private String[] _getRuntimeVMArgs(Sdk sdk) {
 		List<String> args = new ArrayList<>();
 		Path tempPath = FileUtil.pathAppend(bundlePath, "temp");
 		Path endorsedPath = FileUtil.pathAppend(bundlePath, "endorsed");
@@ -95,12 +95,14 @@ private String[] _getRuntimeVMArgs(Sdk javaJdk) {
 		args.add("-Dcatalina.home=" + bundlePath);
 		args.add("-Dfile.encoding=UTF8");
 
-		String jdkVersionString = JdkUtil.getJdkMainAttribute(javaJdk, Attributes.Name.SPECIFICATION_VERSION);
+		String jdkVersionString = JdkUtil.getJdkMainAttribute(sdk, Attributes.Name.SPECIFICATION_VERSION);
 
 		if (!CoreUtil.isNullOrEmpty(jdkVersionString)) {
 			Version jdkVersion = Version.parseVersion(jdkVersionString);
 
-			if (jdkVersion.compareTo(_jdk8Version) <= 0) {
+			Version jdk8Version = Version.parseVersion("1.8");
+
+			if (jdkVersion.compareTo(jdk8Version) <= 0) {
 				args.add("-Djava.endorsed.dirs=" + endorsedPath);
 			}
 		}
@@ -118,6 +120,4 @@ private String[] _getRuntimeVMArgs(Sdk javaJdk) {
 		return args.toArray(new String[0]);
 	}
 
-	private static Version _jdk8Version = Version.parseVersion("1.8");
-
 }
diff --git a/src/main/java/com/liferay/ide/idea/server/portal/PortalWildFlyBundle.java b/src/main/java/com/liferay/ide/idea/server/portal/PortalWildFlyBundle.java
@@ -88,7 +88,7 @@ public String[] getRuntimeStartProgArgs() {
 	}
 
 	@Override
-	public String[] getRuntimeStartVMArgs(Sdk javaJdk) {
+	public String[] getRuntimeStartVMArgs(Sdk sdk) {
 		List<String> args = new ArrayList<>();
 
 		args.add("-Dorg.jboss.resolver.warning=true");