Merge pull request #171 from vorburger/FixedSomeAllWarningsShownInEclipse

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

5 files changed, 10 insertions, 5 deletions

diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index f62e90d..362346f 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -811,6 +811,7 @@ public abstract class NanoHTTPD {
     }
 
     public static final class ResponseException extends Exception {
+        private static final long serialVersionUID = 6569838532917408380L;
 
         private final Response.Status status;
 
diff --git a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
index 019f1d8..85330fc 100644
--- a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
+++ b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
@@ -98,14 +98,14 @@ public class DebugServer extends NanoHTTPD {
     private String unsortedList(Map<String, ? extends Object> map) {
         StringBuilder sb = new StringBuilder();
         sb.append("<ul>");
-        for (Map.Entry entry : map.entrySet()) {
+        for (Map.Entry<String, ? extends Object> entry : map.entrySet()) {
             listItem(sb, entry);
         }
         sb.append("</ul>");
         return sb.toString();
     }
 
-    private void listItem(StringBuilder sb, Map.Entry entry) {
+    private void listItem(StringBuilder sb, Map.Entry<String, ? extends Object> entry) {
         sb.append("<li><code><b>").append(entry.getKey()).
             append("</b> = ").append(entry.getValue()).append("</code></li>");
     }
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);
     }
 
diff --git a/websocket/src/main/java/fi/iki/elonen/WebSocketException.java b/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
index 67f355e..5efe102 100644
--- a/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
+++ b/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
@@ -38,6 +38,8 @@ import fi.iki.elonen.WebSocketFrame.CloseCode;
 import java.io.IOException;
 
 public class WebSocketException extends IOException {
+    private static final long serialVersionUID = -6179651370664878831L;
+
     private CloseCode code;
     private String reason;