From e14e21af5e18fded55f749cdaf6e5cf98f0c79fa Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 8 Apr 2014 17:48:06 +0200 Subject: [PATCH] ensure that tree is not flattened when action to switch is disabled (IDEA-123549) --- .../intellij/packageDependencies/ui/FileTreeModelBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java index e0eae627d910..0059172cdab5 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java @@ -19,6 +19,7 @@ package com.intellij.packageDependencies.ui; import com.intellij.analysis.AnalysisScopeBundle; import com.intellij.ide.dnd.aware.DnDAwareTree; import com.intellij.ide.projectView.impl.ModuleGroup; +import com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper; import com.intellij.ide.scopeView.nodes.BasePsiNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; @@ -86,7 +87,7 @@ public class FileTreeModelBuilder { myContentRoots = ProjectRootManager.getInstance(myProject).getContentRoots(); final boolean multiModuleProject = ModuleManager.getInstance(myProject).getModules().length > 1; myShowModules = settings.UI_SHOW_MODULES && multiModuleProject; - myFlattenPackages = settings.UI_FLATTEN_PACKAGES; + myFlattenPackages = ProjectViewDirectoryHelper.getInstance(myProject).supportsFlattenPackages() && settings.UI_FLATTEN_PACKAGES; myCompactEmptyMiddlePackages = settings.UI_COMPACT_EMPTY_MIDDLE_PACKAGES; myShowFiles = settings.UI_SHOW_FILES; myShowModuleGroups = settings.UI_SHOW_MODULE_GROUPS && multiModuleProject;