--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/web/ViewCircuitBreaker.java	2009/10/08 07:07:14	417
+++ CircuitBreaker/src/dk/thoerup/curcuitbreaker/web/ViewCircuitBreaker.java	2009/10/22 05:25:57	466
@@ -29,13 +29,13 @@
 		return sb.toString();
 	}
 	
-	public String getStateBar(String state) {
+	public String getStateBar(CircuitBreaker breaker) {
 		StringBuilder sb = new StringBuilder();
-		sb.append( state );
+		sb.append( breaker.getStateName() );
 		sb.append(": <span style=\"background-color: ");
-		if (state.equalsIgnoreCase("open")) {
+		if ( breaker.isOpen() ) {
 			sb.append("red");
-		} else if (state.equalsIgnoreCase("closed")) {
+		} else if ( breaker.isClosed() ) {
 			sb.append("green");
 		} else {
 			sb.append("yellow");
@@ -62,7 +62,7 @@
 		sb.append("<b>Attributes:</b>\n");
 		sb.append("<table border=\"1\" cellspacing=0>");		
 		sb.append("<tr><td>Name </td><td>").append(breaker.getName()).append("</td></tr>\n");
-		sb.append("<tr><td>State </td><td><b>").append(  getStateBar(breaker.getStateName())   ).append("</b></td></tr>\n");
+		sb.append("<tr><td>State </td><td><b>").append(  getStateBar(breaker) ).append("</b></td></tr>\n");
 		sb.append("<tr><td>Type </td><td>").append(breaker.getClass().getSimpleName() ).append("</td></tr>\n");
 		sb.append("<tr><td>Notifier </td><td>").append(breaker.getNotifierName()).append("</td></tr>\n");
 		sb.append("<tr><td>Failure count </td><td>").append(breaker.getFailureCount()).append("</td></tr>\n");
@@ -77,7 +77,8 @@
 			sb.append("<tr><td>Block count</td><td>").append( acb.getBlockCount() ).append("</td></tr>\n");
 			sb.append("<tr><td>Total failure count</td><td>").append( acb.getTotalFailureCount() ).append("</td></tr>\n");
 			sb.append("<tr><td>Total Call count</td><td>").append( acb.getTotalCallCount() ).append("</td></tr>\n");
-			sb.append("<tr><td>Last reset</td><td>").append( new Date(acb.getLastResetCounters()).toString() ).append("</td></tr>\n");			
+			sb.append("<tr><td>Last trip</td><td>").append( new Date(acb.getLastTrip()).toString() ).append("</td></tr>\n");
+			sb.append("<tr><td>Last resetCounters</td><td>").append( new Date(acb.getLastResetCounters()).toString() ).append("</td></tr>\n");			
 		}
 		
 		sb.append("</table><br>\n");