MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

alternative jre schould provide not only executable but also jars (IDEA-55638)

Browse Source
This commit is contained in:
anna
2010-07-06 13:04:31 +04:00
parent 6aa336b163
commit 368d7952ce
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
+11 -3
View File
@@ -64,8 +64,15 @@ public class JavaParameters extends SimpleJavaParameters {
}
setDefaultCharset(module.getProject());
configureEnumerator(OrderEnumerator.orderEntries(module).runtimeOnly().recursively(), classPathType)
.classes().collectPaths(getClassPath());
configureJdkAccordingToJreSelected(jdk);
configureEnumerator(OrderEnumerator.orderEntries(module).runtimeOnly().recursively().withoutSdk(), classPathType).collectPaths(getClassPath());
}
private void configureJdkAccordingToJreSelected(Sdk jdk) {
final Sdk currentJdk = getJdk();
if (currentJdk != null) {
getClassPath().addVirtualFiles(jdk.getRootProvider().getFiles(OrderRootType.CLASSES));
}
}
public void setDefaultCharset(final Project project) {
@@ -103,7 +110,8 @@ public class JavaParameters extends SimpleJavaParameters {
return;
}
configureEnumerator(OrderEnumerator.orderEntries(project).runtimeOnly(), classPathType).classes().collectPaths(getClassPath());
configureJdkAccordingToJreSelected(getJdk());
configureEnumerator(OrderEnumerator.orderEntries(project).runtimeOnly().withoutSdk(), classPathType).collectPaths(getClassPath());
}
private static OrderEnumerator configureEnumerator(OrderEnumerator enumerator, int classPathType) {