summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/isode/stroke/signals/Signal4.java')
-rw-r--r--src/com/isode/stroke/signals/Signal4.java40
1 files changed, 8 insertions, 32 deletions
diff --git a/src/com/isode/stroke/signals/Signal4.java b/src/com/isode/stroke/signals/Signal4.java
index 6a29641..edf30ed 100644
--- a/src/com/isode/stroke/signals/Signal4.java
+++ b/src/com/isode/stroke/signals/Signal4.java
@@ -1,18 +1,10 @@
/*
- * Copyright (c) 2012-2013, Isode Limited, London, England.
+ * Copyright (c) 2012-2015, Isode Limited, London, England.
* All rights reserved.
*/
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 Signal4<T1, T2, T3, T4> {
- private final Map<SignalConnection, Slot4<T1, T2, T3, T4> > binds_ = Collections.synchronizedMap(
- new HashMap<SignalConnection, Slot4<T1, T2, T3, T4> >());
-
+public class Signal4<T1, T2, T3, T4> extends BaseSignal {
/**
* Add a slot which will be notified
* @param bind slot, not null
* @return signal connection
*/
public SignalConnection connect(Slot4<T1, T2, T3, T4> 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 Signal4<T1, T2, T3, T4> {
* @param p3 parameter value 3
* @param p4 parameter value 4
*/
+ @SuppressWarnings("unchecked")
public void emit(T1 p1, T2 p2, T3 p3, T4 p4) {
- List<Slot4<T1, T2, T3, T4>> binds = new ArrayList<Slot4<T1, T2, T3, T4>>();
- binds.addAll(binds_.values());
- for (Slot4<T1, T2, T3, T4> bind : binds) {
- bind.call(p1, p2, p3, p4);
+ final BaseSlot[] binds = getBinds();
+ if (binds == null) {return;}
+ for (BaseSlot bind : binds) {
+ ((Slot4<T1, T2, T3, T4>)bind).call(p1, p2, p3, p4);
}
}
-
- /**
- * Remove all slots(listeners)
- */
- public void disconnectAll() {
- binds_.clear();
- }
}