activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmacn...@apache.org
Subject svn commit: r909704 [7/10] - in /activemq/sandbox/activemq-apollo-actor/activemq-amqp/src: main/java/org/apache/activemq/amqp/protocol/marshaller/ main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/ main/java/org/apache/activemq/amqp/protoco...
Date Sat, 13 Feb 2010 03:20:18 GMT
Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFooter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFooter.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFooter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFooter.java Sat Feb 13 03:20:16 2010
@@ -79,147 +79,147 @@
         AmqpFooterBean() {
         }
 
-        AmqpFooterBean(IAmqpList value) {
+        AmqpFooterBean(IAmqpList<AmqpType<?, ?>> value) {
 
-        for(int i = 0; i < value.getListCount(); i++) {
-            set(i, value.get(i));
+            for(int i = 0; i < value.getListCount(); i++) {
+                set(i, value.get(i));
+            }
         }
-    }
-
-    AmqpFooterBean(AmqpFooter.AmqpFooterBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpFooterBean copy() {
-        return new AmqpFooter.AmqpFooterBean(bean);
-    }
 
-    public final AmqpFooter.AmqpFooterBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpFooterBuffer(marshaller.encode(this));
+        AmqpFooterBean(AmqpFooter.AmqpFooterBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
-
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
-
 
-    public final void setMessageAttrs(AmqpMessageAttributes messageAttrs) {
-        copyCheck();
-        bean.messageAttrs = messageAttrs;
-    }
+        public final AmqpFooterBean copy() {
+            return new AmqpFooter.AmqpFooterBean(bean);
+        }
 
-    public final AmqpMessageAttributes getMessageAttrs() {
-        return bean.messageAttrs;
-    }
+        public final AmqpFooter.AmqpFooterBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpFooterBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public final void setDeliveryAttrs(AmqpMessageAttributes deliveryAttrs) {
-        copyCheck();
-        bean.deliveryAttrs = deliveryAttrs;
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
-    public final AmqpMessageAttributes getDeliveryAttrs() {
-        return bean.deliveryAttrs;
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setMessageAttrs((AmqpMessageAttributes) value);
-            break;
-        }
-        case 1: {
-            setDeliveryAttrs((AmqpMessageAttributes) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setMessageAttrs(AmqpMessageAttributes messageAttrs) {
+            copyCheck();
+            bean.messageAttrs = messageAttrs;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
+        public final AmqpMessageAttributes getMessageAttrs() {
             return bean.messageAttrs;
         }
-        case 1: {
+
+        public final void setDeliveryAttrs(AmqpMessageAttributes deliveryAttrs) {
+            copyCheck();
+            bean.deliveryAttrs = deliveryAttrs;
+        }
+
+        public final AmqpMessageAttributes getDeliveryAttrs() {
             return bean.deliveryAttrs;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setMessageAttrs((AmqpMessageAttributes) value);
+                break;
+            }
+            case 1: {
+                setDeliveryAttrs((AmqpMessageAttributes) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.messageAttrs;
+            }
+            case 1: {
+                return bean.deliveryAttrs;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 2;
-    }
+        public int getListCount() {
+            return 2;
+        }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
+        }
 
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
-        if(bean != this) {;
-            copy(bean);
+
+        private final void copy(AmqpFooter.AmqpFooterBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpFooter.AmqpFooterBean other) {
-        bean = this;
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
-        }
+            if(o == null || !(o instanceof AmqpFooter)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpFooter)) {
-            return false;
+            return equals((AmqpFooter) o);
         }
 
-        return equals((AmqpFooter) o);
-    }
+        public boolean equals(AmqpFooter b) {
 
-    public boolean equals(AmqpFooter b) {
+            if(b.getMessageAttrs() == null ^ getMessageAttrs() == null) {
+                return false;
+            }
+            if(b.getMessageAttrs() != null && !b.getMessageAttrs().equals(getMessageAttrs())){ 
+                return false;
+            }
 
-        if(b.getMessageAttrs() == null ^ getMessageAttrs() == null) {
-            return false;
-        }
-        if(b.getMessageAttrs() != null && !b.getMessageAttrs().equals(getMessageAttrs())){ 
-            return false;
+            if(b.getDeliveryAttrs() == null ^ getDeliveryAttrs() == null) {
+                return false;
+            }
+            if(b.getDeliveryAttrs() != null && !b.getDeliveryAttrs().equals(getDeliveryAttrs())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getDeliveryAttrs() == null ^ getDeliveryAttrs() == null) {
-            return false;
-        }
-        if(b.getDeliveryAttrs() != null && !b.getDeliveryAttrs().equals(getDeliveryAttrs())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
     }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
-    }
-}
-
     public static class AmqpFooterBuffer extends AmqpList.AmqpListBuffer implements AmqpFooter{
 
         private AmqpFooterBean bean;
 
-        protected AmqpFooterBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpFooterBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -255,10 +255,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpFooter.AmqpFooterBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -283,7 +279,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpFooter.AmqpFooterBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpFooter.AmqpFooterBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFragment.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFragment.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFragment.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFragment.java Sat Feb 13 03:20:16 2010
@@ -196,256 +196,256 @@
         AmqpFragmentBean() {
         }
 
-        AmqpFragmentBean(IAmqpList value) {
+        AmqpFragmentBean(IAmqpList<AmqpType<?, ?>> value) {
 
-        for(int i = 0; i < value.getListCount(); i++) {
-            set(i, value.get(i));
+            for(int i = 0; i < value.getListCount(); i++) {
+                set(i, value.get(i));
+            }
         }
-    }
 
-    AmqpFragmentBean(AmqpFragment.AmqpFragmentBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpFragmentBean copy() {
-        return new AmqpFragment.AmqpFragmentBean(bean);
-    }
-
-    public final AmqpFragment.AmqpFragmentBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpFragmentBuffer(marshaller.encode(this));
+        AmqpFragmentBean(AmqpFragment.AmqpFragmentBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
 
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
+        public final AmqpFragmentBean copy() {
+            return new AmqpFragment.AmqpFragmentBean(bean);
+        }
 
+        public final AmqpFragment.AmqpFragmentBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpFragmentBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public void setFirst(Boolean first) {
-        setFirst(TypeFactory.createAmqpBoolean(first));
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
 
-    public void setFirst(boolean first) {
-        setFirst(TypeFactory.createAmqpBoolean(first));
-    }
+        public void setFirst(Boolean first) {
+            setFirst(TypeFactory.createAmqpBoolean(first));
+        }
 
 
-    public final void setFirst(AmqpBoolean first) {
-        copyCheck();
-        bean.first = first;
-    }
+        public void setFirst(boolean first) {
+            setFirst(TypeFactory.createAmqpBoolean(first));
+        }
 
-    public final Boolean getFirst() {
-        return bean.first.getValue();
-    }
 
-    public void setLast(Boolean last) {
-        setLast(TypeFactory.createAmqpBoolean(last));
-    }
+        public final void setFirst(AmqpBoolean first) {
+            copyCheck();
+            bean.first = first;
+        }
 
+        public final Boolean getFirst() {
+            return bean.first.getValue();
+        }
 
-    public void setLast(boolean last) {
-        setLast(TypeFactory.createAmqpBoolean(last));
-    }
+        public void setLast(Boolean last) {
+            setLast(TypeFactory.createAmqpBoolean(last));
+        }
 
 
-    public final void setLast(AmqpBoolean last) {
-        copyCheck();
-        bean.last = last;
-    }
+        public void setLast(boolean last) {
+            setLast(TypeFactory.createAmqpBoolean(last));
+        }
 
-    public final Boolean getLast() {
-        return bean.last.getValue();
-    }
 
-    public void setFormatCode(Long formatCode) {
-        setFormatCode(TypeFactory.createAmqpUint(formatCode));
-    }
+        public final void setLast(AmqpBoolean last) {
+            copyCheck();
+            bean.last = last;
+        }
 
+        public final Boolean getLast() {
+            return bean.last.getValue();
+        }
 
-    public void setFormatCode(long formatCode) {
-        setFormatCode(TypeFactory.createAmqpUint(formatCode));
-    }
+        public void setFormatCode(Long formatCode) {
+            setFormatCode(TypeFactory.createAmqpUint(formatCode));
+        }
 
 
-    public final void setFormatCode(AmqpUint formatCode) {
-        copyCheck();
-        bean.formatCode = formatCode;
-    }
+        public void setFormatCode(long formatCode) {
+            setFormatCode(TypeFactory.createAmqpUint(formatCode));
+        }
 
-    public final Long getFormatCode() {
-        return bean.formatCode.getValue();
-    }
 
-    public void setFragmentOffset(BigInteger fragmentOffset) {
-        setFragmentOffset(TypeFactory.createAmqpUlong(fragmentOffset));
-    }
+        public final void setFormatCode(AmqpUint formatCode) {
+            copyCheck();
+            bean.formatCode = formatCode;
+        }
 
+        public final Long getFormatCode() {
+            return bean.formatCode.getValue();
+        }
 
-    public final void setFragmentOffset(AmqpUlong fragmentOffset) {
-        copyCheck();
-        bean.fragmentOffset = fragmentOffset;
-    }
+        public void setFragmentOffset(BigInteger fragmentOffset) {
+            setFragmentOffset(TypeFactory.createAmqpUlong(fragmentOffset));
+        }
 
-    public final BigInteger getFragmentOffset() {
-        return bean.fragmentOffset.getValue();
-    }
 
-    public void setPayload(Buffer payload) {
-        setPayload(TypeFactory.createAmqpBinary(payload));
-    }
+        public final void setFragmentOffset(AmqpUlong fragmentOffset) {
+            copyCheck();
+            bean.fragmentOffset = fragmentOffset;
+        }
 
+        public final BigInteger getFragmentOffset() {
+            return bean.fragmentOffset.getValue();
+        }
 
-    public final void setPayload(AmqpBinary payload) {
-        copyCheck();
-        bean.payload = payload;
-    }
+        public void setPayload(Buffer payload) {
+            setPayload(TypeFactory.createAmqpBinary(payload));
+        }
 
-    public final Buffer getPayload() {
-        return bean.payload.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setFirst((AmqpBoolean) value);
-            break;
-        }
-        case 1: {
-            setLast((AmqpBoolean) value);
-            break;
-        }
-        case 2: {
-            setFormatCode((AmqpUint) value);
-            break;
-        }
-        case 3: {
-            setFragmentOffset((AmqpUlong) value);
-            break;
-        }
-        case 4: {
-            setPayload((AmqpBinary) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setPayload(AmqpBinary payload) {
+            copyCheck();
+            bean.payload = payload;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.first;
-        }
-        case 1: {
-            return bean.last;
-        }
-        case 2: {
-            return bean.formatCode;
-        }
-        case 3: {
-            return bean.fragmentOffset;
-        }
-        case 4: {
-            return bean.payload;
+        public final Buffer getPayload() {
+            return bean.payload.getValue();
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setFirst((AmqpBoolean) value);
+                break;
+            }
+            case 1: {
+                setLast((AmqpBoolean) value);
+                break;
+            }
+            case 2: {
+                setFormatCode((AmqpUint) value);
+                break;
+            }
+            case 3: {
+                setFragmentOffset((AmqpUlong) value);
+                break;
+            }
+            case 4: {
+                setPayload((AmqpBinary) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.first;
+            }
+            case 1: {
+                return bean.last;
+            }
+            case 2: {
+                return bean.formatCode;
+            }
+            case 3: {
+                return bean.fragmentOffset;
+            }
+            case 4: {
+                return bean.payload;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 5;
-    }
+        public int getListCount() {
+            return 5;
+        }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
+        }
 
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
-        if(bean != this) {;
-            copy(bean);
+
+        private final void copy(AmqpFragment.AmqpFragmentBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpFragment.AmqpFragmentBean other) {
-        bean = this;
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
-        }
+            if(o == null || !(o instanceof AmqpFragment)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpFragment)) {
-            return false;
+            return equals((AmqpFragment) o);
         }
 
-        return equals((AmqpFragment) o);
-    }
+        public boolean equals(AmqpFragment b) {
 
-    public boolean equals(AmqpFragment b) {
+            if(b.getFirst() == null ^ getFirst() == null) {
+                return false;
+            }
+            if(b.getFirst() != null && !b.getFirst().equals(getFirst())){ 
+                return false;
+            }
 
-        if(b.getFirst() == null ^ getFirst() == null) {
-            return false;
-        }
-        if(b.getFirst() != null && !b.getFirst().equals(getFirst())){ 
-            return false;
-        }
+            if(b.getLast() == null ^ getLast() == null) {
+                return false;
+            }
+            if(b.getLast() != null && !b.getLast().equals(getLast())){ 
+                return false;
+            }
 
-        if(b.getLast() == null ^ getLast() == null) {
-            return false;
-        }
-        if(b.getLast() != null && !b.getLast().equals(getLast())){ 
-            return false;
-        }
+            if(b.getFormatCode() == null ^ getFormatCode() == null) {
+                return false;
+            }
+            if(b.getFormatCode() != null && !b.getFormatCode().equals(getFormatCode())){ 
+                return false;
+            }
 
-        if(b.getFormatCode() == null ^ getFormatCode() == null) {
-            return false;
-        }
-        if(b.getFormatCode() != null && !b.getFormatCode().equals(getFormatCode())){ 
-            return false;
-        }
+            if(b.getFragmentOffset() == null ^ getFragmentOffset() == null) {
+                return false;
+            }
+            if(b.getFragmentOffset() != null && !b.getFragmentOffset().equals(getFragmentOffset())){ 
+                return false;
+            }
 
-        if(b.getFragmentOffset() == null ^ getFragmentOffset() == null) {
-            return false;
-        }
-        if(b.getFragmentOffset() != null && !b.getFragmentOffset().equals(getFragmentOffset())){ 
-            return false;
+            if(b.getPayload() == null ^ getPayload() == null) {
+                return false;
+            }
+            if(b.getPayload() != null && !b.getPayload().equals(getPayload())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getPayload() == null ^ getPayload() == null) {
-            return false;
-        }
-        if(b.getPayload() != null && !b.getPayload().equals(getPayload())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
     }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
-    }
-}
-
     public static class AmqpFragmentBuffer extends AmqpList.AmqpListBuffer implements AmqpFragment{
 
         private AmqpFragmentBean bean;
 
-        protected AmqpFragmentBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpFragmentBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -540,10 +540,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpFragment.AmqpFragmentBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -568,7 +564,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpFragment.AmqpFragmentBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpFragment.AmqpFragmentBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHeader.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHeader.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHeader.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHeader.java Sat Feb 13 03:20:16 2010
@@ -530,368 +530,368 @@
         AmqpHeaderBean() {
         }
 
-        AmqpHeaderBean(IAmqpList value) {
+        AmqpHeaderBean(IAmqpList<AmqpType<?, ?>> value) {
 
-        for(int i = 0; i < value.getListCount(); i++) {
-            set(i, value.get(i));
+            for(int i = 0; i < value.getListCount(); i++) {
+                set(i, value.get(i));
+            }
         }
-    }
-
-    AmqpHeaderBean(AmqpHeader.AmqpHeaderBean other) {
-        this.bean = other;
-    }
 
-    public final AmqpHeaderBean copy() {
-        return new AmqpHeader.AmqpHeaderBean(bean);
-    }
-
-    public final AmqpHeader.AmqpHeaderBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpHeaderBuffer(marshaller.encode(this));
+        AmqpHeaderBean(AmqpHeader.AmqpHeaderBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
-
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
-
-
-    public void setDurable(Boolean durable) {
-        setDurable(TypeFactory.createAmqpBoolean(durable));
-    }
-
 
-    public void setDurable(boolean durable) {
-        setDurable(TypeFactory.createAmqpBoolean(durable));
-    }
+        public final AmqpHeaderBean copy() {
+            return new AmqpHeader.AmqpHeaderBean(bean);
+        }
 
+        public final AmqpHeader.AmqpHeaderBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpHeaderBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public final void setDurable(AmqpBoolean durable) {
-        copyCheck();
-        bean.durable = durable;
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
-    public final Boolean getDurable() {
-        return bean.durable.getValue();
-    }
 
-    public void setPriority(Short priority) {
-        setPriority(TypeFactory.createAmqpUbyte(priority));
-    }
+        public void setDurable(Boolean durable) {
+            setDurable(TypeFactory.createAmqpBoolean(durable));
+        }
 
 
-    public void setPriority(short priority) {
-        setPriority(TypeFactory.createAmqpUbyte(priority));
-    }
+        public void setDurable(boolean durable) {
+            setDurable(TypeFactory.createAmqpBoolean(durable));
+        }
 
 
-    public final void setPriority(AmqpUbyte priority) {
-        copyCheck();
-        bean.priority = priority;
-    }
+        public final void setDurable(AmqpBoolean durable) {
+            copyCheck();
+            bean.durable = durable;
+        }
 
-    public final Short getPriority() {
-        return bean.priority.getValue();
-    }
+        public final Boolean getDurable() {
+            return bean.durable.getValue();
+        }
 
-    public void setTransmitTime(Date transmitTime) {
-        setTransmitTime(TypeFactory.createAmqpTimestamp(transmitTime));
-    }
+        public void setPriority(Short priority) {
+            setPriority(TypeFactory.createAmqpUbyte(priority));
+        }
 
 
-    public final void setTransmitTime(AmqpTimestamp transmitTime) {
-        copyCheck();
-        bean.transmitTime = transmitTime;
-    }
+        public void setPriority(short priority) {
+            setPriority(TypeFactory.createAmqpUbyte(priority));
+        }
 
-    public final Date getTransmitTime() {
-        return bean.transmitTime.getValue();
-    }
 
-    public void setTtl(BigInteger ttl) {
-        setTtl(TypeFactory.createAmqpUlong(ttl));
-    }
+        public final void setPriority(AmqpUbyte priority) {
+            copyCheck();
+            bean.priority = priority;
+        }
 
+        public final Short getPriority() {
+            return bean.priority.getValue();
+        }
 
-    public final void setTtl(AmqpUlong ttl) {
-        copyCheck();
-        bean.ttl = ttl;
-    }
+        public void setTransmitTime(Date transmitTime) {
+            setTransmitTime(TypeFactory.createAmqpTimestamp(transmitTime));
+        }
 
-    public final BigInteger getTtl() {
-        return bean.ttl.getValue();
-    }
 
-    public void setFormerAcquirers(Long formerAcquirers) {
-        setFormerAcquirers(TypeFactory.createAmqpUint(formerAcquirers));
-    }
+        public final void setTransmitTime(AmqpTimestamp transmitTime) {
+            copyCheck();
+            bean.transmitTime = transmitTime;
+        }
 
+        public final Date getTransmitTime() {
+            return bean.transmitTime.getValue();
+        }
 
-    public void setFormerAcquirers(long formerAcquirers) {
-        setFormerAcquirers(TypeFactory.createAmqpUint(formerAcquirers));
-    }
+        public void setTtl(BigInteger ttl) {
+            setTtl(TypeFactory.createAmqpUlong(ttl));
+        }
 
 
-    public final void setFormerAcquirers(AmqpUint formerAcquirers) {
-        copyCheck();
-        bean.formerAcquirers = formerAcquirers;
-    }
+        public final void setTtl(AmqpUlong ttl) {
+            copyCheck();
+            bean.ttl = ttl;
+        }
 
-    public final Long getFormerAcquirers() {
-        return bean.formerAcquirers.getValue();
-    }
+        public final BigInteger getTtl() {
+            return bean.ttl.getValue();
+        }
 
-    public void setDeliveryFailures(Long deliveryFailures) {
-        setDeliveryFailures(TypeFactory.createAmqpUint(deliveryFailures));
-    }
+        public void setFormerAcquirers(Long formerAcquirers) {
+            setFormerAcquirers(TypeFactory.createAmqpUint(formerAcquirers));
+        }
 
 
-    public void setDeliveryFailures(long deliveryFailures) {
-        setDeliveryFailures(TypeFactory.createAmqpUint(deliveryFailures));
-    }
+        public void setFormerAcquirers(long formerAcquirers) {
+            setFormerAcquirers(TypeFactory.createAmqpUint(formerAcquirers));
+        }
 
 
-    public final void setDeliveryFailures(AmqpUint deliveryFailures) {
-        copyCheck();
-        bean.deliveryFailures = deliveryFailures;
-    }
+        public final void setFormerAcquirers(AmqpUint formerAcquirers) {
+            copyCheck();
+            bean.formerAcquirers = formerAcquirers;
+        }
 
-    public final Long getDeliveryFailures() {
-        return bean.deliveryFailures.getValue();
-    }
+        public final Long getFormerAcquirers() {
+            return bean.formerAcquirers.getValue();
+        }
 
-    public void setFormatCode(Long formatCode) {
-        setFormatCode(TypeFactory.createAmqpUint(formatCode));
-    }
+        public void setDeliveryFailures(Long deliveryFailures) {
+            setDeliveryFailures(TypeFactory.createAmqpUint(deliveryFailures));
+        }
 
 
-    public void setFormatCode(long formatCode) {
-        setFormatCode(TypeFactory.createAmqpUint(formatCode));
-    }
+        public void setDeliveryFailures(long deliveryFailures) {
+            setDeliveryFailures(TypeFactory.createAmqpUint(deliveryFailures));
+        }
 
 
-    public final void setFormatCode(AmqpUint formatCode) {
-        copyCheck();
-        bean.formatCode = formatCode;
-    }
+        public final void setDeliveryFailures(AmqpUint deliveryFailures) {
+            copyCheck();
+            bean.deliveryFailures = deliveryFailures;
+        }
 
-    public final Long getFormatCode() {
-        return bean.formatCode.getValue();
-    }
+        public final Long getDeliveryFailures() {
+            return bean.deliveryFailures.getValue();
+        }
 
-    public final void setMessageAttrs(AmqpMessageAttributes messageAttrs) {
-        copyCheck();
-        bean.messageAttrs = messageAttrs;
-    }
+        public void setFormatCode(Long formatCode) {
+            setFormatCode(TypeFactory.createAmqpUint(formatCode));
+        }
 
-    public final AmqpMessageAttributes getMessageAttrs() {
-        return bean.messageAttrs;
-    }
 
-    public final void setDeliveryAttrs(AmqpMessageAttributes deliveryAttrs) {
-        copyCheck();
-        bean.deliveryAttrs = deliveryAttrs;
-    }
+        public void setFormatCode(long formatCode) {
+            setFormatCode(TypeFactory.createAmqpUint(formatCode));
+        }
 
-    public final AmqpMessageAttributes getDeliveryAttrs() {
-        return bean.deliveryAttrs;
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setDurable((AmqpBoolean) value);
-            break;
-        }
-        case 1: {
-            setPriority((AmqpUbyte) value);
-            break;
-        }
-        case 2: {
-            setTransmitTime((AmqpTimestamp) value);
-            break;
-        }
-        case 3: {
-            setTtl((AmqpUlong) value);
-            break;
-        }
-        case 4: {
-            setFormerAcquirers((AmqpUint) value);
-            break;
-        }
-        case 5: {
-            setDeliveryFailures((AmqpUint) value);
-            break;
-        }
-        case 6: {
-            setFormatCode((AmqpUint) value);
-            break;
-        }
-        case 7: {
-            setMessageAttrs((AmqpMessageAttributes) value);
-            break;
-        }
-        case 8: {
-            setDeliveryAttrs((AmqpMessageAttributes) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setFormatCode(AmqpUint formatCode) {
+            copyCheck();
+            bean.formatCode = formatCode;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.durable;
-        }
-        case 1: {
-            return bean.priority;
-        }
-        case 2: {
-            return bean.transmitTime;
-        }
-        case 3: {
-            return bean.ttl;
-        }
-        case 4: {
-            return bean.formerAcquirers;
-        }
-        case 5: {
-            return bean.deliveryFailures;
+        public final Long getFormatCode() {
+            return bean.formatCode.getValue();
         }
-        case 6: {
-            return bean.formatCode;
+
+        public final void setMessageAttrs(AmqpMessageAttributes messageAttrs) {
+            copyCheck();
+            bean.messageAttrs = messageAttrs;
         }
-        case 7: {
+
+        public final AmqpMessageAttributes getMessageAttrs() {
             return bean.messageAttrs;
         }
-        case 8: {
+
+        public final void setDeliveryAttrs(AmqpMessageAttributes deliveryAttrs) {
+            copyCheck();
+            bean.deliveryAttrs = deliveryAttrs;
+        }
+
+        public final AmqpMessageAttributes getDeliveryAttrs() {
             return bean.deliveryAttrs;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setDurable((AmqpBoolean) value);
+                break;
+            }
+            case 1: {
+                setPriority((AmqpUbyte) value);
+                break;
+            }
+            case 2: {
+                setTransmitTime((AmqpTimestamp) value);
+                break;
+            }
+            case 3: {
+                setTtl((AmqpUlong) value);
+                break;
+            }
+            case 4: {
+                setFormerAcquirers((AmqpUint) value);
+                break;
+            }
+            case 5: {
+                setDeliveryFailures((AmqpUint) value);
+                break;
+            }
+            case 6: {
+                setFormatCode((AmqpUint) value);
+                break;
+            }
+            case 7: {
+                setMessageAttrs((AmqpMessageAttributes) value);
+                break;
+            }
+            case 8: {
+                setDeliveryAttrs((AmqpMessageAttributes) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.durable;
+            }
+            case 1: {
+                return bean.priority;
+            }
+            case 2: {
+                return bean.transmitTime;
+            }
+            case 3: {
+                return bean.ttl;
+            }
+            case 4: {
+                return bean.formerAcquirers;
+            }
+            case 5: {
+                return bean.deliveryFailures;
+            }
+            case 6: {
+                return bean.formatCode;
+            }
+            case 7: {
+                return bean.messageAttrs;
+            }
+            case 8: {
+                return bean.deliveryAttrs;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 9;
-    }
+        public int getListCount() {
+            return 9;
+        }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
+        }
 
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
-        if(bean != this) {;
-            copy(bean);
+
+        private final void copy(AmqpHeader.AmqpHeaderBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpHeader.AmqpHeaderBean other) {
-        bean = this;
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
-        }
+            if(o == null || !(o instanceof AmqpHeader)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpHeader)) {
-            return false;
+            return equals((AmqpHeader) o);
         }
 
-        return equals((AmqpHeader) o);
-    }
+        public boolean equals(AmqpHeader b) {
 
-    public boolean equals(AmqpHeader b) {
+            if(b.getDurable() == null ^ getDurable() == null) {
+                return false;
+            }
+            if(b.getDurable() != null && !b.getDurable().equals(getDurable())){ 
+                return false;
+            }
 
-        if(b.getDurable() == null ^ getDurable() == null) {
-            return false;
-        }
-        if(b.getDurable() != null && !b.getDurable().equals(getDurable())){ 
-            return false;
-        }
+            if(b.getPriority() == null ^ getPriority() == null) {
+                return false;
+            }
+            if(b.getPriority() != null && !b.getPriority().equals(getPriority())){ 
+                return false;
+            }
 
-        if(b.getPriority() == null ^ getPriority() == null) {
-            return false;
-        }
-        if(b.getPriority() != null && !b.getPriority().equals(getPriority())){ 
-            return false;
-        }
+            if(b.getTransmitTime() == null ^ getTransmitTime() == null) {
+                return false;
+            }
+            if(b.getTransmitTime() != null && !b.getTransmitTime().equals(getTransmitTime())){ 
+                return false;
+            }
 
-        if(b.getTransmitTime() == null ^ getTransmitTime() == null) {
-            return false;
-        }
-        if(b.getTransmitTime() != null && !b.getTransmitTime().equals(getTransmitTime())){ 
-            return false;
-        }
+            if(b.getTtl() == null ^ getTtl() == null) {
+                return false;
+            }
+            if(b.getTtl() != null && !b.getTtl().equals(getTtl())){ 
+                return false;
+            }
 
-        if(b.getTtl() == null ^ getTtl() == null) {
-            return false;
-        }
-        if(b.getTtl() != null && !b.getTtl().equals(getTtl())){ 
-            return false;
-        }
+            if(b.getFormerAcquirers() == null ^ getFormerAcquirers() == null) {
+                return false;
+            }
+            if(b.getFormerAcquirers() != null && !b.getFormerAcquirers().equals(getFormerAcquirers())){ 
+                return false;
+            }
 
-        if(b.getFormerAcquirers() == null ^ getFormerAcquirers() == null) {
-            return false;
-        }
-        if(b.getFormerAcquirers() != null && !b.getFormerAcquirers().equals(getFormerAcquirers())){ 
-            return false;
-        }
+            if(b.getDeliveryFailures() == null ^ getDeliveryFailures() == null) {
+                return false;
+            }
+            if(b.getDeliveryFailures() != null && !b.getDeliveryFailures().equals(getDeliveryFailures())){ 
+                return false;
+            }
 
-        if(b.getDeliveryFailures() == null ^ getDeliveryFailures() == null) {
-            return false;
-        }
-        if(b.getDeliveryFailures() != null && !b.getDeliveryFailures().equals(getDeliveryFailures())){ 
-            return false;
-        }
+            if(b.getFormatCode() == null ^ getFormatCode() == null) {
+                return false;
+            }
+            if(b.getFormatCode() != null && !b.getFormatCode().equals(getFormatCode())){ 
+                return false;
+            }
 
-        if(b.getFormatCode() == null ^ getFormatCode() == null) {
-            return false;
-        }
-        if(b.getFormatCode() != null && !b.getFormatCode().equals(getFormatCode())){ 
-            return false;
-        }
+            if(b.getMessageAttrs() == null ^ getMessageAttrs() == null) {
+                return false;
+            }
+            if(b.getMessageAttrs() != null && !b.getMessageAttrs().equals(getMessageAttrs())){ 
+                return false;
+            }
 
-        if(b.getMessageAttrs() == null ^ getMessageAttrs() == null) {
-            return false;
-        }
-        if(b.getMessageAttrs() != null && !b.getMessageAttrs().equals(getMessageAttrs())){ 
-            return false;
+            if(b.getDeliveryAttrs() == null ^ getDeliveryAttrs() == null) {
+                return false;
+            }
+            if(b.getDeliveryAttrs() != null && !b.getDeliveryAttrs().equals(getDeliveryAttrs())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getDeliveryAttrs() == null ^ getDeliveryAttrs() == null) {
-            return false;
-        }
-        if(b.getDeliveryAttrs() != null && !b.getDeliveryAttrs().equals(getDeliveryAttrs())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
-    }
-
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
     }
-}
 
     public static class AmqpHeaderBuffer extends AmqpList.AmqpListBuffer implements AmqpHeader{
 
         private AmqpHeaderBean bean;
 
-        protected AmqpHeaderBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpHeaderBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -1036,10 +1036,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpHeader.AmqpHeaderBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -1064,7 +1060,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpHeader.AmqpHeaderBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpHeader.AmqpHeaderBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLink.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLink.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLink.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLink.java Sat Feb 13 03:20:16 2010
@@ -404,343 +404,343 @@
         AmqpLinkBean() {
         }
 
-        AmqpLinkBean(IAmqpList value) {
+        AmqpLinkBean(IAmqpList<AmqpType<?, ?>> value) {
 
-        for(int i = 0; i < value.getListCount(); i++) {
-            set(i, value.get(i));
+            for(int i = 0; i < value.getListCount(); i++) {
+                set(i, value.get(i));
+            }
         }
-    }
-
-    AmqpLinkBean(AmqpLink.AmqpLinkBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpLinkBean copy() {
-        return new AmqpLink.AmqpLinkBean(bean);
-    }
 
-    public final void handle(AmqpCommandHandler handler) throws Exception {
-        handler.handleLink(this);
-    }
+        AmqpLinkBean(AmqpLink.AmqpLinkBean other) {
+            this.bean = other;
+        }
 
-    public final AmqpLink.AmqpLinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpLinkBuffer(marshaller.encode(this));
+        public final AmqpLinkBean copy() {
+            return new AmqpLink.AmqpLinkBean(bean);
         }
-        return buffer;
-    }
 
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
+        public final void handle(AmqpCommandHandler handler) throws Exception {
+            handler.handleLink(this);
+        }
 
+        public final AmqpLink.AmqpLinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpLinkBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public final void setOptions(AmqpOptions options) {
-        copyCheck();
-        bean.options = options;
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
-    public final AmqpOptions getOptions() {
-        return bean.options;
-    }
 
-    public void setName(String name) {
-        setName(TypeFactory.createAmqpString(name));
-    }
+        public final void setOptions(AmqpOptions options) {
+            copyCheck();
+            bean.options = options;
+        }
 
+        public final AmqpOptions getOptions() {
+            return bean.options;
+        }
 
-    public final void setName(AmqpString name) {
-        copyCheck();
-        bean.name = name;
-    }
+        public void setName(String name) {
+            setName(TypeFactory.createAmqpString(name));
+        }
 
-    public final String getName() {
-        return bean.name.getValue();
-    }
 
-    public final void setScope(AmqpScope scope) {
-        copyCheck();
-        bean.scope = scope;
-    }
+        public final void setName(AmqpString name) {
+            copyCheck();
+            bean.name = name;
+        }
 
-    public final AmqpScope getScope() {
-        return bean.scope;
-    }
+        public final String getName() {
+            return bean.name.getValue();
+        }
 
-    public void setHandle(Long handle) {
-        setHandle(TypeFactory.createAmqpHandle(handle));
-    }
+        public final void setScope(AmqpScope scope) {
+            copyCheck();
+            bean.scope = scope;
+        }
 
+        public final AmqpScope getScope() {
+            return bean.scope;
+        }
 
-    public void setHandle(long handle) {
-        setHandle(TypeFactory.createAmqpHandle(handle));
-    }
+        public void setHandle(Long handle) {
+            setHandle(TypeFactory.createAmqpHandle(handle));
+        }
 
 
-    public final void setHandle(AmqpHandle handle) {
-        copyCheck();
-        bean.handle = handle;
-    }
+        public void setHandle(long handle) {
+            setHandle(TypeFactory.createAmqpHandle(handle));
+        }
 
-    public final AmqpHandle getHandle() {
-        return bean.handle;
-    }
 
-    public final void setDirection(AmqpDirection direction) {
-        copyCheck();
-        bean.direction = direction;
-    }
+        public final void setHandle(AmqpHandle handle) {
+            copyCheck();
+            bean.handle = handle;
+        }
 
-    public final AmqpDirection getDirection() {
-        return bean.direction;
-    }
+        public final AmqpHandle getHandle() {
+            return bean.handle;
+        }
 
-    public final void setSource(AmqpMap source) {
-        copyCheck();
-        bean.source = source;
-    }
+        public final void setDirection(AmqpDirection direction) {
+            copyCheck();
+            bean.direction = direction;
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getSource() {
-        return bean.source.getValue();
-    }
+        public final AmqpDirection getDirection() {
+            return bean.direction;
+        }
 
-    public final void setTarget(AmqpMap target) {
-        copyCheck();
-        bean.target = target;
-    }
+        public final void setSource(AmqpMap source) {
+            copyCheck();
+            bean.source = source;
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getTarget() {
-        return bean.target.getValue();
-    }
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getSource() {
+            return bean.source;
+        }
 
-    public void setTransferUnit(BigInteger transferUnit) {
-        setTransferUnit(TypeFactory.createAmqpUlong(transferUnit));
-    }
+        public final void setTarget(AmqpMap target) {
+            copyCheck();
+            bean.target = target;
+        }
 
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getTarget() {
+            return bean.target;
+        }
 
-    public final void setTransferUnit(AmqpUlong transferUnit) {
-        copyCheck();
-        bean.transferUnit = transferUnit;
-    }
+        public void setTransferUnit(BigInteger transferUnit) {
+            setTransferUnit(TypeFactory.createAmqpUlong(transferUnit));
+        }
 
-    public final BigInteger getTransferUnit() {
-        return bean.transferUnit.getValue();
-    }
 
-    public void setResumeTag(Buffer resumeTag) {
-        setResumeTag(TypeFactory.createAmqpDeliveryTag(resumeTag));
-    }
+        public final void setTransferUnit(AmqpUlong transferUnit) {
+            copyCheck();
+            bean.transferUnit = transferUnit;
+        }
 
+        public final BigInteger getTransferUnit() {
+            return bean.transferUnit.getValue();
+        }
 
-    public final void setResumeTag(AmqpDeliveryTag resumeTag) {
-        copyCheck();
-        bean.resumeTag = resumeTag;
-    }
+        public void setResumeTag(Buffer resumeTag) {
+            setResumeTag(TypeFactory.createAmqpDeliveryTag(resumeTag));
+        }
 
-    public final AmqpDeliveryTag getResumeTag() {
-        return bean.resumeTag;
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setOptions((AmqpOptions) value);
-            break;
-        }
-        case 1: {
-            setName((AmqpString) value);
-            break;
-        }
-        case 2: {
-            setScope(AmqpScope.get((AmqpUbyte)value));
-            break;
-        }
-        case 3: {
-            setHandle((AmqpHandle) value);
-            break;
-        }
-        case 4: {
-            setDirection(AmqpDirection.get((AmqpUbyte)value));
-            break;
-        }
-        case 5: {
-            setSource((AmqpMap) value);
-            break;
-        }
-        case 6: {
-            setTarget((AmqpMap) value);
-            break;
-        }
-        case 7: {
-            setTransferUnit((AmqpUlong) value);
-            break;
-        }
-        case 8: {
-            setResumeTag((AmqpDeliveryTag) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setResumeTag(AmqpDeliveryTag resumeTag) {
+            copyCheck();
+            bean.resumeTag = resumeTag;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.options;
-        }
-        case 1: {
-            return bean.name;
+        public final AmqpDeliveryTag getResumeTag() {
+            return bean.resumeTag;
         }
-        case 2: {
-            if(scope == null) {
-                return null;
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setOptions((AmqpOptions) value);
+                break;
+            }
+            case 1: {
+                setName((AmqpString) value);
+                break;
+            }
+            case 2: {
+                setScope(AmqpScope.get((AmqpUbyte)value));
+                break;
+            }
+            case 3: {
+                setHandle((AmqpHandle) value);
+                break;
+            }
+            case 4: {
+                setDirection(AmqpDirection.get((AmqpUbyte)value));
+                break;
+            }
+            case 5: {
+                setSource((AmqpMap) value);
+                break;
+            }
+            case 6: {
+                setTarget((AmqpMap) value);
+                break;
+            }
+            case 7: {
+                setTransferUnit((AmqpUlong) value);
+                break;
+            }
+            case 8: {
+                setResumeTag((AmqpDeliveryTag) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
             }
-            return scope.getValue();
-        }
-        case 3: {
-            return bean.handle;
-        }
-        case 4: {
-            if(direction == null) {
-                return null;
             }
-            return direction.getValue();
-        }
-        case 5: {
-            return bean.source;
-        }
-        case 6: {
-            return bean.target;
-        }
-        case 7: {
-            return bean.transferUnit;
-        }
-        case 8: {
-            return bean.resumeTag;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.options;
+            }
+            case 1: {
+                return bean.name;
+            }
+            case 2: {
+                if(scope == null) {
+                    return null;
+                }
+                return scope.getValue();
+            }
+            case 3: {
+                return bean.handle;
+            }
+            case 4: {
+                if(direction == null) {
+                    return null;
+                }
+                return direction.getValue();
+            }
+            case 5: {
+                return bean.source;
+            }
+            case 6: {
+                return bean.target;
+            }
+            case 7: {
+                return bean.transferUnit;
+            }
+            case 8: {
+                return bean.resumeTag;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 9;
-    }
+        public int getListCount() {
+            return 9;
+        }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
+        }
 
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
-        if(bean != this) {;
-            copy(bean);
+
+        private final void copy(AmqpLink.AmqpLinkBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpLink.AmqpLinkBean other) {
-        bean = this;
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
-        }
+            if(o == null || !(o instanceof AmqpLink)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpLink)) {
-            return false;
+            return equals((AmqpLink) o);
         }
 
-        return equals((AmqpLink) o);
-    }
+        public boolean equals(AmqpLink b) {
 
-    public boolean equals(AmqpLink b) {
+            if(b.getOptions() == null ^ getOptions() == null) {
+                return false;
+            }
+            if(b.getOptions() != null && !b.getOptions().equals(getOptions())){ 
+                return false;
+            }
 
-        if(b.getOptions() == null ^ getOptions() == null) {
-            return false;
-        }
-        if(b.getOptions() != null && !b.getOptions().equals(getOptions())){ 
-            return false;
-        }
+            if(b.getName() == null ^ getName() == null) {
+                return false;
+            }
+            if(b.getName() != null && !b.getName().equals(getName())){ 
+                return false;
+            }
 
-        if(b.getName() == null ^ getName() == null) {
-            return false;
-        }
-        if(b.getName() != null && !b.getName().equals(getName())){ 
-            return false;
-        }
+            if(b.getScope() == null ^ getScope() == null) {
+                return false;
+            }
+            if(b.getScope() != null && !b.getScope().equals(getScope())){ 
+                return false;
+            }
 
-        if(b.getScope() == null ^ getScope() == null) {
-            return false;
-        }
-        if(b.getScope() != null && !b.getScope().equals(getScope())){ 
-            return false;
-        }
+            if(b.getHandle() == null ^ getHandle() == null) {
+                return false;
+            }
+            if(b.getHandle() != null && !b.getHandle().equals(getHandle())){ 
+                return false;
+            }
 
-        if(b.getHandle() == null ^ getHandle() == null) {
-            return false;
-        }
-        if(b.getHandle() != null && !b.getHandle().equals(getHandle())){ 
-            return false;
-        }
+            if(b.getDirection() == null ^ getDirection() == null) {
+                return false;
+            }
+            if(b.getDirection() != null && !b.getDirection().equals(getDirection())){ 
+                return false;
+            }
 
-        if(b.getDirection() == null ^ getDirection() == null) {
-            return false;
-        }
-        if(b.getDirection() != null && !b.getDirection().equals(getDirection())){ 
-            return false;
-        }
+            if(b.getSource() == null ^ getSource() == null) {
+                return false;
+            }
+            if(b.getSource() != null && !b.getSource().equals(getSource())){ 
+                return false;
+            }
 
-        if(b.getSource() == null ^ getSource() == null) {
-            return false;
-        }
-        if(b.getSource() != null && !b.getSource().equals(getSource())){ 
-            return false;
-        }
+            if(b.getTarget() == null ^ getTarget() == null) {
+                return false;
+            }
+            if(b.getTarget() != null && !b.getTarget().equals(getTarget())){ 
+                return false;
+            }
 
-        if(b.getTarget() == null ^ getTarget() == null) {
-            return false;
-        }
-        if(b.getTarget() != null && !b.getTarget().equals(getTarget())){ 
-            return false;
-        }
+            if(b.getTransferUnit() == null ^ getTransferUnit() == null) {
+                return false;
+            }
+            if(b.getTransferUnit() != null && !b.getTransferUnit().equals(getTransferUnit())){ 
+                return false;
+            }
 
-        if(b.getTransferUnit() == null ^ getTransferUnit() == null) {
-            return false;
-        }
-        if(b.getTransferUnit() != null && !b.getTransferUnit().equals(getTransferUnit())){ 
-            return false;
+            if(b.getResumeTag() == null ^ getResumeTag() == null) {
+                return false;
+            }
+            if(b.getResumeTag() != null && !b.getResumeTag().equals(getResumeTag())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getResumeTag() == null ^ getResumeTag() == null) {
-            return false;
-        }
-        if(b.getResumeTag() != null && !b.getResumeTag().equals(getResumeTag())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
-    }
-
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
     }
-}
 
     public static class AmqpLinkBuffer extends AmqpList.AmqpListBuffer implements AmqpLink{
 
         private AmqpLinkBean bean;
 
-        protected AmqpLinkBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpLinkBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -853,10 +853,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpLink.AmqpLinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -885,7 +881,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpLink.AmqpLinkBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpLink.AmqpLinkBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLinkError.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLinkError.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLinkError.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLinkError.java Sat Feb 13 03:20:16 2010
@@ -101,178 +101,178 @@
         AmqpLinkErrorBean() {
         }
 
-        AmqpLinkErrorBean(IAmqpList value) {
+        AmqpLinkErrorBean(IAmqpList<AmqpType<?, ?>> value) {
 
-        for(int i = 0; i < value.getListCount(); i++) {
-            set(i, value.get(i));
+            for(int i = 0; i < value.getListCount(); i++) {
+                set(i, value.get(i));
+            }
         }
-    }
-
-    AmqpLinkErrorBean(AmqpLinkError.AmqpLinkErrorBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpLinkErrorBean copy() {
-        return new AmqpLinkError.AmqpLinkErrorBean(bean);
-    }
 
-    public final AmqpLinkError.AmqpLinkErrorBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpLinkErrorBuffer(marshaller.encode(this));
+        AmqpLinkErrorBean(AmqpLinkError.AmqpLinkErrorBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
-
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
 
+        public final AmqpLinkErrorBean copy() {
+            return new AmqpLinkError.AmqpLinkErrorBean(bean);
+        }
 
-    public final void setErrorCode(AmqpLinkErrorCode errorCode) {
-        copyCheck();
-        bean.errorCode = errorCode;
-    }
-
-    public final AmqpLinkErrorCode getErrorCode() {
-        return bean.errorCode;
-    }
+        public final AmqpLinkError.AmqpLinkErrorBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpLinkErrorBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public void setDescription(String description) {
-        setDescription(TypeFactory.createAmqpString(description));
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
 
-    public final void setDescription(AmqpString description) {
-        copyCheck();
-        bean.description = description;
-    }
+        public final void setErrorCode(AmqpLinkErrorCode errorCode) {
+            copyCheck();
+            bean.errorCode = errorCode;
+        }
 
-    public final String getDescription() {
-        return bean.description.getValue();
-    }
+        public final AmqpLinkErrorCode getErrorCode() {
+            return bean.errorCode;
+        }
 
-    public final void setErrorInfo(AmqpMap errorInfo) {
-        copyCheck();
-        bean.errorInfo = errorInfo;
-    }
+        public void setDescription(String description) {
+            setDescription(TypeFactory.createAmqpString(description));
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getErrorInfo() {
-        return bean.errorInfo.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setErrorCode(AmqpLinkErrorCode.get((AmqpUshort)value));
-            break;
-        }
-        case 1: {
-            setDescription((AmqpString) value);
-            break;
-        }
-        case 2: {
-            setErrorInfo((AmqpMap) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setDescription(AmqpString description) {
+            copyCheck();
+            bean.description = description;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            if(errorCode == null) {
-                return null;
-            }
-            return errorCode.getValue();
+        public final String getDescription() {
+            return bean.description.getValue();
         }
-        case 1: {
-            return bean.description;
+
+        public final void setErrorInfo(AmqpMap errorInfo) {
+            copyCheck();
+            bean.errorInfo = errorInfo;
         }
-        case 2: {
+
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getErrorInfo() {
             return bean.errorInfo;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setErrorCode(AmqpLinkErrorCode.get((AmqpUshort)value));
+                break;
+            }
+            case 1: {
+                setDescription((AmqpString) value);
+                break;
+            }
+            case 2: {
+                setErrorInfo((AmqpMap) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                if(errorCode == null) {
+                    return null;
+                }
+                return errorCode.getValue();
+            }
+            case 1: {
+                return bean.description;
+            }
+            case 2: {
+                return bean.errorInfo;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 3;
-    }
+        public int getListCount() {
+            return 3;
+        }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
+        }
 
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
-        if(bean != this) {;
-            copy(bean);
+
+        private final void copy(AmqpLinkError.AmqpLinkErrorBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpLinkError.AmqpLinkErrorBean other) {
-        bean = this;
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
-        }
+            if(o == null || !(o instanceof AmqpLinkError)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpLinkError)) {
-            return false;
+            return equals((AmqpLinkError) o);
         }
 
-        return equals((AmqpLinkError) o);
-    }
+        public boolean equals(AmqpLinkError b) {
 
-    public boolean equals(AmqpLinkError b) {
+            if(b.getErrorCode() == null ^ getErrorCode() == null) {
+                return false;
+            }
+            if(b.getErrorCode() != null && !b.getErrorCode().equals(getErrorCode())){ 
+                return false;
+            }
 
-        if(b.getErrorCode() == null ^ getErrorCode() == null) {
-            return false;
-        }
-        if(b.getErrorCode() != null && !b.getErrorCode().equals(getErrorCode())){ 
-            return false;
-        }
+            if(b.getDescription() == null ^ getDescription() == null) {
+                return false;
+            }
+            if(b.getDescription() != null && !b.getDescription().equals(getDescription())){ 
+                return false;
+            }
 
-        if(b.getDescription() == null ^ getDescription() == null) {
-            return false;
-        }
-        if(b.getDescription() != null && !b.getDescription().equals(getDescription())){ 
-            return false;
+            if(b.getErrorInfo() == null ^ getErrorInfo() == null) {
+                return false;
+            }
+            if(b.getErrorInfo() != null && !b.getErrorInfo().equals(getErrorInfo())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getErrorInfo() == null ^ getErrorInfo() == null) {
-            return false;
-        }
-        if(b.getErrorInfo() != null && !b.getErrorInfo().equals(getErrorInfo())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
-    }
-
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
     }
-}
 
     public static class AmqpLinkErrorBuffer extends AmqpList.AmqpListBuffer implements AmqpLinkError{
 
         private AmqpLinkErrorBean bean;
 
-        protected AmqpLinkErrorBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpLinkErrorBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -320,10 +320,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpLinkError.AmqpLinkErrorBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -348,7 +344,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpLinkError.AmqpLinkErrorBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpLinkError.AmqpLinkErrorBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpList.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpList.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpList.java Sat Feb 13 03:20:16 2010
@@ -30,7 +30,7 @@
 /**
  * Represents a a sequence of polymorphic values
  */
-public interface AmqpList extends AmqpType<AmqpList.AmqpListBean, AmqpList.AmqpListBuffer>, IAmqpList {
+public interface AmqpList extends AmqpType<AmqpList.AmqpListBean, AmqpList.AmqpListBuffer>, IAmqpList<AmqpType<?, ?>> {
 
     /**
      * Represents a a sequence of polymorphic values
@@ -39,19 +39,17 @@
     public AmqpType<?, ?> get(int index);
     public int getListCount();
 
-    public IAmqpList getValue();
-
     public static class AmqpListBean implements AmqpList{
 
         private AmqpListBuffer buffer;
         private AmqpListBean bean = this;
-        private IAmqpList value;
+        private IAmqpList<AmqpType<?, ?>> value;
 
         AmqpListBean() {
             this.value = new IAmqpList.AmqpWrapperList(new ArrayList<AmqpType<?,?>>());
         }
 
-        AmqpListBean(IAmqpList value) {
+        AmqpListBean(IAmqpList<AmqpType<?, ?>> value) {
             this.value = value;
         }
 
@@ -89,11 +87,7 @@
         }
 
         public Iterator<AmqpType<?, ?>> iterator() {
-            return new AmqpListIterator(bean.value);
-        }
-
-        public IAmqpList getValue() {
-            return bean;
+            return new AmqpListIterator<AmqpType<?, ?>>(bean.value);
         }
 
 
@@ -132,19 +126,19 @@
         }
     }
 
-    public static class AmqpListBuffer implements AmqpList, AmqpBuffer< IAmqpList> {
+    public static class AmqpListBuffer implements AmqpList, AmqpBuffer< IAmqpList<AmqpType<?, ?>>> {
 
         private AmqpListBean bean;
-        protected Encoded<IAmqpList> encoded;
+        protected Encoded<IAmqpList<AmqpType<?, ?>>> encoded;
 
         protected AmqpListBuffer() {
         }
 
-        protected AmqpListBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpListBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             this.encoded = encoded;
         }
 
-        public final Encoded<IAmqpList> getEncoded() throws AmqpEncodingError{
+        public final Encoded<IAmqpList<AmqpType<?, ?>>> getEncoded() throws AmqpEncodingError{
             return encoded;
         }
 
@@ -168,10 +162,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpList.AmqpListBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -196,7 +186,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpList.AmqpListBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpList.AmqpListBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMap.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMap.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMap.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMap.java Sat Feb 13 03:20:16 2010
@@ -36,10 +36,8 @@
     /**
      * Represents a a polymorphic mapping from distinct keys to values
      */
-    public void put(AmqpType<?, ?> key, AmqpType<?, ?> value);
-    public AmqpType<?, ?> get(Object key);
-
-    public IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getValue();
+    public void put(AmqpType<?,?> key, AmqpType<?,?> value);
+    public AmqpType<?,?> get(Object key);
 
     public static class AmqpMapBean implements AmqpMap{
 
@@ -48,7 +46,7 @@
         private IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value;
 
         AmqpMapBean() {
-            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>, AmqpType<?,?>>(new HashMap<AmqpType<?,?>, AmqpType<?,?>>());
+            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>,AmqpType<?,?>>(new HashMap<AmqpType<?,?>,AmqpType<?,?>>());
         }
 
         AmqpMapBean(IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value) {
@@ -74,12 +72,12 @@
             getBuffer(marshaller).marshal(out, marshaller);
         }
 
-        public void put(AmqpType<?, ?> key, AmqpType<?, ?> value) {
+        public void put(AmqpType<?,?> key, AmqpType<?,?> value) {
             copyCheck();
             bean.value.put(key, value);
         }
 
-        public AmqpType<?, ?> get(Object key) {
+        public AmqpType<?,?> get(Object key) {
             return bean.value.get(key);
         }
 
@@ -87,14 +85,10 @@
             return bean.value.getEntryCount();
         }
 
-        public Iterator<Map.Entry<AmqpType<?, ?>, AmqpType<?, ?>>> iterator() {
+        public Iterator<Map.Entry<AmqpType<?,?>, AmqpType<?,?>>> iterator() {
             return bean.value.iterator();
         }
 
-        public IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getValue() {
-            return bean.value;
-        }
-
 
         private final void copyCheck() {
             if(buffer != null) {;
@@ -150,11 +144,11 @@
         public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
             encoded.marshal(out);
         }
-        public void put(AmqpType<?, ?> key, AmqpType<?, ?> value) {
+        public void put(AmqpType<?,?> key, AmqpType<?,?> value) {
             bean().put(key, value);
         }
 
-        public AmqpType<?, ?> get(Object key) {
+        public AmqpType<?,?> get(Object key) {
             return bean().get(key);
         }
 
@@ -162,14 +156,10 @@
             return bean().getEntryCount();
         }
 
-        public Iterator<Map.Entry<AmqpType<?, ?>, AmqpType<?, ?>>> iterator() {
+        public Iterator<Map.Entry<AmqpType<?,?>, AmqpType<?,?>>> iterator() {
             return bean().iterator();
         }
 
-        public IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getValue() {
-            return bean().getValue();
-        }
-
         public AmqpMap.AmqpMapBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMessageAttributes.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMessageAttributes.java?rev=909704&r1=909703&r2=909704&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMessageAttributes.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMessageAttributes.java Sat Feb 13 03:20:16 2010
@@ -48,7 +48,7 @@
         private IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value;
 
         AmqpMessageAttributesBean() {
-            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>, AmqpType<?,?>>(new HashMap<AmqpType<?,?>, AmqpType<?,?>>());
+            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>,AmqpType<?,?>>(new HashMap<AmqpType<?,?>,AmqpType<?,?>>());
         }
 
         AmqpMessageAttributesBean(IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value) {
@@ -74,12 +74,12 @@
             getBuffer(marshaller).marshal(out, marshaller);
         }
 
-        public void put(AmqpType<?, ?> key, AmqpType<?, ?> value) {
+        public void put(AmqpType<?,?> key, AmqpType<?,?> value) {
             copyCheck();
             bean.value.put(key, value);
         }
 
-        public AmqpType<?, ?> get(Object key) {
+        public AmqpType<?,?> get(Object key) {
             return bean.value.get(key);
         }
 
@@ -87,14 +87,10 @@
             return bean.value.getEntryCount();
         }
 
-        public Iterator<Map.Entry<AmqpType<?, ?>, AmqpType<?, ?>>> iterator() {
+        public Iterator<Map.Entry<AmqpType<?,?>, AmqpType<?,?>>> iterator() {
             return bean.value.iterator();
         }
 
-        public IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getValue() {
-            return bean.value;
-        }
-
 
         private final void copyCheck() {
             if(buffer != null) {;
@@ -142,11 +138,11 @@
         protected AmqpMessageAttributesBuffer(Encoded<IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
-        public void put(AmqpType<?, ?> key, AmqpType<?, ?> value) {
+        public void put(AmqpType<?,?> key, AmqpType<?,?> value) {
             bean().put(key, value);
         }
 
-        public AmqpType<?, ?> get(Object key) {
+        public AmqpType<?,?> get(Object key) {
             return bean().get(key);
         }
 
@@ -154,14 +150,10 @@
             return bean().getEntryCount();
         }
 
-        public Iterator<Map.Entry<AmqpType<?, ?>, AmqpType<?, ?>>> iterator() {
+        public Iterator<Map.Entry<AmqpType<?,?>, AmqpType<?,?>>> iterator() {
             return bean().iterator();
         }
 
-        public IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getValue() {
-            return bean().getValue();
-        }
-
         public AmqpMessageAttributes.AmqpMessageAttributesBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }



Mime
View raw message