MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-110144

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2013-07-25 18:06:03 +04:00
parent c588d9c992
commit df1def9dc9
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+12 -4
View File
@@ -119,7 +119,7 @@ public class CommitHelper {
ProgressManager.getInstance().runProcessWithProgressSynchronously(action, myActionName, true, myProject);
boolean success = doesntContainErrors(processor.getVcsExceptions());
if (success) {
reportSuccess(processor);
reportResult(processor);
}
return success;
}
@@ -140,7 +140,7 @@ public class CommitHelper {
@Override
public NotificationInfo notifyFinished() {
if (myCustomResultHandler == null) {
String text = reportSuccess(processor);
String text = reportResult(processor);
return new NotificationInfo("VCS Commit", "VCS Commit Finished", text, true);
}
return null;
@@ -182,7 +182,7 @@ public class CommitHelper {
}
}
private String reportSuccess(GeneralCommitProcessor processor) {
private String reportResult(GeneralCommitProcessor processor) {
final List<Change> changesFailedToCommit = processor.getChangesFailedToCommit();
int failed = changesFailedToCommit.size();
@@ -197,10 +197,18 @@ public class CommitHelper {
content.append("\n");
content.append(s);
}
VcsBalloonProblemNotifier.NOTIFICATION_GROUP.createNotification(content.toString(), NotificationType.INFORMATION).notify(myProject);
NotificationType notificationType = resolveNotificationType(processor);
VcsBalloonProblemNotifier.NOTIFICATION_GROUP.createNotification(content.toString(), notificationType).notify(myProject);
return text;
}
private static NotificationType resolveNotificationType(@NotNull GeneralCommitProcessor processor) {
boolean hasExceptions = !processor.getVcsExceptions().isEmpty();
boolean hasOnlyWarnings = doesntContainErrors(processor.getVcsExceptions());
return hasExceptions ? (hasOnlyWarnings ? NotificationType.WARNING : NotificationType.ERROR) : NotificationType.INFORMATION;
}
/*
Commit message is passed to NotificationManagerImpl#doNotify and displayed as HTML.
Thus HTML tag braces (< and >) should be escaped,