Merge pull request #171 from vorburger/FixedSomeAllWarningsShownInEclipse

Fixed a bunch of warnings (from Eclipse). Closes #171 

2 files changed, 5 insertions, 3 deletions

diff --git a/webserver/src/main/java/fi/iki/elonen/ServerRunner.java b/webserver/src/main/java/fi/iki/elonen/ServerRunner.java
index 8d06912..d3615a7 100644
--- a/webserver/src/main/java/fi/iki/elonen/ServerRunner.java
+++ b/webserver/src/main/java/fi/iki/elonen/ServerRunner.java
@@ -36,7 +36,7 @@ package fi.iki.elonen;
 import java.io.IOException;
 
 public class ServerRunner {
-    public static void run(Class serverClass) {
+    public static <T extends NanoHTTPD> void run(Class<T> serverClass) {
         try {
             executeInstance((NanoHTTPD) serverClass.newInstance());
         } catch (Exception e) {
diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
index 69c62ce..4215620 100644
--- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -58,6 +58,7 @@ public class SimpleWebServer extends NanoHTTPD {
     /**
      * Default Index file names.
      */
+    @SuppressWarnings("serial")
     public static final List<String> INDEX_FILE_NAMES = new ArrayList<String>() {{
         add("index.html");
         add("index.htm");
@@ -65,6 +66,7 @@ public class SimpleWebServer extends NanoHTTPD {
     /**
      * Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE
      */
+    @SuppressWarnings("serial")
     private static final Map<String, String> MIME_TYPES = new HashMap<String, String>() {{
         put("css", "text/css");
         put("htm", "text/html");
@@ -241,7 +243,7 @@ public class SimpleWebServer extends NanoHTTPD {
         plugin.initialize(commandLineOptions);
     }
 
-    private File getRootDir() {
+    protected File getRootDir() {
         return rootDirs.get(0);
     }
 
@@ -249,7 +251,7 @@ public class SimpleWebServer extends NanoHTTPD {
         return rootDirs;
     }
 
-    private void addWwwRootDir(File wwwroot) {
+    protected void addWwwRootDir(File wwwroot) {
         rootDirs.add(wwwroot);
     }