chg: replace countdown table with PeriodicClockListeners.

Author: pictavien

lib/jbotsim-core/src/main/java/io/jbotsim/core/ClockManager.java

@@ -21,6 +21,7 @@
 package io.jbotsim.core;
 
 import io.jbotsim.core.event.ClockListener;
+import io.jbotsim.core.event.PeriodicClockListener;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -32,8 +33,7 @@
  */
 public class ClockManager {
     Topology tp;
-    HashMap<ClockListener, Integer> listeners = new HashMap<>();
-    HashMap<ClockListener, Integer> countdown = new HashMap<>();
+    HashMap<ClockListener, ClockListener> listeners = new HashMap<>();
     Class<? extends Clock> clockModel = null;
     Clock clock = null;
     Integer time = 0;
@@ -45,14 +45,7 @@ public class ClockManager {
     }
 
     public void onClock() {
-        List<ClockListener> expiredListeners = new ArrayList<>();
-        for (ClockListener cl : listeners.keySet()) {
-            countdown.put(cl, countdown.get(cl) - 1);
-            if (countdown.get(cl) == 0) {
-                expiredListeners.add(cl);
-                countdown.put(cl, listeners.get(cl));
-            }
-        }
+        List<ClockListener> expiredListeners = new ArrayList<>(listeners.values());
         tp.getScheduler().onClock(tp, expiredListeners);
         time++;
     }
@@ -90,8 +83,7 @@ public void setClockModel(Class<? extends Clock> clockModel) {
      *                 in time units.
      */
     public void addClockListener(ClockListener listener, int period) {
-        listeners.put(listener, period);
-        countdown.put(listener, period);
+        listeners.put(listener, new PeriodicClockListener(tp, listener, period));
     }
 
     /**
@@ -100,8 +92,7 @@ public void addClockListener(ClockListener listener, int period) {
      * @param listener The listener to register.
      */
     public void addClockListener(ClockListener listener) {
-        listeners.put(listener, 1);
-        countdown.put(listener, 1);
+        listeners.put(listener, listener);
     }
 
     /**
@@ -112,7 +103,6 @@ public void addClockListener(ClockListener listener) {
      */
     public void removeClockListener(ClockListener listener) {
         listeners.remove(listener);
-        countdown.remove(listener);
     }
 
     /**