From 8ddd29080784723af253f95fda79a093fa8d3276 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 8 Jun 2011 14:57:34 +0200 Subject: [PATCH] DRY --- .../notification/impl/NotificationsManagerImpl.java | 13 +++++++------ .../openapi/wm/impl/status/StatusPanel.java | 4 +--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java index a1c247a77456..c8a176b1dda7 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java @@ -46,7 +46,7 @@ import java.util.List; * @author spleaner */ public class NotificationsManagerImpl extends NotificationsManager implements Notifications, ApplicationComponent { - public static final String LOG_TOOL_WINDOW_ID = "Event Log"; + private static final String LOG_TOOL_WINDOW_ID = "Event Log"; private final NotificationModel myModel = new NotificationModel(); @@ -246,14 +246,15 @@ public class NotificationsManagerImpl extends NotificationsManager implements No } public static boolean isEventLogVisible(Project project) { - if (project == null) { - return false; - } - - final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(LOG_TOOL_WINDOW_ID); + final ToolWindow window = getEventLog(project); return window != null && window.isVisible(); } + @Nullable + public static ToolWindow getEventLog(Project project) { + return project == null ? null : ToolWindowManager.getInstance(project).getToolWindow(LOG_TOOL_WINDOW_ID); + } + private static PairFunction createFilter(@Nullable final Project project, final boolean strict) { return project == null ? APPLICATION : new ProjectFilter(project, strict); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java index 05bddacbc7da..7eabb2fe7ef0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java @@ -26,7 +26,6 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindow; -import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.WindowManager; import com.intellij.util.Alarm; import com.intellij.util.text.DateFormatUtil; @@ -93,8 +92,7 @@ class StatusPanel extends JPanel { @Nullable private ToolWindow getEventLog() { - final Project project = getActiveProject(); - return project != null ? ToolWindowManager.getInstance(project).getToolWindow(NotificationsManagerImpl.LOG_TOOL_WINDOW_ID) : null; + return NotificationsManagerImpl.getEventLog(getActiveProject()); } public void setLogMessage(String text) {