From 0bf4c3db88992acf673ddb041534126fb6e51e88 Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Sat, 27 Jul 2013 02:34:21 -0400 Subject: [PATCH] Timer to Executor... maybe imports are right now. Timer to Executor... maybe imports are right now. Signed-off-by: Craig Russell --- .../org/spout/aquaduct/AquaductConfiguration.java | 2 +- .../aquaduct/web/AquaductWebSocketHandler.java | 13 +++++++------ .../org/spout/aquaduct/web/ResourceFileHandler.java | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java index 87104db..a53e11d 100644 --- a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java +++ b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java @@ -20,12 +20,12 @@ package org.spout.aquaduct; import java.io.File; + import org.spout.cereal.config.ConfigurationException; import org.spout.cereal.config.ConfigurationHolder; import org.spout.cereal.config.ConfigurationHolderConfiguration; import org.spout.cereal.config.yaml.YamlConfiguration; - public class AquaductConfiguration extends ConfigurationHolderConfiguration { public static ConfigurationHolder BIND_ADDRESS = new ConfigurationHolder((Object) null, "bind.address"); public static ConfigurationHolder BIND_PORT = new ConfigurationHolder(80, "bind.port"); diff --git a/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java b/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java index ba6dfcc..8220573 100644 --- a/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java +++ b/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java @@ -20,11 +20,11 @@ package org.spout.aquaduct.web; import java.io.IOException; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import java.util.HashMap; import java.util.HashSet; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -36,26 +36,27 @@ import com.narrowtux.blueberry.websockets.WebSocketExchange; import com.narrowtux.blueberry.websockets.WebSocketRequestHandler; + public class AquaductWebSocketHandler extends WebSocketRequestHandler { private HashSet connectedClients = new HashSet(); private static final Gson GSON = new Gson(); private HashMap requestHandlers = new HashMap(); private int countup = 1; - private Timer timer = new Timer(); + private ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); public AquaductWebSocketHandler() { super(); setFilter("/websocket/"); - timer.schedule(new TimerTask() { + scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { countup ++; WebClientFrame event = new WebClientEvent("counter", countup); sendEvent(event); } - }, 100, 1000); + }, 100, 1000, TimeUnit.MILLISECONDS); } public void sendEvent(WebClientFrame event) { diff --git a/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java b/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java index 24c46d8..212f923 100644 --- a/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java +++ b/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java @@ -35,7 +35,7 @@ public class ResourceFileHandler extends HttpRequestHandler { private static int BUFFER_SIZE = 512; private static String BASE_PATH = "src/main/resources/"; // TODO configuration - private static MimetypesFileTypeMap MIMETYPES = new MimetypesFileTypeMap(); + private static final MimetypesFileTypeMap MIMETYPES = new MimetypesFileTypeMap(); static { MIMETYPES.addMimeTypes("application/javascript js JS");