summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Young <consult.awy@gmail.com>2016-04-18 16:37:46 (GMT)
committerAlan Young <consult.awy@gmail.com>2016-04-20 16:29:51 (GMT)
commit9d50093bee736d2b7b43756e9a41cfafbd568ee2 (patch)
tree50923023315027b6a099f7349506868d58b4d736 /src/com/isode/stroke/signals/Signal1.java
parent82f43f69b1cdb1d2f6cd11c64a71dc99c8533d5a (diff)
downloadstroke-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/Signal1.java')
-rw-r--r--src/com/isode/stroke/signals/Signal1.java31
1 files changed, 8 insertions, 23 deletions
diff --git a/src/com/isode/stroke/signals/Signal1.java b/src/com/isode/stroke/signals/Signal1.java
index c799d4c..9787096 100644
--- a/src/com/isode/stroke/signals/Signal1.java
+++ b/src/com/isode/stroke/signals/Signal1.java
@@ -1,36 +1,25 @@
/*
- * Copyright (c) 2010, 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.Map;
/**
* An approximation of the boost::signals system, although a little more warty.
*/
-public class Signal1<T1> {
- private final Map<SignalConnection, Slot1<T1> > binds_ = Collections.synchronizedMap(new HashMap<SignalConnection, Slot1<T1> >());
+public final class Signal1<T1> extends BaseSignal {
public SignalConnection connect(Slot1<T1> 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);
}
+ @SuppressWarnings("unchecked")
public void emit(T1 p1) {
- ArrayList<Slot1<T1>> binds = new ArrayList<Slot1<T1>>();
- binds.addAll(binds_.values());
- for (Slot1<T1> bind : binds) {
- bind.call(p1);
+ final BaseSlot[] binds = getBinds();
+ if (binds == null) {return;}
+ for (BaseSlot bind : binds) {
+ ((Slot1<T1>)bind).call(p1);
}
}
@@ -41,8 +30,4 @@ public class Signal1<T1> {
}
});
}
-
- public void disconnectAll() {
- binds_.clear();
- }
}