From 6a3f2d841533302ea5992a2631fb99447efd025c Mon Sep 17 00:00:00 2001 From: Naoyuki Kanezawa Date: Tue, 7 May 2013 00:18:45 +0900 Subject: [PATCH] make EventThread public --- .../github/nkzawa/engineio/client/EventThread.java | 4 ++-- .../github/nkzawa/engineio/client/Transport.java | 14 +++----------- .../nkzawa/engineio/client/transports/Polling.java | 5 +++-- .../engineio/client/transports/PollingXHR.java | 9 +++++---- .../engineio/client/transports/WebSocket.java | 13 +++++++------ 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/github/nkzawa/engineio/client/EventThread.java b/src/main/java/com/github/nkzawa/engineio/client/EventThread.java index a93186d..23eddf1 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/EventThread.java +++ b/src/main/java/com/github/nkzawa/engineio/client/EventThread.java @@ -7,9 +7,9 @@ import java.util.concurrent.ThreadFactory; /** - * The main thread for Engine.IO Client. + * The main thread for event loop. */ -class EventThread extends Thread { +public class EventThread extends Thread { private static final ExecutorService service = Executors.newSingleThreadExecutor(new ThreadFactory() { @Override diff --git a/src/main/java/com/github/nkzawa/engineio/client/Transport.java b/src/main/java/com/github/nkzawa/engineio/client/Transport.java index b72cecb..5102c5a 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/Transport.java +++ b/src/main/java/com/github/nkzawa/engineio/client/Transport.java @@ -55,7 +55,7 @@ public abstract class Transport extends Emitter { } public Transport open() { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { if (Transport.this.readyState == ReadyState.CLOSED || Transport.this.readyState == null) { @@ -68,7 +68,7 @@ public abstract class Transport extends Emitter { } public Transport close() { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { if (Transport.this.readyState == ReadyState.OPENING || Transport.this.readyState == ReadyState.OPEN) { @@ -81,7 +81,7 @@ public abstract class Transport extends Emitter { } public void send(final Packet[] packets) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { if (Transport.this.readyState == ReadyState.OPEN) { @@ -118,14 +118,6 @@ public abstract class Transport extends Emitter { abstract protected void doClose(); - protected static void exec(Runnable task) { - EventThread.exec(task); - } - - protected static void nextTick(Runnable task) { - EventThread.nextTick(task); - } - public static class Options { diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java b/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java index 33f8dd7..1a43359 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java @@ -1,6 +1,7 @@ package com.github.nkzawa.engineio.client.transports; +import com.github.nkzawa.engineio.client.EventThread; import com.github.nkzawa.engineio.client.Transport; import com.github.nkzawa.engineio.client.Util; import com.github.nkzawa.engineio.parser.Packet; @@ -33,7 +34,7 @@ abstract public class Polling extends Transport { } public void pause(final Runnable onPause) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { final Polling self = Polling.this; @@ -50,7 +51,7 @@ abstract public class Polling extends Transport { }; if (Polling.this.polling || !Polling.this.writable) { - final int[] total = new int[] {0}; + final int[] total = new int[]{0}; if (Polling.this.polling) { logger.fine("we are currently polling - waiting to pause"); diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java index 2c6f2fb..d59adb4 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java @@ -2,6 +2,7 @@ package com.github.nkzawa.engineio.client.transports; import com.github.nkzawa.emitter.Emitter; +import com.github.nkzawa.engineio.client.EventThread; import java.io.*; import java.net.HttpURLConnection; @@ -42,7 +43,7 @@ public class PollingXHR extends Polling { req.on(Request.EVENT_SUCCESS, new Listener() { @Override public void call(Object... args) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { fn.run(); @@ -53,7 +54,7 @@ public class PollingXHR extends Polling { req.on(Request.EVENT_ERROR, new Listener() { @Override public void call(final Object... args) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { Exception err = args.length > 0 && args[0] instanceof Exception ? (Exception)args[0] : null; @@ -73,7 +74,7 @@ public class PollingXHR extends Polling { req.on(Request.EVENT_DATA, new Listener() { @Override public void call(final Object... args) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { String data = args.length > 0 ? (String) args[0] : null; @@ -85,7 +86,7 @@ public class PollingXHR extends Polling { req.on(Request.EVENT_ERROR, new Listener() { @Override public void call(final Object... args) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { Exception err = args.length > 0 && args[0] instanceof Exception ? (Exception) args[0] : null; diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java index bc0a217..aedbe75 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java @@ -1,6 +1,7 @@ package com.github.nkzawa.engineio.client.transports; +import com.github.nkzawa.engineio.client.EventThread; import com.github.nkzawa.engineio.client.Transport; import com.github.nkzawa.engineio.client.Util; import com.github.nkzawa.engineio.parser.Packet; @@ -44,7 +45,7 @@ public class WebSocket extends Transport { this.socket = new WebSocketClient(new URI(this.uri()), new Draft_17()) { @Override public void onOpen(ServerHandshake serverHandshake) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { self.onOpen(); @@ -53,7 +54,7 @@ public class WebSocket extends Transport { } @Override public void onClose(int i, String s, boolean b) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { self.onClose(); @@ -62,7 +63,7 @@ public class WebSocket extends Transport { } @Override public void onMessage(final String s) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { self.onData(s); @@ -71,7 +72,7 @@ public class WebSocket extends Transport { } @Override public void onError(final Exception e) { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { self.onError("websocket error", e); @@ -104,7 +105,7 @@ public class WebSocket extends Transport { this.bufferedAmountId = this.drainScheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { - exec(new Runnable() { + EventThread.exec(new Runnable() { @Override public void run() { if (!self.socket.getConnection().hasBufferedData()) { @@ -116,7 +117,7 @@ public class WebSocket extends Transport { } }, 50, 50, TimeUnit.MILLISECONDS); } else { - nextTick(ondrain); + EventThread.nextTick(ondrain); } }