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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2016-05-06 13:10:49 +03:00
parent 09bf8f4036 3bef2f5b76
commit a5317609ce
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.txt
+1 -1
View File
@@ -1 +1 @@
146.SNAPSHOT
162.SNAPSHOT
platform/platform-resources-en/src/messages/ActionsBundle.properties
+2 -2
View File
@@ -1456,7 +1456,7 @@ action.UnmarkRoot.text=Unmark Root
action.CreateLibraryFromFile.text=Add as Library...
action.ImportModuleFromImlFile.text=Import Module
action.ImportModuleFromImlFile.description=Import iml file as a module to the project
group.MarkRootGroup.text=Mark Directory As
group.MarkRootGroup.text=Mark Directory as
action.CreateLauncherScript.text=Create Command-line Launcher...
action.CreateLauncherScript.description=Create a script for opening files and projects from the command line
action.CreateDesktopEntry.text=Create Desktop Entry...
@@ -1467,7 +1467,7 @@ action.EditorGutterToggleLocalSoftWraps.gutterText=Soft-Wrap Current File
action.EditorGutterToggleGlobalLineNumbers.text=Show Line Numbers
action.EditorGutterToggleGlobalIndentLines.text=Show Indent Guides
action.ExcludeFromProject.text=Exclude From Project...
group.MarkFileAs.text=Mark File As
group.MarkFileAs.text=Mark File as
action.MarkAsPlainTextAction.text=Mark as Plain Text
action.MarkAsOriginalTypeAction.text=Mark as
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+2 -2
View File
@@ -249,7 +249,7 @@ public class RootIndex {
final Module depModule = moduleOrderEntry.getModule();
if (depModule != null) {
Node node = graph.myNodes.get(depModule);
OrderEnumerator en = OrderEnumerator.orderEntries(depModule).exportedOnly().recursively();
OrderEnumerator en = OrderEnumerator.orderEntries(depModule).exportedOnly();
if (node == null) {
node = new Node();
node.myKey = depModule;
@@ -265,7 +265,7 @@ public class RootIndex {
roots.putValue(sourceRoot, node);
}
}
boolean shouldRecurse = en.shouldRecurse(moduleOrderEntry, handlers);
boolean shouldRecurse = en.recursively().shouldRecurse(moduleOrderEntry, handlers);
node.myEdges.add(new Edge(module, moduleOrderEntry, shouldRecurse));
}
}