From 68720ceb28382d039b5017ced332d9305458c750 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 26 Feb 2016 15:29:47 +0300 Subject: [PATCH] vcs: let successful commit message hide away Rename the notification group for non-sticky balloons to let it reuse not only in "minor" notifications. As part of IDEA-151547. --- .../src/com/intellij/openapi/vcs/VcsNotifier.java | 8 ++++---- .../com/intellij/openapi/vcs/changes/ui/CommitHelper.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java index edec9d48a2d1..1ec5e620c6b4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java @@ -29,8 +29,8 @@ public class VcsNotifier { "Vcs Messages", ChangesViewContentManager.TOOLWINDOW_ID); public static final NotificationGroup IMPORTANT_ERROR_NOTIFICATION = new NotificationGroup( "Vcs Important Messages", NotificationDisplayType.STICKY_BALLOON, true); - public static final NotificationGroup MINOR_NOTIFICATION = new NotificationGroup( - "Vcs Minor Notifications", NotificationDisplayType.BALLOON, true); + public static final NotificationGroup STANDARD_NOTIFICATION = new NotificationGroup( + "Vcs Notifications", NotificationDisplayType.BALLOON, true); public static final NotificationGroup SILENT_NOTIFICATION = new NotificationGroup( "Vcs Silent Notifications", NotificationDisplayType.NONE, true); @@ -128,7 +128,7 @@ public class VcsNotifier { @NotNull public Notification notifyMinorWarning(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - return notify(MINOR_NOTIFICATION, title, message, NotificationType.WARNING, listener); + return notify(STANDARD_NOTIFICATION, title, message, NotificationType.WARNING, listener); } @NotNull @@ -158,7 +158,7 @@ public class VcsNotifier { @NotNull public Notification notifyMinorInfo(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - return notify(MINOR_NOTIFICATION, title, message, NotificationType.INFORMATION, listener); + return notify(STANDARD_NOTIFICATION, title, message, NotificationType.INFORMATION, listener); } public Notification logInfo(@NotNull String title, @NotNull String message) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java index 8c570d85d086..d637c001bd80 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java @@ -56,7 +56,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import static com.intellij.openapi.vcs.VcsNotifier.IMPORTANT_ERROR_NOTIFICATION; +import static com.intellij.openapi.vcs.VcsNotifier.STANDARD_NOTIFICATION; public class CommitHelper { public static final Key DOCUMENT_BEING_COMMITTED_KEY = new Key("DOCUMENT_BEING_COMMITTED"); @@ -201,7 +201,7 @@ public class CommitHelper { title = "Committed Successfully"; type = NotificationType.INFORMATION; } - VcsNotifier.createNotification(IMPORTANT_ERROR_NOTIFICATION, title, getCommitSummary(processor), type, null).notify(myProject); + VcsNotifier.createNotification(STANDARD_NOTIFICATION, title, getCommitSummary(processor), type, null).notify(myProject); } @NotNull