From 24ef8a52597fab1bdc83a0e3a4f90d4a6415f08e Mon Sep 17 00:00:00 2001
From: vibul <vibuli@gmail.com>
Date: Sun, 11 Dec 2011 22:23:44 +1100
Subject: [PATCH] Remove @override annotations which are only valid with java6

---
 .../websocketx/autobahn/WebSocketServerPipelineFactory.java   | 1 -
 .../org/jboss/netty/example/http/websocketx/client/App.java   | 4 ----
 .../http/websocketx/client/WebSocketClientFactory.java        | 1 -
 .../http/websocketx/client/WebSocketClientHandler.java        | 3 ---
 .../websocketx/server/WebSocketServerPipelineFactory.java     | 1 -
 .../sslserver/WebSocketSslServerPipelineFactory.java          | 1 -
 6 files changed, 11 deletions(-)

diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
index 3e23698c8f..669fb2b5da 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
@@ -26,7 +26,6 @@ import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
 /**
  */
 public class WebSocketServerPipelineFactory implements ChannelPipelineFactory {
-	@Override
 	public ChannelPipeline getPipeline() throws Exception {
 		// Create a default pipeline implementation.
 		ChannelPipeline pipeline = pipeline();
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
index 973bc8853f..1639302eeb 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
@@ -96,19 +96,16 @@ public class App {
 		public MyCallbackHandler() {
 		}
 
-		@Override
 		public void onConnect(WebSocketClient client) {
 			System.out.println("WebSocket Client connected!");
 			connected = true;
 		}
 
-		@Override
 		public void onDisconnect(WebSocketClient client) {
 			System.out.println("WebSocket Client disconnected!");
 			connected = false;
 		}
 
-		@Override
 		public void onMessage(WebSocketClient client, WebSocketFrame frame) {
 			if (frame instanceof TextWebSocketFrame) {
 				TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
@@ -121,7 +118,6 @@ public class App {
 			}
 		}
 
-		@Override
 		public void onError(Throwable t) {
 			System.out.println("WebSocket Client error " + t.toString());
 		}
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
index 81940cca67..47bbd64d2b 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
@@ -69,7 +69,6 @@ public class WebSocketClientFactory {
 
         bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
 
-            @Override
             public ChannelPipeline getPipeline() throws Exception {
                 ChannelPipeline pipeline = Channels.pipeline();
                 pipeline.addLast("decoder", new WebSocketHttpResponseDecoder());
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
index f2dcd4cab0..9345bbdcae 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
@@ -99,17 +99,14 @@ public class WebSocketClientHandler extends SimpleChannelUpstreamHandler impleme
         e.getChannel().close();
     }
 
-    @Override
     public ChannelFuture connect() {
         return bootstrap.connect(new InetSocketAddress(url.getHost(), url.getPort()));
     }
 
-    @Override
     public ChannelFuture disconnect() {
         return channel.close();
     }
 
-    @Override
     public ChannelFuture send(WebSocketFrame frame) {
         return channel.write(frame);
     }
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
index f13e7c73f3..d1bde38be5 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
@@ -26,7 +26,6 @@ import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
 /**
  */
 public class WebSocketServerPipelineFactory implements ChannelPipelineFactory {
-	@Override
 	public ChannelPipeline getPipeline() throws Exception {
 		// Create a default pipeline implementation.
 		ChannelPipeline pipeline = pipeline();
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
index ecf5698214..fb512945cb 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
@@ -29,7 +29,6 @@ import org.jboss.netty.handler.ssl.SslHandler;
 /**
  */
 public class WebSocketSslServerPipelineFactory implements ChannelPipelineFactory {
-	@Override
 	public ChannelPipeline getPipeline() throws Exception {
 		// Create a default pipeline implementation.
 		ChannelPipeline pipeline = pipeline();