--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/web/ViewCircuitBreaker.java	2009/10/19 14:04:40	448
+++ CircuitBreaker/src/dk/thoerup/circuitbreaker/web/ViewCircuitBreaker.java	2010/03/08 09:46:10	624
@@ -1,13 +1,13 @@
-package dk.thoerup.curcuitbreaker.web;
+package dk.thoerup.circuitbreaker.web;
 
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.thoerup.curcuitbreaker.AccountingCircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
+import dk.thoerup.circuitbreaker.AccountingCircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 
 public class ViewCircuitBreaker implements Command {
 	
@@ -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(  breaker ).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,11 @@
 			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 failure</td><td>").append( new Date(acb.getLastFailure()).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 reset</td><td>").append( new Date(acb.getLastReset()).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");