/*
 * Copyright 2000-2013 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.ui.content;

import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
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;

public class ContentManagerUtil {
  private ContentManagerUtil() {
  }

  /**
   * This is utility method. It returns <code>ContentManager</code> from the current context.
   */
  public static ContentManager getContentManagerFromContext(DataContext dataContext, boolean requiresVisibleToolWindow){
    Project project = CommonDataKeys.PROJECT.getData(dataContext);
    if (project == null) {
      return null;
    }

    ToolWindowManagerEx mgr=ToolWindowManagerEx.getInstanceEx(project);

    String id = mgr.getActiveToolWindowId();
    if (id == null) {
      if(mgr.isEditorComponentActive()){
        id = mgr.getLastActiveToolWindowId();
      }
    }
    if(id == null){
      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;
  }
}

@@ -945,16 +945,54 @@
 nagerEx;
+%0Aimport com.intellij.util.ObjectUtils;
 %0A%0Apublic
@@ -1648,53 +1648,8 @@
    %7D
-%0A    if(id == null)%7B%0A      return null;%0A    %7D
 %0A%0A  
@@ -1675,16 +1675,29 @@
 Window =
+ id != null ?
  (ToolWi
@@ -1724,16 +1724,23 @@
 ndow(id)
+ : null
 ;%0A    if
@@ -1769,16 +1769,39 @@
 indow &&
+ (toolWindow == null %7C%7C
  !toolWi
@@ -1817,16 +1817,17 @@
 sible())
+)
  %7B%0A     
@@ -1855,217 +1855,253 @@
     
-final ContentManager fromContext = PlatformDataKeys.CONTENT_MANAGER.getData(dataContext);%0A    if (fromContext != null) return fromContext;%0A%0A    return toolWindow != null ? toolWindow.getContentManager() : null
+ContentManager fromToolWindow = toolWindow != null ? toolWindow.getContentManager() : null;%0A    ContentManager fromContext = PlatformDataKeys.CONTENT_MANAGER.getData(dataContext);%0A    return ObjectUtils.chooseNotNull(fromContext, fromToolWindow)
 ;%0A  

fix ContentManagerUtil#getContentManagerFromContext