From 7b548a0beb9039dab95ede630894f34076e3b7eb Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 13 Jul 2011 18:18:22 +0200 Subject: [PATCH] some utility notification group factory methods --- .../src/com/intellij/compiler/impl/CompileDriver.java | 2 +- .../src/com/intellij/util/indexing/FileBasedIndex.java | 2 +- .../src/com/intellij/diagnostic/MessagePool.java | 2 +- .../src/com/intellij/notification/NotificationGroup.java | 8 ++++++++ .../com/intellij/execution/testframework/TestsUIUtil.java | 5 +---- plugins/git4idea/src/git4idea/GitVcs.java | 3 +-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 257fb38063dc..ff93f15e9d64 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -92,7 +92,7 @@ import java.io.*; import java.util.*; public class CompileDriver { - private static final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("Compiler", NotificationDisplayType.NONE, true); + private static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.logOnlyGroup("Compiler"); private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver"); // to be used in tests only for debug output diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java index 618240db340b..3110ce6cafa3 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java @@ -283,7 +283,7 @@ public class FileBasedIndex implements ApplicationComponent { rebuildNotification = "Index file format has changed for some indices. These indices will be rebuilt."; } if (rebuildNotification != null && !ApplicationManager.getApplication().isHeadlessEnvironment()) { - new NotificationGroup("Indexing", NotificationDisplayType.BALLOON, true) + new NotificationGroup("Indexing", NotificationDisplayType.BALLOON, false) .createNotification("Index Rebuild", rebuildNotification, NotificationType.INFORMATION, null).notify(null); } dropUnregisteredIndices(); diff --git a/platform/platform-impl/src/com/intellij/diagnostic/MessagePool.java b/platform/platform-impl/src/com/intellij/diagnostic/MessagePool.java index 7f7c0d15ac05..4df7f37562da 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/MessagePool.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/MessagePool.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; public class MessagePool { - private static final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("IDE Fatal Errors", NotificationDisplayType.NONE, true); + private static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.logOnlyGroup("IDE Fatal Errors"); private static final int MAX_POOL_SIZE_FOR_FATALS = 100; diff --git a/platform/platform-impl/src/com/intellij/notification/NotificationGroup.java b/platform/platform-impl/src/com/intellij/notification/NotificationGroup.java index a7f01903e79b..dafdd9843389 100644 --- a/platform/platform-impl/src/com/intellij/notification/NotificationGroup.java +++ b/platform/platform-impl/src/com/intellij/notification/NotificationGroup.java @@ -41,6 +41,14 @@ public class NotificationGroup { } } + public static NotificationGroup balloonGroup(@NotNull String displayId) { + return new NotificationGroup(displayId, NotificationDisplayType.BALLOON, true); + } + + public static NotificationGroup logOnlyGroup(@NotNull String displayId) { + return new NotificationGroup(displayId, NotificationDisplayType.NONE, true); + } + public static NotificationGroup toolWindowGroup(@NotNull String displayId, @NotNull String toolWindowId, final boolean logByDefault) { return new NotificationGroup(displayId, NotificationDisplayType.TOOL_WINDOW, logByDefault, toolWindowId); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java b/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java index fc0b9746f166..b72b4a6cb36b 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java @@ -18,13 +18,11 @@ package com.intellij.execution.testframework; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.Location; import com.intellij.execution.configurations.RuntimeConfiguration; -import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationGroup; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MessageType; @@ -45,11 +43,10 @@ import java.awt.image.BufferedImage; import java.util.List; public class TestsUIUtil { - public static final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("Test Runner", NotificationDisplayType.NONE, true); + public static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.logOnlyGroup("Test Runner"); @NonNls private static final String ICONS_ROOT = "/runConfigurations/"; public static final Color PASSED_COLOR = new Color(0, 128, 0); - private static final Logger LOG = Logger.getInstance("#com.intellij.execution.testframework.TestsUIUtil"); private TestsUIUtil() { } diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java index ff2578adcf1d..0e73efd05790 100644 --- a/plugins/git4idea/src/git4idea/GitVcs.java +++ b/plugins/git4idea/src/git4idea/GitVcs.java @@ -16,7 +16,6 @@ package git4idea; import com.intellij.execution.ui.ConsoleViewContentType; -import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationGroup; import com.intellij.notification.impl.NotificationsConfiguration; import com.intellij.openapi.application.ApplicationManager; @@ -84,7 +83,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; */ public class GitVcs extends AbstractVcs { public static final NotificationGroup NOTIFICATION_GROUP_ID = NotificationGroup.toolWindowGroup("Git Messages", ChangesViewContentManager.TOOLWINDOW_ID, true); - public static final NotificationGroup IMPORTANT_ERROR_NOTIFICATION = new NotificationGroup("Git Important Errors", NotificationDisplayType.BALLOON, true); + public static final NotificationGroup IMPORTANT_ERROR_NOTIFICATION = NotificationGroup.balloonGroup("Git Important Errors"); static { NotificationsConfiguration.remove("Git");