MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

order enumerator: fix

Browse Source
This commit is contained in:
Anton Makeev
2010-12-28 14:59:45 +03:00
parent 37d96853db
commit 7cae94e5f4
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-tests/testSrc/com/intellij/roots/OrderEnumeratorTest.java
View File

@@ -77,9 +77,13 @@ public class OrderEnumeratorTest extends ModuleRootManagerTestCase {
depOutput, getJDomJar());
assertClassRoots(orderEntries(myModule).withoutSdk().withoutModuleSourceEntries().recursively(),
depTestOutput, depOutput, getJDomJar());
getJDomJar());
assertSourceRoots(orderEntries(myModule).withoutSdk().withoutModuleSourceEntries().recursively(),
depSrcRoot, depTestRoot, getJDomSources());
getJDomSources());
assertEnumeratorRoots(orderEntries(myModule).withoutSdk().withoutModuleSourceEntries().recursively().classes(),
getJDomJar());
assertEnumeratorRoots(orderEntries(myModule).withoutSdk().withoutModuleSourceEntries().recursively().sources(),
getJDomSources());
}
public void testModuleDependencyScope() throws Exception {

2
platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java
View File

@@ -87,7 +87,7 @@ public class OrderRootType {
public static final OrderRootType PRODUCTION_COMPILATION_CLASSES = new OrderRootType("PRODUCTION_COMPILATION_CLASSES");
/**
* Classpath without output directories for this module.
* Classpath without output directories for modules.
* Includes:
* <li> classes roots for libraries and jdk
* <li> recursively for module dependencies: only exported items

10
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
View File

@@ -44,7 +44,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
private boolean myWithoutJdk;
private boolean myWithoutLibraries;
protected boolean myWithoutDepModules;
private boolean myWithoutRootModuleContent;
private boolean myWithoutModuleSourceEntries;
protected boolean myRecursively;
protected boolean myRecursivelyExportedOnly;
private boolean myExportedOnly;
@@ -105,7 +105,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
@Override
public OrderEnumerator withoutModuleSourceEntries() {
myWithoutRootModuleContent = true;
myWithoutModuleSourceEntries = true;
return this;
}
@@ -186,7 +186,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
flags <<= 1;
if (myWithoutDepModules) flags |= 1;
flags <<= 1;
if (myWithoutRootModuleContent) flags |= 1;
if (myWithoutModuleSourceEntries) flags |= 1;
flags <<= 1;
if (myRecursively) flags |= 1;
flags <<= 1;
@@ -208,9 +208,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator {
if (!myRecursively && entry instanceof ModuleOrderEntry) continue;
if (entry instanceof ModuleSourceOrderEntry && !isRootModuleModel(((ModuleSourceOrderEntry)entry).getRootModel())) continue;
}
if (myWithoutRootModuleContent
&& entry instanceof ModuleSourceOrderEntry
&& isRootModuleModel(((ModuleSourceOrderEntry)entry).getRootModel())) {
if (myWithoutModuleSourceEntries && entry instanceof ModuleSourceOrderEntry) {
continue;
}