Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Renamed WebServer to HttpServer and WebServerRequest to HttpServerConnection.

Browse source
This commit is contained in:
FrozenCow 2011-02-05 20:53:42 +01:00
parent 6cd10e21bc
commit 4f1c932c67
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/dynmap/DynmapPlugin.java
View file

@ -17,7 +17,7 @@ import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
import org.dynmap.debug.BukkitPlayerDebugger; import org.dynmap.debug.BukkitPlayerDebugger;
import org.dynmap.web.WebServer; import org.dynmap.web.HttpServer;
import org.dynmap.web.handlers.ClientConfigurationHandler; import org.dynmap.web.handlers.ClientConfigurationHandler;
import org.dynmap.web.handlers.ClientUpdateHandler; import org.dynmap.web.handlers.ClientUpdateHandler;
import org.dynmap.web.handlers.FilesystemHandler; import org.dynmap.web.handlers.FilesystemHandler;
@ -26,7 +26,7 @@ public class DynmapPlugin extends JavaPlugin {
protected static final Logger log = Logger.getLogger("Minecraft"); protected static final Logger log = Logger.getLogger("Minecraft");
private WebServer webServer = null; private HttpServer webServer = null;
private MapManager mapManager = null; private MapManager mapManager = null;
private PlayerList playerList; private PlayerList playerList;
@ -47,7 +47,7 @@ public class DynmapPlugin extends JavaPlugin {
return mapManager; return mapManager;
} }
public WebServer getWebServer() { public HttpServer getWebServer() {
return webServer; return webServer;
} }
@ -75,7 +75,7 @@ public class DynmapPlugin extends JavaPlugin {
} }
int port = configuration.getInt("webserver-port", 8123); int port = configuration.getInt("webserver-port", 8123);
webServer = new WebServer(bindAddress, port); webServer = new HttpServer(bindAddress, port);
webServer.handlers.put("/", new FilesystemHandler(mapManager.webDirectory)); webServer.handlers.put("/", new FilesystemHandler(mapManager.webDirectory));
webServer.handlers.put("/tiles/", new FilesystemHandler(mapManager.tileDirectory)); webServer.handlers.put("/tiles/", new FilesystemHandler(mapManager.tileDirectory));
webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld())); webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld()));

2
src/main/java/org/dynmap/web/HttpResponse.java
View file

@ -14,7 +14,7 @@ public class HttpResponse {
private OutputStream body; private OutputStream body;
public OutputStream getBody() throws IOException { public OutputStream getBody() throws IOException {
if (body != null) { if (body != null) {
WebServerRequest.writeResponseHeader(body, this); HttpServerConnection.writeResponseHeader(body, this);
OutputStream b = body; OutputStream b = body;
body = null; body = null;
return b; return b;

6
src/main/java/org/dynmap/web/WebServer.java → src/main/java/org/dynmap/web/HttpServer.java
View file

@ -10,7 +10,7 @@ import java.util.TreeMap;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
public class WebServer extends Thread { public class HttpServer extends Thread {
protected static final Logger log = Logger.getLogger("Minecraft"); protected static final Logger log = Logger.getLogger("Minecraft");
private ServerSocket sock = null; private ServerSocket sock = null;
@ -21,7 +21,7 @@ public class WebServer extends Thread {
public SortedMap<String, HttpHandler> handlers = new TreeMap<String, HttpHandler>(Collections.reverseOrder()); public SortedMap<String, HttpHandler> handlers = new TreeMap<String, HttpHandler>(Collections.reverseOrder());
public WebServer(InetAddress bindAddress, int port) { public HttpServer(InetAddress bindAddress, int port) {
this.bindAddress = bindAddress; this.bindAddress = bindAddress;
this.port = port; this.port = port;
} }
@ -38,7 +38,7 @@ public class WebServer extends Thread {
while (running) { while (running) {
try { try {
Socket socket = sock.accept(); Socket socket = sock.accept();
WebServerRequest requestThread = new WebServerRequest(socket, this); HttpServerConnection requestThread = new HttpServerConnection(socket, this);
requestThread.start(); requestThread.start();
} catch (IOException e) { } catch (IOException e) {
log.info("map WebServer.run() stops with IOException"); log.info("map WebServer.run() stops with IOException");

6
src/main/java/org/dynmap/web/WebServerRequest.java → src/main/java/org/dynmap/web/HttpServerConnection.java
View file

@ -13,13 +13,13 @@ import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class WebServerRequest extends Thread { public class HttpServerConnection extends Thread {
protected static final Logger log = Logger.getLogger("Minecraft"); protected static final Logger log = Logger.getLogger("Minecraft");
private Socket socket; private Socket socket;
private WebServer server; private HttpServer server;
public WebServerRequest(Socket socket, WebServer server) { public HttpServerConnection(Socket socket, HttpServer server) {
this.socket = socket; this.socket = socket;
this.server = server; this.server = server;
} }