QPID-1501 : Remove @Override annotations to allow compilation under JDK 1.5

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@722670 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1 insertions, 29 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
index 4f5461bc0e..29494c4118 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
@@ -54,7 +54,6 @@ public class ExtractResendAndRequeue implements UnacknowledgedMessageMap.Visitor
         _storeContext = storeContext;
     }
 
-    @Override
     public boolean callback(final long deliveryTag, QueueEntry message) throws AMQException
     {
 
@@ -101,7 +100,6 @@ public class ExtractResendAndRequeue implements UnacknowledgedMessageMap.Visitor
         return false;
     }
 
-    @Override
     public void visitComplete()
     {
         _unacknowledgedMessageMap.clear();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
index df84270275..a616c2ea35 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
@@ -79,7 +79,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
         }
 
 
-        @Override
         public boolean isBrowser()
         {
             return true;
@@ -127,7 +126,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
         }
 
 
-        @Override
         public boolean isBrowser()
         {
             return false;
@@ -197,7 +195,7 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
             super(channel, protocolSession, consumerTag, filters, noLocal, creditManager, deliveryMethod, recordMethod);
         }
 
-        @Override
+
         public boolean isBrowser()
         {
             return false;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
index 4f0213ce8a..8b6b630aad 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
@@ -41,7 +41,6 @@ public class MockSubscription implements Subscription
     private State _state = State.ACTIVE;
     private ArrayList<QueueEntry> messages = new ArrayList<QueueEntry>();
 
-    @Override
     public void close()
     {
         _closed = true;
@@ -52,111 +51,92 @@ public class MockSubscription implements Subscription
         _state = State.CLOSED;
     }
 
-    @Override
     public boolean filtersMessages()
     {
         return false;
     }
 
-    @Override
     public AMQChannel getChannel()
     {
         return null;
     }
 
-    @Override
     public AMQShortString getConsumerTag()
     {
         return tag ;
     }
 
-    @Override
     public QueueEntry getLastSeenEntry()
     {
         return lastSeen;
     }
 
-    @Override
     public SubscriptionAcquiredState getOwningState()
     {
         return new QueueEntry.SubscriptionAcquiredState(this);
     }
 
-    @Override
     public AMQQueue getQueue()
     {
         return queue;
     }
 
-    @Override
     public void getSendLock()
     {
     }
 
-    @Override
     public boolean hasInterest(QueueEntry msg)
     {
         return true;
     }
 
-    @Override
     public boolean isActive()
     {
         return true;
     }
 
-    @Override
     public boolean isAutoClose()
     {
         return false;
     }
 
-    @Override
     public boolean isBrowser()
     {
         return false;
     }
 
-    @Override
     public boolean isClosed()
     {
         return _closed;
     }
 
-    @Override
     public boolean isSuspended()
     {
         return false;
     }
 
-    @Override
     public void queueDeleted(AMQQueue queue)
     {
     }
 
-    @Override
     public void releaseSendLock()
     {
     }
 
-    @Override
     public void resend(QueueEntry entry) throws AMQException
     {
     }
 
-    @Override
     public void restoreCredit(QueueEntry queueEntry)
     {
     }
 
-    @Override
     public void send(QueueEntry msg) throws AMQException
     {
         lastSeen = msg;
         messages.add(msg);
     }
 
-    @Override
     public boolean setLastSeenEntry(QueueEntry expected, QueueEntry newValue)
     {
         boolean result = false;
@@ -168,13 +148,11 @@ public class MockSubscription implements Subscription
         return result;
     }
 
-    @Override
     public void setQueue(AMQQueue queue)
     {
         this.queue = queue;
     }
 
-    @Override
     public void setStateListener(StateListener listener)
     {
         this._listener = listener;
@@ -185,7 +163,6 @@ public class MockSubscription implements Subscription
         return _state;
     }
 
-    @Override
     public boolean wouldSuspend(QueueEntry msg)
     {
         return false;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
index c20c0bc579..66ec9686dd 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
@@ -111,7 +111,6 @@ public class SubscriptionTestHelper implements Subscription
         //To change body of implemented methods use File | Settings | File Templates.
     }
     
-    @Override
     public State getState()
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.