1 files changed, 7 insertions, 31 deletions
diff --git a/src/com/isode/stroke/signals/Signal7.java b/src/com/isode/stroke/signals/Signal7.java
index 296cc02..bbf6559 100644
--- a/src/com/isode/stroke/signals/Signal7.java
+++ b/src/com/isode/stroke/signals/Signal7.java
@@ -5,14 +5,6 @@
 
 package com.isode.stroke.signals;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.isode.stroke.signals.SignalConnection;
-import com.isode.stroke.signals.Slot;
 
 
 /**
@@ -22,24 +14,14 @@ import com.isode.stroke.signals.Slot;
  * @param <T3> Type 3
  * @param <T4> Type 4
  */
-public class Signal7<T1, T2, T3, T4, T5, T6, T7> {
-    private final Map<SignalConnection, Slot7<T1, T2, T3, T4, T5, T6, T7> > binds_ = Collections.synchronizedMap(
-            new HashMap<SignalConnection, Slot7<T1, T2, T3, T4, T5, T6, T7> >());
-
+public class Signal7<T1, T2, T3, T4, T5, T6, T7> extends BaseSignal {
     /**
      * Add a slot which will be notified
      * @param bind slot, not null
      * @return signal connection
      */
     public SignalConnection connect(Slot7<T1, T2, T3, T4, T5, T6, T7> bind) {
-        final SignalConnection connection = new SignalConnection();
-        binds_.put(connection, bind);
-        connection.onDestroyed.connect(new Slot() {
-            public void call() {
-                binds_.remove(connection);
-            }
-        });
-        return connection;
+        return addBind(bind);
     }
 
     /**
@@ -49,18 +31,12 @@ public class Signal7<T1, T2, T3, T4, T5, T6, T7> {
      * @param p3 parameter value 3
      * @param p4 parameter value 4
      */
+    @SuppressWarnings("unchecked")
     public void emit(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7) {
-        List<Slot7<T1, T2, T3, T4, T5, T6, T7>> binds = new ArrayList<Slot7<T1, T2, T3, T4, T5, T6, T7>>();
-        binds.addAll(binds_.values());
-        for (Slot7<T1, T2, T3, T4, T5, T6, T7> bind : binds) {
-            bind.call(p1, p2, p3, p4, p5, p6, p7);
+        final BaseSlot[] binds = getBinds();
+        if (binds == null) {return;}
+        for (BaseSlot bind : binds) {
+            ((Slot7<T1, T2, T3, T4, T5, T6, T7>)bind).call(p1, p2, p3, p4, p5, p6, p7);
         }
     }
-
-    /**
-     * Remove all slots(listeners)
-     */
-    public void disconnectAll() {
-        binds_.clear();
-    }
 }