code formating #253

3 files changed, 118 insertions, 92 deletions

diff --git a/websocket/src/main/java/fi/iki/elonen/NanoWSD.java b/websocket/src/main/java/fi/iki/elonen/NanoWSD.java
index 6ccf21c..b0c72f5 100644
--- a/websocket/src/main/java/fi/iki/elonen/NanoWSD.java
+++ b/websocket/src/main/java/fi/iki/elonen/NanoWSD.java
@@ -96,32 +96,40 @@ public abstract class NanoWSD extends NanoHTTPD {
             this.handshakeResponse.addHeader(NanoWSD.HEADER_UPGRADE, NanoWSD.HEADER_UPGRADE_VALUE);
             this.handshakeResponse.addHeader(NanoWSD.HEADER_CONNECTION, NanoWSD.HEADER_CONNECTION_VALUE);
         }
-        
-        public boolean isOpen(){
-        	return state == State.OPEN;
+
+        public boolean isOpen() {
+            return state == State.OPEN;
         }
-        
+
         protected abstract void onOpen();
+
         protected abstract void onClose(CloseCode code, String reason, boolean initiatedByRemote);
+
         protected abstract void onMessage(WebSocketFrame message);
+
         protected abstract void onPong(WebSocketFrame pong);
+
         protected abstract void onException(IOException exception);
-        
+
         /**
          * Debug method. <b>Do not Override unless for debug purposes!</b>
          * 
-         * @param frame The received WebSocket Frame.
+         * @param frame
+         *            The received WebSocket Frame.
          */
-        protected void debugFrameReceived(WebSocketFrame frame){}
-        
+        protected void debugFrameReceived(WebSocketFrame frame) {
+        }
+
         /**
          * Debug method. <b>Do not Override unless for debug purposes!</b><br>
          * This method is called before actually sending the frame.
          * 
-         * @param frame The sent WebSocket Frame.
+         * @param frame
+         *            The sent WebSocket Frame.
          */
-        protected void debugFrameSent(WebSocketFrame frame){}
-        
+        protected void debugFrameSent(WebSocketFrame frame) {
+        }
+
         public void close(CloseCode code, String reason, boolean initiatedByRemote) throws IOException {
             State oldState = this.state;
             this.state = State.CLOSING;
diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java
index 44e7068..1f4623e 100644
--- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java
+++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java
@@ -57,64 +57,66 @@ public class DebugWebSocketServer extends NanoWSD {
         this.debug = debug;
     }
 
-	@Override
-	protected WebSocket openWebSocket(IHTTPSession handshake) {
-		return new DebugWebSocket(this, handshake);
-	}
-	
-	private static class DebugWebSocket extends WebSocket{
-		private final DebugWebSocketServer server;
-		
-		public DebugWebSocket(DebugWebSocketServer server, IHTTPSession handshakeRequest) {
-			super(handshakeRequest);
-			this.server = server;
-		}
-
-		@Override
-		protected void onOpen(){}
-
-		@Override
-		protected void onClose(CloseCode code, String reason, boolean initiatedByRemote) {
-			if(server.debug) {
-	            System.out.println("C [" + (initiatedByRemote ? "Remote" : "Self") + "] " + (code != null ? code : "UnknownCloseCode[" + code + "]")
-	                    + (reason != null && !reason.isEmpty() ? ": " + reason : ""));
-	        }
-		}
-
-		@Override
-		protected void onMessage(WebSocketFrame message) {
-			try {
-	            message.setUnmasked();
-	            sendFrame(message);
-	        } catch (IOException e) {
-	            throw new RuntimeException(e);
-	        }
-		}
-
-		@Override
-		protected void onPong(WebSocketFrame pong) {
-			if (server.debug) {
-	            System.out.println("P " + pong);
-	        }
-		}
-
-		@Override
-		protected void onException(IOException exception) {
-			DebugWebSocketServer.LOG.log(Level.SEVERE, "exception occured", exception);
-		}
-		
-		@Override
-	    protected void debugFrameReceived(WebSocketFrame frame) {
-	        if (server.debug) {
-	            System.out.println("R " + frame);
-	        }
-	    }
-
-	    @Override
-	    protected void debugFrameSent(WebSocketFrame frame) {
-	        if (server.debug) {
-	            System.out.println("S " + frame);
-	        }
-	    }
-	}
+    @Override
+    protected WebSocket openWebSocket(IHTTPSession handshake) {
+        return new DebugWebSocket(this, handshake);
+    }
+
+    private static class DebugWebSocket extends WebSocket {
+
+        private final DebugWebSocketServer server;
+
+        public DebugWebSocket(DebugWebSocketServer server, IHTTPSession handshakeRequest) {
+            super(handshakeRequest);
+            this.server = server;
+        }
+
+        @Override
+        protected void onOpen() {
+        }
+
+        @Override
+        protected void onClose(CloseCode code, String reason, boolean initiatedByRemote) {
+            if (server.debug) {
+                System.out.println("C [" + (initiatedByRemote ? "Remote" : "Self") + "] " + (code != null ? code : "UnknownCloseCode[" + code + "]")
+                        + (reason != null && !reason.isEmpty() ? ": " + reason : ""));
+            }
+        }
+
+        @Override
+        protected void onMessage(WebSocketFrame message) {
+            try {
+                message.setUnmasked();
+                sendFrame(message);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        protected void onPong(WebSocketFrame pong) {
+            if (server.debug) {
+                System.out.println("P " + pong);
+            }
+        }
+
+        @Override
+        protected void onException(IOException exception) {
+            DebugWebSocketServer.LOG.log(Level.SEVERE, "exception occured", exception);
+        }
+
+        @Override
+        protected void debugFrameReceived(WebSocketFrame frame) {
+            if (server.debug) {
+                System.out.println("R " + frame);
+            }
+        }
+
+        @Override
+        protected void debugFrameSent(WebSocketFrame frame) {
+            if (server.debug) {
+                System.out.println("S " + frame);
+            }
+        }
+    }
 }
diff --git a/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java b/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java
index 243601b..8c083ee 100644
--- a/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java
+++ b/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java
@@ -63,28 +63,44 @@ public class WebSocketResponseHandlerTest {
     private NanoWSD nanoWebSocketServer;
 
     private Map<String, String> headers;
-    
-    private static class MockedWSD extends NanoWSD{
-    	public MockedWSD(int port) {
-			super(port);
-		}
-    	
-		public MockedWSD(String hostname, int port) {
-			super(hostname, port);
-		}
-		
-		@Override
-		protected WebSocket openWebSocket(IHTTPSession handshake) {
-			return new WebSocket(handshake) { // Dummy websocket inner class.
-				@Override protected void onPong(WebSocketFrame pong) {}
-				@Override protected void onOpen() {}
-				@Override protected void onMessage(WebSocketFrame message) {}
-				@Override protected void onException(IOException exception) {}
-				@Override protected void onClose(CloseCode code, String reason, boolean initiatedByRemote) {}
-			};
-		}
+
+    private static class MockedWSD extends NanoWSD {
+
+        public MockedWSD(int port) {
+            super(port);
+        }
+
+        public MockedWSD(String hostname, int port) {
+            super(hostname, port);
+        }
+
+        @Override
+        protected WebSocket openWebSocket(IHTTPSession handshake) {
+            return new WebSocket(handshake) { // Dummy websocket inner class.
+
+                @Override
+                protected void onPong(WebSocketFrame pong) {
+                }
+
+                @Override
+                protected void onOpen() {
+                }
+
+                @Override
+                protected void onMessage(WebSocketFrame message) {
+                }
+
+                @Override
+                protected void onException(IOException exception) {
+                }
+
+                @Override
+                protected void onClose(CloseCode code, String reason, boolean initiatedByRemote) {
+                }
+            };
+        }
     }
-    
+
     @Before
     public void setUp() {
         this.nanoWebSocketServer = Mockito.mock(MockedWSD.class, Mockito.CALLS_REAL_METHODS);