From a928fae69e8c04eff45fd10bfa8c4ffd2b7b72f6 Mon Sep 17 00:00:00 2001 From: Naoyuki Kanezawa Date: Sat, 12 Jul 2014 22:54:00 +0900 Subject: [PATCH] add Manager.Options --- .../com/github/nkzawa/socketio/client/IO.java | 9 +-------- .../github/nkzawa/socketio/client/Manager.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/github/nkzawa/socketio/client/IO.java b/src/main/java/com/github/nkzawa/socketio/client/IO.java index 0646a41..004048f 100644 --- a/src/main/java/com/github/nkzawa/socketio/client/IO.java +++ b/src/main/java/com/github/nkzawa/socketio/client/IO.java @@ -79,7 +79,7 @@ public class IO { } - public static class Options extends com.github.nkzawa.engineio.client.Socket.Options { + public static class Options extends Manager.Options { public boolean forceNew; @@ -87,12 +87,5 @@ public class IO { * Whether to enable multiplexing. Default is true. */ public boolean multiplex = true; - - public boolean reconnection = true; - public int reconnectionAttempts; - public long reconnectionDelay; - public long reconnectionDelayMax; - public long timeout = -1; - } } diff --git a/src/main/java/com/github/nkzawa/socketio/client/Manager.java b/src/main/java/com/github/nkzawa/socketio/client/Manager.java index 35f86cc..9cc62c4 100644 --- a/src/main/java/com/github/nkzawa/socketio/client/Manager.java +++ b/src/main/java/com/github/nkzawa/socketio/client/Manager.java @@ -81,7 +81,7 @@ public class Manager extends Emitter { private URI uri; private List packetBuffer; private Queue subs; - private IO.Options opts; + private Options opts; /*package*/ com.github.nkzawa.engineio.client.Socket engine; private Parser.Encoder encoder; private Parser.Decoder decoder; @@ -103,13 +103,13 @@ public class Manager extends Emitter { this(uri, null); } - public Manager(IO.Options opts) { + public Manager(Options opts) { this(null, opts); } - public Manager(URI uri, IO.Options opts) { + public Manager(URI uri, Options opts) { if (opts == null) { - opts = new IO.Options(); + opts = new Options(); } if (opts.path == null) { opts.path = "/socket.io"; @@ -487,4 +487,13 @@ public class Manager extends Emitter { super(uri, opts); } } + + public static class Options extends com.github.nkzawa.engineio.client.Socket.Options { + + public boolean reconnection = true; + public int reconnectionAttempts; + public long reconnectionDelay; + public long reconnectionDelayMax; + public long timeout = -1; + } }