Cleanup

3 files changed, 52 insertions, 51 deletions

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c909832..9d6faf3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java" afterPath="$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/nanohttpd.iml" afterPath="$PROJECT_DIR$/nanohttpd.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java" afterPath="$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java" />
     </list>
     <ignored path="nanohttpd.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -21,7 +19,7 @@
     <file path="/LIST.java" changelist="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" time="1357443608691" ignored="false" />
     <file path="/HandlerDescriptor.java" changelist="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" time="1357489582772" ignored="false" />
     <file path="/TestHandlerDescriptor.java" changelist="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" time="1357489482343" ignored="false" />
-    <file path="/SimpleWebServer.java" changelist="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" time="1357565495754" ignored="false" />
+    <file path="/SimpleWebServer.java" changelist="301e7f25-4e5f-447c-992d-35ddc6a6b2d1" time="1357570151008" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,21 +78,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="NanoHTTPD.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="NanoHTTPD.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="68" column="13" selection-start="2587" selection-end="2587" vertical-scroll-proportion="0.0">
+            <state line="65" column="0" selection-start="2485" selection-end="2485" vertical-scroll-proportion="-15.761719">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SimpleWebServer.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="SimpleWebServer.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="170" column="51" selection-start="8110" selection-end="8110" vertical-scroll-proportion="0.7791045">
+            <state line="16" column="11" selection-start="437" selection-end="437" vertical-scroll-proportion="0.0">
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="initializer##0;class#SimpleWebServer#0" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -128,8 +127,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/caffeinatedbliss/restful/config/HandlerDescriptor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/caffeinatedbliss/restful/example/ExampleHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/caffeinatedbliss/restful/RestServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java" />
         <option value="$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java" />
+        <option value="$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java" />
       </list>
     </option>
   </component>
@@ -499,7 +498,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14769231" sideWeight="0.67992765" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32007232" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32007232" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -626,22 +625,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="68" column="13" selection-start="2587" selection-end="2587" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/fi/iki/elonen/SimpleWebServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="170" column="51" selection-start="8110" selection-end="8110" vertical-scroll-proportion="0.7791045">
+        <state line="16" column="11" selection-start="437" selection-end="437" vertical-scroll-proportion="0.0">
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="initializer##0;class#SimpleWebServer#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/fi/iki/elonen/NanoHTTPD.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="65" column="0" selection-start="2485" selection-end="2485" vertical-scroll-proportion="-15.761719">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/fi/iki/elonen/NanoHTTPD.java b/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 2cf5de9..3aee0ed 100644
--- a/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -63,39 +63,6 @@ import java.util.TimeZone;
  * See the end of the source file for distribution license (Modified BSD licence)
  */
 public abstract class NanoHTTPD {
-    /**
-     * Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE
-     */
-    protected static final Map<String, String> MIME_TYPES;
-    static {
-        Map<String, String> mime = new HashMap<String, String>();
-        mime.put("css", "text/css");
-        mime.put("htm", "text/html");
-        mime.put("html", "text/html");
-        mime.put("xml", "text/xml");
-        mime.put("txt", "text/plain");
-        mime.put("asc", "text/plain");
-        mime.put("gif", "image/gif");
-        mime.put("jpg", "image/jpeg");
-        mime.put("jpeg", "image/jpeg");
-        mime.put("png", "image/png");
-        mime.put("mp3", "audio/mpeg");
-        mime.put("m3u", "audio/mpeg-url");
-        mime.put("mp4", "video/mp4");
-        mime.put("ogv", "video/ogg");
-        mime.put("flv", "video/x-flv");
-        mime.put("mov", "video/quicktime");
-        mime.put("swf", "application/x-shockwave-flash");
-        mime.put("js", "application/javascript");
-        mime.put("pdf", "application/pdf");
-        mime.put("doc", "application/msword");
-        mime.put("ogg", "application/x-ogg");
-        mime.put("zip", "application/octet-stream");
-        mime.put("exe", "application/octet-stream");
-        mime.put("class", "application/octet-stream");
-        MIME_TYPES = mime;
-    }
-
     public enum METHOD {
         GET, PUT, POST, DELETE;
 
diff --git a/src/main/java/fi/iki/elonen/SimpleWebServer.java b/src/main/java/fi/iki/elonen/SimpleWebServer.java
index 4fc8b64..e044577 100644
--- a/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -5,12 +5,46 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
 
 public class SimpleWebServer extends NanoHTTPD {
     /**
+     * Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE
+     */
+    private static final Map<String, String> MIME_TYPES;
+    static {
+        Map<String, String> mime = new HashMap<String, String>();
+        mime.put("css", "text/css");
+        mime.put("htm", "text/html");
+        mime.put("html", "text/html");
+        mime.put("xml", "text/xml");
+        mime.put("txt", "text/plain");
+        mime.put("asc", "text/plain");
+        mime.put("gif", "image/gif");
+        mime.put("jpg", "image/jpeg");
+        mime.put("jpeg", "image/jpeg");
+        mime.put("png", "image/png");
+        mime.put("mp3", "audio/mpeg");
+        mime.put("m3u", "audio/mpeg-url");
+        mime.put("mp4", "video/mp4");
+        mime.put("ogv", "video/ogg");
+        mime.put("flv", "video/x-flv");
+        mime.put("mov", "video/quicktime");
+        mime.put("swf", "application/x-shockwave-flash");
+        mime.put("js", "application/javascript");
+        mime.put("pdf", "application/pdf");
+        mime.put("doc", "application/msword");
+        mime.put("ogg", "application/x-ogg");
+        mime.put("zip", "application/octet-stream");
+        mime.put("exe", "application/octet-stream");
+        mime.put("class", "application/octet-stream");
+        MIME_TYPES = mime;
+    }
+
+    /**
      * The distribution licence
      */
     private static final String LICENCE = "Copyright (C) 2001,2005-2011 by Jarno Elonen <elonen@iki.fi>\n"