[freenet-cvs] r16884 - trunk/freenet/src/freenet/node/useralerts

[robert at freenetproject.org]

Author: robert
Date: 2008-01-04 17:07:15 +0000 (Fri, 04 Jan 2008)
New Revision: 16884

Modified:
   trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
Log:
cosmetic: only show 'total' errors if it might be interesting, missing space


Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java	2008-01-04 15:32:40 UTC (rev 16883)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java	2008-01-04 17:07:15 UTC (rev 16884)
@@ -176,33 +176,38 @@
 			return new HTMLNode("#", "");
 		
 		boolean separatorNeeded = false;
+		int messageTypes=0;
 		StringBuffer alertSummaryString = new StringBuffer(1024);
 		if (numberOfCriticalError != 0) {
 			alertSummaryString.append(l10n("criticalErrorCountLabel")).append(' ').append(numberOfCriticalError);
 			separatorNeeded = true;
+			messageTypes++;
 		}
 		if (numberOfError != 0) {
 			if (separatorNeeded)
 				alertSummaryString.append(" | ");
 			alertSummaryString.append(l10n("errorCountLabel")).append(' ').append(numberOfError);
 			separatorNeeded = true;
+			messageTypes++;
 		}
 		if (numberOfWarning != 0) {
 			if (separatorNeeded)
 				alertSummaryString.append(" | ");
 			alertSummaryString.append(l10n("warningCountLabel")).append(' ').append(numberOfWarning);
 			separatorNeeded = true;
+			messageTypes++;
 		}
 		if (numberOfMinor != 0) {
 			if (separatorNeeded)
 				alertSummaryString.append(" | ");
 			alertSummaryString.append(l10n("minorCountLabel")).append(' ').append(numberOfMinor);
 			separatorNeeded = true;
+			messageTypes++;
 		}
-		if (separatorNeeded)
+		if (messageTypes > 1) {
 			alertSummaryString.append(" | ");
-		alertSummaryString.append(l10n("totalLabel")).append(totalNumber);
-
+			alertSummaryString.append(l10n("totalLabel")).append(' ').append(totalNumber);
+		}
 		HTMLNode summaryBox = null;
 
 		if (highestLevel <= UserAlert.CRITICAL_ERROR)