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

fix ContentManagerUtil#getContentManagerFromContext

Browse Source 
Return a content manager from context if a visible toolwindow is not required
This commit is contained in:
Sergey Savenko
2015-01-19 22:00:00 +03:00
parent 4ced2f94f7
commit 29f261213c
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/content/ContentManagerUtil.java
+7 -10
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.ex.ToolWindowEx;
import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
import com.intellij.util.ObjectUtils;
public class ContentManagerUtil {
private ContentManagerUtil() {
@@ -43,18 +44,14 @@ public class ContentManagerUtil {
id = mgr.getLastActiveToolWindowId();
}
}
if(id == null){
ToolWindowEx toolWindow = id != null ? (ToolWindowEx)mgr.getToolWindow(id) : null;
if (requiresVisibleToolWindow && (toolWindow == null || !toolWindow.isVisible())) {
return null;
}
ToolWindowEx toolWindow = (ToolWindowEx)mgr.getToolWindow(id);
if (requiresVisibleToolWindow && !toolWindow.isVisible()) {
return null;
}
final ContentManager fromContext = PlatformDataKeys.CONTENT_MANAGER.getData(dataContext);
if (fromContext != null) return fromContext;
return toolWindow != null ? toolWindow.getContentManager() : null;
ContentManager fromToolWindow = toolWindow != null ? toolWindow.getContentManager() : null;
ContentManager fromContext = PlatformDataKeys.CONTENT_MANAGER.getData(dataContext);
return ObjectUtils.chooseNotNull(fromContext, fromToolWindow);
}
}