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

IDEA-57241: Can't run classes in a module that reference dependencies in "provided" scope.

Browse Source
This commit is contained in:
nik
2010-08-09 13:07:31 +04:00
parent b17472e816
commit e1afb2e2d9
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/openapi/roots/OrderEnumerationHandler.java
+4 -1
View File
@@ -36,7 +36,10 @@ public abstract class OrderEnumerationHandler {
return true;
}
public boolean addCustomOutput(@NotNull ModuleOrderEntry orderEntry, boolean productionOnly, @NotNull Collection<String> urls) {
public boolean addCustomOutput(@NotNull ModuleOrderEntry orderEntry,
boolean productionOnly,
boolean runtimeOnly,
boolean compileOnly, @NotNull Collection<String> urls) {
return false;
}
}
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
+2 -2
View File
@@ -283,7 +283,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
if (myCustomHandlers != null) {
for (OrderEnumerationHandler handler : myCustomHandlers) {
final List<String> urls = new ArrayList<String>();
final boolean added = handler.addCustomOutput(moduleOrderEntry, myProductionOnly, urls);
final boolean added = handler.addCustomOutput(moduleOrderEntry, myProductionOnly, myRuntimeOnly, myCompileOnly, urls);
for (String url : urls) {
ContainerUtil.addIfNotNull(VirtualFileManager.getInstance().findFileByUrl(url), result);
}
@@ -298,7 +298,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
boolean addCustomOutputUrls(ModuleOrderEntry moduleOrderEntry, Collection<String> result) {
if (myCustomHandlers != null) {
for (OrderEnumerationHandler handler : myCustomHandlers) {
if (handler.addCustomOutput(moduleOrderEntry, myProductionOnly, result)) {
if (handler.addCustomOutput(moduleOrderEntry, myProductionOnly, myRuntimeOnly, myCompileOnly, result)) {
return true;
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenOrderEnumeratorHandler.java
+2 -2
View File
@@ -51,7 +51,7 @@ public class MavenOrderEnumeratorHandler extends OrderEnumerationHandler {
@Override
public boolean addCustomOutput(@NotNull ModuleOrderEntry orderEntry,
boolean productionOnly,
@NotNull Collection<String> urls) {
boolean runtimeOnly, boolean compileOnly, @NotNull Collection<String> urls) {
final Module ownerModule = orderEntry.getOwnerModule();
final Module depModule = orderEntry.getModule();
if (depModule == null) return false;
@@ -65,7 +65,7 @@ public class MavenOrderEnumeratorHandler extends OrderEnumerationHandler {
for (MavenArtifact each : project.findDependencies(depProject)) {
if (productionOnly && MavenConstants.SCOPE_PROVIDEED.equals(each.getScope())) continue;
if (productionOnly && runtimeOnly && MavenConstants.SCOPE_PROVIDEED.equals(each.getScope())) continue;
if (productionOnly && MavenConstants.SCOPE_TEST.equals(each.getScope())) continue;
boolean isTestJar = MavenConstants.TYPE_TEST_JAR.equals(each.getType()) || "tests".equals(each.getClassifier());