diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java index 5387ae9e100d..0640c9ba991b 100644 --- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java @@ -35,13 +35,10 @@ public class UsageViewManagerImpl extends UsageViewManager { private final Key REUSABLE_CONTENT_KEY = Key.create("UsageTreeManager.REUSABLE_CONTENT_KEY"); private final Key NOT_REUSABLE_CONTENT_KEY = Key.create("UsageTreeManager.NOT_REUSABLE_CONTENT_KEY"); //todo[myakovlev] dont use it private final Key NEW_USAGE_VIEW_KEY = Key.create("NEW_USAGE_VIEW_KEY"); - private final ToolWindowManager myToolWindowManager; private final ContentManager myFindContentManager; public UsageViewManagerImpl(final Project project, final ToolWindowManager toolWindowManager) { - myToolWindowManager = toolWindowManager; - - ToolWindow toolWindow = myToolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true); + ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true); toolWindow.setToHideOnEmptyContent(true); toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowFind); myFindContentManager = toolWindow.getContentManager(); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java index 73caa2b848c4..71f8228ef061 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java @@ -45,8 +45,9 @@ import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.ui.HyperlinkAdapter; import com.intellij.ui.content.Content; -import com.intellij.usageView.UsageViewBundle; +import com.intellij.usageView.*; import com.intellij.usages.*; +import com.intellij.usages.UsageViewManager; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; import com.intellij.util.CommonProcessors; @@ -322,9 +323,7 @@ public class UsageViewManagerImpl extends UsageViewManager { findUsagesStartedBalloon.addRequest(new Runnable() { @Override public void run() { - ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.FIND, MessageType.INFO, - "Find Usages in progress...", - AllIcons.Actions.Find, null); + notifyByFindBalloon("Find Usages in progress...", null); findStartedBalloonShown.set(true); } }, 300, ModalityState.NON_MODAL); @@ -409,9 +408,7 @@ public class UsageViewManagerImpl extends UsageViewManager { myPresentation.getScopeText()); if (notFoundActions == null || notFoundActions.isEmpty()) { - ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.FIND, MessageType.INFO, - ""+message+".
" + createOptionsHtml() + "", - AllIcons.Actions.Find, createGotToOptionsListener(mySearchFor)); + notifyByFindBalloon(""+message+".
" + createOptionsHtml() + "", createGotToOptionsListener(mySearchFor)); findStartedBalloonShown.set(false); } else { @@ -443,9 +440,7 @@ public class UsageViewManagerImpl extends UsageViewManager { usage.navigate(true); flashUsageScriptaculously(usage); } - ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.FIND, MessageType.INFO, - "Only one usage found.
" + createOptionsHtml() + "", - AllIcons.Actions.Find, createGotToOptionsListener(mySearchFor)); + notifyByFindBalloon("Only one usage found.
" + createOptionsHtml() + "", createGotToOptionsListener(mySearchFor)); } }, ModalityState.NON_MODAL, myProject.getDisposed()); } @@ -485,6 +480,11 @@ public class UsageViewManagerImpl extends UsageViewManager { } } + private void notifyByFindBalloon(@NotNull String text, HyperlinkListener listener) { + com.intellij.usageView.UsageViewManager.getInstance(myProject); // in case tool window not registered + ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.FIND, MessageType.INFO, text, AllIcons.Actions.Find, listener); + } + @NotNull private HyperlinkListener createGotToOptionsListener(@NotNull final UsageTarget[] targets) { return new HyperlinkAdapter() {