From debf5bcc57b7f7e689404be2b32aa946ff70b144 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Sat, 5 Feb 2011 20:53:42 +0100
Subject: [PATCH] Renamed WebServer to HttpServer and WebServerRequest to
 HttpServerConnection.

---
 src/main/java/org/dynmap/DynmapPlugin.java                | 8 ++++----
 src/main/java/org/dynmap/web/HttpResponse.java            | 2 +-
 .../org/dynmap/web/{WebServer.java => HttpServer.java}    | 6 +++---
 .../{WebServerRequest.java => HttpServerConnection.java}  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/main/java/org/dynmap/web/{WebServer.java => HttpServer.java} (89%)
 rename src/main/java/org/dynmap/web/{WebServerRequest.java => HttpServerConnection.java} (96%)

diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index 8e360a95..b35c5a4b 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -17,7 +17,7 @@ import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.config.Configuration;
 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.ClientUpdateHandler;
 import org.dynmap.web.handlers.FilesystemHandler;
@@ -26,7 +26,7 @@ public class DynmapPlugin extends JavaPlugin {
 
     protected static final Logger log = Logger.getLogger("Minecraft");
 
-    private WebServer webServer = null;
+    private HttpServer webServer = null;
     private MapManager mapManager = null;
     private PlayerList playerList;
 
@@ -47,7 +47,7 @@ public class DynmapPlugin extends JavaPlugin {
         return mapManager;
     }
 
-    public WebServer getWebServer() {
+    public HttpServer getWebServer() {
         return webServer;
     }
 
@@ -75,7 +75,7 @@ public class DynmapPlugin extends JavaPlugin {
         }
         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("/tiles/", new FilesystemHandler(mapManager.tileDirectory));
         webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld()));
diff --git a/src/main/java/org/dynmap/web/HttpResponse.java b/src/main/java/org/dynmap/web/HttpResponse.java
index e7fbb928..2e0622f8 100644
--- a/src/main/java/org/dynmap/web/HttpResponse.java
+++ b/src/main/java/org/dynmap/web/HttpResponse.java
@@ -14,7 +14,7 @@ public class HttpResponse {
     private OutputStream body;
     public OutputStream getBody() throws IOException {
         if (body != null) {
-            WebServerRequest.writeResponseHeader(body, this);
+            HttpServerConnection.writeResponseHeader(body, this);
             OutputStream b = body;
             body = null;
             return b;
diff --git a/src/main/java/org/dynmap/web/WebServer.java b/src/main/java/org/dynmap/web/HttpServer.java
similarity index 89%
rename from src/main/java/org/dynmap/web/WebServer.java
rename to src/main/java/org/dynmap/web/HttpServer.java
index 89914e18..35ab5319 100644
--- a/src/main/java/org/dynmap/web/WebServer.java
+++ b/src/main/java/org/dynmap/web/HttpServer.java
@@ -10,7 +10,7 @@ import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class WebServer extends Thread {
+public class HttpServer extends Thread {
     protected static final Logger log = Logger.getLogger("Minecraft");
 
     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 WebServer(InetAddress bindAddress, int port) {
+    public HttpServer(InetAddress bindAddress, int port) {
         this.bindAddress = bindAddress;
         this.port = port;
     }
@@ -38,7 +38,7 @@ public class WebServer extends Thread {
             while (running) {
                 try {
                     Socket socket = sock.accept();
-                    WebServerRequest requestThread = new WebServerRequest(socket, this);
+                    HttpServerConnection requestThread = new HttpServerConnection(socket, this);
                     requestThread.start();
                 } catch (IOException e) {
                     log.info("map WebServer.run() stops with IOException");
diff --git a/src/main/java/org/dynmap/web/WebServerRequest.java b/src/main/java/org/dynmap/web/HttpServerConnection.java
similarity index 96%
rename from src/main/java/org/dynmap/web/WebServerRequest.java
rename to src/main/java/org/dynmap/web/HttpServerConnection.java
index 92c4817f..cff0779f 100644
--- a/src/main/java/org/dynmap/web/WebServerRequest.java
+++ b/src/main/java/org/dynmap/web/HttpServerConnection.java
@@ -13,13 +13,13 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class WebServerRequest extends Thread {
+public class HttpServerConnection extends Thread {
     protected static final Logger log = Logger.getLogger("Minecraft");
 
     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.server = server;
     }