summaryrefslogtreecommitdiff
path: root/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2013-04-19 13:32:49 -0700
committerTor Norbye <tnorbye@google.com>2013-04-19 13:32:49 -0700
commitb569bc6aa78f6eacf72e8b90622d300e1a9db25f (patch)
tree309048e52eab434a381cf8554436f14de6342cbf /platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
parentd1a59a0799588a226d255d9b45c4825b19651554 (diff)
downloadidea-b569bc6aa78f6eacf72e8b90622d300e1a9db25f.tar.gz
Snapshot 0b0329a61f47b6070bb9084be8e176635a16fa5c from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: I2e8857776f197bed2d768ea37c67d2e2a1e97952
Diffstat (limited to 'platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java')
-rw-r--r--platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
index 0ee3953e7cc2..626181d5df0f 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
@@ -117,6 +117,7 @@ public class JdkUtil {
if (!binPath.exists()) return false;
FileFilter fileFilter = new FileFilter() {
+ @Override
@SuppressWarnings({"HardCodedStringLiteral"})
public boolean accept(File f) {
if (f.isDirectory()) return false;
@@ -136,6 +137,7 @@ public class JdkUtil {
if (!binPath.exists()) return false;
FileFilter fileFilter = new FileFilter() {
+ @Override
@SuppressWarnings({"HardCodedStringLiteral"})
public boolean accept(File f) {
return !f.isDirectory() && Comparing.strEqual(FileUtil.getNameWithoutExtension(f), "java");
@@ -210,7 +212,7 @@ public class JdkUtil {
finally {
writer.close();
}
-
+
String classpath = PathUtil.getJarPathForClass(commandLineWrapper);
final String utilRtPath = PathUtil.getJarPathForClass(StringUtilRt.class);
if (!classpath.equals(utilRtPath)) {
@@ -221,7 +223,7 @@ public class JdkUtil {
classpath += File.pathSeparator + PathUtil.getJarPathForClass(ourUrlClassLoader);
classpath += File.pathSeparator + PathUtil.getJarPathForClass(THashMap.class);
}
-
+
commandLine.addParameter("-classpath");
commandLine.addParameter(classpath);
}
@@ -229,7 +231,7 @@ public class JdkUtil {
LOG.error(e);
}
}
-
+
appendEncoding(javaParameters, commandLine, vmParametersList);
if (classpathFile != null) {
commandLine.addParameter(commandLineWrapper.getName());