--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/jmx/JmxAccountingCircuitBreaker.java	2009/10/06 21:23:49	402
+++ CircuitBreaker/src/dk/thoerup/curcuitbreaker/jmx/JmxAccountingCircuitBreaker.java	2009/10/07 04:17:45	404
@@ -2,34 +2,15 @@
 
 import dk.thoerup.curcuitbreaker.AccountingCircuitBreaker;
 
-public class JmxAccountingCircuitBreaker implements JmxAccountingCircuitBreakerMBean {
+public class JmxAccountingCircuitBreaker extends JmxCircuitBreaker implements JmxAccountingCircuitBreakerMBean {
 
 	private AccountingCircuitBreaker cb;
 	
 	public JmxAccountingCircuitBreaker(AccountingCircuitBreaker cb) {
+		super(cb);
 		this.cb = cb;
 	}
 
-	
-	
-	//default section
-	
-	public String getName() {
-		return cb.getName();
-	}
-	
-	public String getStateName() {
-		return cb.getStateName();
-	}
-
-	public void reset() {
-		cb.reset();
-
-	}
-
-	public void tripBreaker() {
-		cb.tripBreaker();
-	}
     
     //Accounting section
     
@@ -41,12 +22,16 @@
 		return cb.getBlockCount();
 	}
 	
-	public int getFailureCount() {
-		return cb.getFailureCount();
+	public int getTotalFailureCount() {
+		return cb.getTotalFailureCount();
+	}
+	
+	public long getLastResetCounters() {
+		return cb.getLastResetCounters();
 	}
 	
-	public long getLastReset() {
-		return cb.getLastReset();
+	public int getTotalCallCount() {
+		return cb.getTotalCallCount();
 	}
 	
 	public void resetCounters() {