Author: ritchiem
Date: Tue Dec 2 15:27:18 2008
New Revision: 722670
URL: http://svn.apache.org/viewvc?rev=722670&view=rev
Log:
QPID-1501 : Remove @Override annotations to allow compilation under JDK 1.5
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java?rev=722670&r1=722669&r2=722670&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
Tue Dec 2 15:27:18 2008
@@ -54,7 +54,6 @@
_storeContext = storeContext;
}
- @Override
public boolean callback(final long deliveryTag, QueueEntry message) throws
AMQException
{
@@ -101,7 +100,6 @@
return false;
}
- @Override
public void visitComplete()
{
_unacknowledgedMessageMap.clear();
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=722670&r1=722669&r2=722670&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
Tue Dec 2 15:27:18 2008
@@ -79,7 +79,6 @@
}
- @Override
public boolean isBrowser()
{
return true;
@@ -127,7 +126,6 @@
}
- @Override
public boolean isBrowser()
{
return false;
@@ -197,7 +195,7 @@
super(channel, protocolSession, consumerTag, filters, noLocal,
creditManager, deliveryMethod, recordMethod);
}
- @Override
+
public boolean isBrowser()
{
return false;
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=722670&r1=722669&r2=722670&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
Tue Dec 2 15:27:18 2008
@@ -41,7 +41,6 @@
private State _state = State.ACTIVE;
private ArrayList<QueueEntry> messages = new ArrayList<QueueEntry>();
- @Override
public void close()
{
_closed = true;
@@ -52,111 +51,92 @@
_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 @@
return result;
}
- @Override
public void setQueue(AMQQueue queue)
{
this.queue = queue;
}
- @Override
public void setStateListener(StateListener listener)
{
this._listener = listener;
@@ -185,7 +163,6 @@
return _state;
}
- @Override
public boolean wouldSuspend(QueueEntry msg)
{
return false;
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java?rev=722670&r1=722669&r2=722670&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
Tue Dec 2 15:27:18 2008
@@ -111,7 +111,6 @@
//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.
