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

Maven: runtime classpath support + refactoring

Browse Source
This commit is contained in:
Anton Makeev
2009-08-31 17:30:01 +04:00
parent 7db64ef137
commit c457d113b3
2 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/openapi/src/com/intellij/execution/configurations/JavaClasspathPolicyExtender.java
+17
View File
@@ -0,0 +1,17 @@
package com.intellij.execution.configurations;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootsTraversing;
import org.jetbrains.annotations.NotNull;
public interface JavaClasspathPolicyExtender {
ExtensionPointName<JavaClasspathPolicyExtender> EP_NAME = ExtensionPointName.create("com.intellij.javaClasspathPolicyExtender");
@NotNull
ProjectRootsTraversing.RootTraversePolicy extend(Project project, @NotNull ProjectRootsTraversing.RootTraversePolicy policy);
@NotNull
ProjectRootsTraversing.RootTraversePolicy extend(Module module, @NotNull ProjectRootsTraversing.RootTraversePolicy policy);
}
java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
+24 -6
View File
@@ -18,6 +18,7 @@ package com.intellij.execution.configurations;
import com.intellij.execution.CantRunException;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
@@ -34,12 +35,12 @@ public class JavaParameters extends SimpleJavaParameters {
public String getJdkPath() throws CantRunException {
final Sdk jdk = getJdk();
if(jdk == null) {
if (jdk == null) {
throw new CantRunException(ExecutionBundle.message("no.jdk.specified..error.message"));
}
final String jdkHome = jdk.getHomeDirectory().getPresentableUrl();
if(jdkHome == null || jdkHome.length() == 0) {
if (jdkHome == null || jdkHome.length() == 0) {
throw new CantRunException(ExecutionBundle.message("home.directory.not.specified.for.jdk.error.message"));
}
return jdkHome;
@@ -59,7 +60,7 @@ public class JavaParameters extends SimpleJavaParameters {
setJdk(jdk);
}
if((classPathType & CLASSES_ONLY) == 0) {
if ((classPathType & CLASSES_ONLY) == 0) {
return;
}
@@ -67,7 +68,8 @@ public class JavaParameters extends SimpleJavaParameters {
if (encoding != null) {
setCharset(encoding);
}
ProjectRootsTraversing.collectRoots(module, (classPathType & TESTS_ONLY) != 0 ? ProjectClasspathTraversing.FULL_CLASSPATH_RECURSIVE : ProjectClasspathTraversing.FULL_CLASSPATH_WITHOUT_TESTS, getClassPath());
ProjectRootsTraversing.collectRoots(module, getPolicy(null, module, classPathType), getClassPath());
}
public void configureByModule(final Module module, final int classPathType) throws CantRunException {
@@ -86,7 +88,7 @@ public class JavaParameters extends SimpleJavaParameters {
return jdk;
}
public void configureByProject(final Project project, final int classPathType, final Sdk jdk ) throws CantRunException {
public void configureByProject(final Project project, final int classPathType, final Sdk jdk) throws CantRunException {
if ((classPathType & JDK_ONLY) != 0) {
if (jdk == null) {
throw CantRunException.noJdkConfigured();
@@ -98,6 +100,22 @@ public class JavaParameters extends SimpleJavaParameters {
return;
}
ProjectRootsTraversing.collectRoots(project, (classPathType & TESTS_ONLY) != 0 ? ProjectClasspathTraversing.FULL_CLASSPATH_RECURSIVE : ProjectClasspathTraversing.FULL_CLASSPATH_WITHOUT_TESTS, getClassPath());
ProjectRootsTraversing.collectRoots(project, getPolicy(project, null, classPathType), getClassPath());
}
private ProjectRootsTraversing.RootTraversePolicy getPolicy(Project project, Module module, int classPathType) {
ProjectRootsTraversing.RootTraversePolicy result = (classPathType & TESTS_ONLY) != 0
? ProjectClasspathTraversing.FULL_CLASSPATH_RECURSIVE
: ProjectClasspathTraversing.FULL_CLASSPATH_WITHOUT_TESTS;
for (JavaClasspathPolicyExtender each : Extensions.getExtensions(JavaClasspathPolicyExtender.EP_NAME)) {
if (project == null) {
result = each.extend(module, result);
}
else {
result = each.extend(project, result);
}
}
return result;
}
}