From 2a05afd418a12f437391bf83f18c97700615019d Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 18 May 2012 22:16:17 +0200 Subject: [PATCH] Remove @Override annotation from interface implements --- src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java | 1 - src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java | 3 +-- .../netty/handler/ipfilter/IpFilteringHandlerImpl.java | 6 +++--- .../java/org/jboss/netty/handler/ipfilter/IpSubnet.java | 2 -- .../jboss/netty/handler/ipfilter/IpSubnetFilterRule.java | 2 -- .../java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java | 2 -- .../jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java | 2 -- .../java/org/jboss/netty/handler/ipfilter/PatternRule.java | 4 ---- .../handler/traffic/AbstractTrafficShapingHandler.java | 2 -- .../org/jboss/netty/handler/traffic/TrafficCounter.java | 1 - 10 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java index 08b83d8b67..7823648fab 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java @@ -56,7 +56,6 @@ public class CIDR4 extends CIDR { } } - @Override public int compareTo(CIDR arg) { if (arg instanceof CIDR6) { byte[] address = getIpV4FromIpV6((Inet6Address) arg.baseAddress); diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java index 7c7964d5e3..11e1299ae2 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java @@ -53,7 +53,6 @@ public class CIDR6 extends CIDR { addressEndBigInt = addressBigInt.add(ipv6CidrMaskToBaseAddress(cidrMask)).subtract(BigInteger.ONE); } - @Override public InetAddress getEndAddress() { try { return bigIntToIPv6Address(addressEndBigInt); @@ -65,7 +64,7 @@ public class CIDR6 extends CIDR { } } - @Override + public int compareTo(CIDR arg) { if (arg instanceof CIDR4) { BigInteger net = ipv6AddressToBigInteger(arg.baseAddress); diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java index 7374dfa01a..2c248fcdb8 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java @@ -95,7 +95,7 @@ public abstract class IpFilteringHandlerImpl implements ChannelUpstreamHandler, } } - @Override + public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception { if (e instanceof ChannelStateEvent) { ChannelStateEvent evt = (ChannelStateEvent) e; @@ -150,12 +150,12 @@ public abstract class IpFilteringHandlerImpl implements ChannelUpstreamHandler, ctx.sendUpstream(e); } - @Override + public void setIpFilterListener(IpFilterListener listener) { this.listener = listener; } - @Override + public void removeIpFilterListener() { this.listener = null; diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java index f62b16b72d..a35c70d0be 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java @@ -110,7 +110,6 @@ public class IpSubnet implements IpSet, Comparable { * @return returns true if the given IP address is inside the currently * set network. */ - @Override public boolean contains(InetAddress inetAddress) { if (cidr == null) { // ANY @@ -139,7 +138,6 @@ public class IpSubnet implements IpSet, Comparable { } /** Compare two IpSubnet */ - @Override public int compareTo(IpSubnet o) { return cidr.toString().compareTo(o.cidr.toString()); } diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java index 137a7f62fd..1fb6ad9276 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java @@ -55,12 +55,10 @@ public class IpSubnetFilterRule extends IpSubnet implements IpFilterRule { isAllowRule = allow; } - @Override public boolean isAllowRule() { return isAllowRule; } - @Override public boolean isDenyRule() { return !isAllowRule; } diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java index ca6faf5250..f06c33af6c 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java @@ -209,7 +209,6 @@ public class IpV4Subnet implements IpSet, Comparable { * @return returns true if the given IP address is inside the currently * set network. */ - @Override public boolean contains(InetAddress inetAddress1) { if (mask == -1) { // ANY @@ -238,7 +237,6 @@ public class IpV4Subnet implements IpSet, Comparable { } /** Compare two IpV4Subnet */ - @Override public int compareTo(IpV4Subnet o) { if (o.subnet == subnet && o.cidrMask == cidrMask) { return 0; diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java index afb511428d..26a0c59f72 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java @@ -50,12 +50,10 @@ public class IpV4SubnetFilterRule extends IpV4Subnet implements IpFilterRule { isAllowRule = allow; } - @Override public boolean isAllowRule() { return isAllowRule; } - @Override public boolean isDenyRule() { return !isAllowRule; } diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java index 7b362b141c..b0d711b977 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java @@ -81,17 +81,14 @@ public class PatternRule implements IpFilterRule, Comparable { return this.pattern; } - @Override public boolean isAllowRule() { return isAllowRule; } - @Override public boolean isDenyRule() { return !isAllowRule; } - @Override public boolean contains(InetAddress inetAddress) { if (localhost) { if (isLocalhost(inetAddress)) { @@ -178,7 +175,6 @@ public class PatternRule implements IpFilterRule, Comparable { } - @Override public int compareTo(Object o) { if (o == null) { return -1; diff --git a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java index f7fe35d60e..3cfb28e390 100644 --- a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java +++ b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java @@ -325,7 +325,6 @@ public abstract class AbstractTrafficShapingHandler extends /** * Truly run the waken up of the channel */ - @Override public void run() { try { if (release.get()) { @@ -481,7 +480,6 @@ public abstract class AbstractTrafficShapingHandler extends return trafficCounter; } - @Override public void releaseExternalResources() { if (trafficCounter != null) { trafficCounter.stop(); diff --git a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java index 521664e173..2fc4f0f2e0 100644 --- a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java +++ b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java @@ -142,7 +142,6 @@ public class TrafficCounter { /** * Default run */ - @Override public void run() { try { Thread.currentThread().setName(counter.name);