Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2016-04-18 16:37:46 (GMT) |
|---|---|---|
| committer | Alan Young <consult.awy@gmail.com> | 2016-04-20 16:29:51 (GMT) |
| commit | 9d50093bee736d2b7b43756e9a41cfafbd568ee2 (patch) | |
| tree | 50923023315027b6a099f7349506868d58b4d736 /src/com/isode/stroke/signals/Signal3.java | |
| parent | 82f43f69b1cdb1d2f6cd11c64a71dc99c8533d5a (diff) | |
| download | stroke-9d50093bee736d2b7b43756e9a41cfafbd568ee2.zip stroke-9d50093bee736d2b7b43756e9a41cfafbd568ee2.tar.bz2 | |
Rework Signals for time and space optimizations
Each Signal* class extends BaseSignal. Each Slot* class extends
BaseSlot.
BaseSignal manages the set of binds associated with it via addBind() and
getBinds() which are called from Signal*. It is optimized for the cases
of zero or one bind, only allocating a HashMap to hold a larger set when
needed.
The interaction with SignalConnection to handle disconnection is
effected via a callback interface rather than another Signal.
Change-Id: Ifa44c1eb40b778c303db947a6e74fe20d1b41a90
Diffstat (limited to 'src/com/isode/stroke/signals/Signal3.java')
| -rw-r--r-- | src/com/isode/stroke/signals/Signal3.java | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/src/com/isode/stroke/signals/Signal3.java b/src/com/isode/stroke/signals/Signal3.java index b9151dc..014f047 100644 --- a/src/com/isode/stroke/signals/Signal3.java +++ b/src/com/isode/stroke/signals/Signal3.java @@ -1,15 +1,10 @@ /* - * Copyright (c) 2012, Isode Limited, London, England. + * Copyright (c) 2010-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; /** * An approximation of the boost::signals system with 3 parameters @@ -17,24 +12,14 @@ import java.util.Map; * @param <T2> Type 2 * @param <T3> Type 3 */ -public class Signal3<T1, T2, T3> { - private final Map<SignalConnection, Slot3<T1, T2,T3> > binds_ = Collections.synchronizedMap( - new HashMap<SignalConnection, Slot3<T1, T2,T3> >()); - +public class Signal3<T1, T2, T3> extends BaseSignal { /** * Add a slot which will be notified * @param bind slot, not null * @return signal connection */ public SignalConnection connect(Slot3<T1, T2,T3> 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); } /** @@ -43,18 +28,12 @@ public class Signal3<T1, T2, T3> { * @param p2 parameter value 2 * @param p3 parameter value 3 */ - public void emit(T1 p1, T2 p2,T3 p3) { - List<Slot3<T1,T2, T3>> binds = new ArrayList<Slot3<T1, T2, T3>>(); - binds.addAll(binds_.values()); - for (Slot3<T1, T2, T3> bind : binds) { - bind.call(p1, p2, p3); + @SuppressWarnings("unchecked") + public void emit(T1 p1, T2 p2, T3 p3) { + final BaseSlot[] binds = getBinds(); + if (binds == null) {return;} + for (BaseSlot bind : binds) { + ((Slot3<T1, T2, T3>)bind).call(p1, p2, p3); } } - - /** - * Remove all slots(listeners) - */ - public void disconnectAll() { - binds_.clear(); - } } |