You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/12/07 12:08:36 UTC
svn commit: r1418277 - in
/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine:
Link.java Sequence.java impl/ConnectionImpl.java impl/ReceiverImpl.java
impl/SenderImpl.java
Author: rgodfrey
Date: Fri Dec 7 11:08:33 2012
New Revision: 1418277
URL: http://svn.apache.org/viewvc?rev=1418277&view=rev
Log:
PROTON-117 : [Proton-J] replace Sequence with Iterator
Removed:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Sequence.java
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java?rev=1418277&r1=1418276&r2=1418277&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java Fri Dec 7 11:08:33 2012
@@ -21,6 +21,7 @@
package org.apache.qpid.proton.engine;
import java.util.EnumSet;
+import java.util.Iterator;
import org.apache.qpid.proton.type.UnsignedByte;
import org.apache.qpid.proton.type.transport.Source;
import org.apache.qpid.proton.type.transport.Target;
@@ -51,7 +52,7 @@ public interface Link extends Endpoint
/**
* @return the unsettled deliveries for this link
*/
- public Sequence<Delivery> unsettled();
+ public Iterator<Delivery> unsettled();
/**
* @return return the current delivery
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1418277&r1=1418276&r2=1418277&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Fri Dec 7 11:08:33 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.proton.engine.im
import java.util.ArrayList;
import java.util.EnumSet;
+import java.util.Iterator;
import java.util.List;
import org.apache.qpid.proton.engine.*;
import org.apache.qpid.proton.type.transport.Open;
@@ -328,7 +329,7 @@ public class ConnectionImpl extends Endp
}
}
- public Sequence<DeliveryImpl> getWorkSequence()
+ public Iterator<DeliveryImpl> getWorkSequence()
{
return new WorkSequence(_workHead);
}
@@ -343,7 +344,7 @@ public class ConnectionImpl extends Endp
return _bound;
}
- private class WorkSequence implements Sequence<DeliveryImpl>
+ private class WorkSequence implements Iterator<DeliveryImpl>
{
private DeliveryImpl _next;
@@ -352,6 +353,18 @@ public class ConnectionImpl extends Endp
_next = workHead;
}
+ @Override
+ public boolean hasNext()
+ {
+ return _next != null;
+ }
+
+ @Override
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
public DeliveryImpl next()
{
DeliveryImpl next = _next;
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java?rev=1418277&r1=1418276&r2=1418277&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java Fri Dec 7 11:08:33 2012
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.proton.engine.impl;
+import java.util.Iterator;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.Receiver;
-import org.apache.qpid.proton.engine.Sequence;
public class ReceiverImpl extends LinkImpl implements Receiver
{
@@ -73,7 +73,7 @@ public class ReceiverImpl extends LinkIm
return _current.recv(bytes, offset, size);
}
- public Sequence<Delivery> unsettled()
+ public Iterator<Delivery> unsettled()
{
return null; //TODO.
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java?rev=1418277&r1=1418276&r2=1418277&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java Fri Dec 7 11:08:33 2012
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.proton.engine.impl;
+import java.util.Iterator;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Sender;
-import org.apache.qpid.proton.engine.Sequence;
public class SenderImpl extends LinkImpl implements Sender
{
@@ -60,7 +60,7 @@ public class SenderImpl extends LinkImp
//TODO.
}
- public Sequence<Delivery> unsettled()
+ public Iterator<Delivery> unsettled()
{
return null; //TODO.
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org