activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmacn...@apache.org
Subject svn commit: r909704 [8/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/AmqpNoop.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpNoop.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/AmqpNoop.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpNoop.java Sat Feb 13 03:20:16 2010
@@ -57,128 +57,128 @@
         AmqpNoopBean() {
         }
 
-        AmqpNoopBean(IAmqpList value) {
+        AmqpNoopBean(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));
+            }
         }
-    }
-
-    AmqpNoopBean(AmqpNoop.AmqpNoopBean other) {
-        this.bean = other;
-    }
 
-    public final AmqpNoopBean copy() {
-        return new AmqpNoop.AmqpNoopBean(bean);
-    }
-
-    public final void handle(AmqpCommandHandler handler) throws Exception {
-        handler.handleNoop(this);
-    }
+        AmqpNoopBean(AmqpNoop.AmqpNoopBean other) {
+            this.bean = other;
+        }
 
-    public final AmqpNoop.AmqpNoopBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpNoopBuffer(marshaller.encode(this));
+        public final AmqpNoopBean copy() {
+            return new AmqpNoop.AmqpNoopBean(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.handleNoop(this);
+        }
 
+        public final AmqpNoop.AmqpNoopBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpNoopBuffer(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 set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setOptions((AmqpOptions) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setOptions(AmqpOptions options) {
+            copyCheck();
+            bean.options = options;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
+        public final AmqpOptions getOptions() {
             return bean.options;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-        }
-    }
-
-    public int getListCount() {
-        return 1;
-    }
 
-    public IAmqpList getValue() {
-        return bean;
-    }
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setOptions((AmqpOptions) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
+        }
 
-    public Iterator<AmqpType<?, ?>> iterator() {
-        return new AmqpListIterator(bean);
-    }
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.options;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
+        }
 
+        public int getListCount() {
+            return 1;
+        }
 
-    private final void copyCheck() {
-        if(buffer != null) {;
-            throw new IllegalStateException("unwriteable");
+        public IAmqpList<AmqpType<?, ?>> getValue() {
+            return bean;
         }
-        if(bean != this) {;
-            copy(bean);
+
+        public Iterator<AmqpType<?, ?>> iterator() {
+            return new AmqpListIterator<AmqpType<?, ?>>(bean);
         }
-    }
 
-    private final void copy(AmqpNoop.AmqpNoopBean other) {
-        bean = this;
-    }
 
-    public boolean equals(Object o){
-        if(this == o) {
-            return true;
+        private final void copyCheck() {
+            if(buffer != null) {;
+                throw new IllegalStateException("unwriteable");
+            }
+            if(bean != this) {;
+                copy(bean);
+            }
         }
 
-        if(o == null || !(o instanceof AmqpNoop)) {
-            return false;
+        private final void copy(AmqpNoop.AmqpNoopBean other) {
+            bean = this;
         }
 
-        return equals((AmqpNoop) o);
-    }
+        public boolean equals(Object o){
+            if(this == o) {
+                return true;
+            }
 
-    public boolean equals(AmqpNoop b) {
+            if(o == null || !(o instanceof AmqpNoop)) {
+                return false;
+            }
 
-        if(b.getOptions() == null ^ getOptions() == null) {
-            return false;
+            return equals((AmqpNoop) o);
         }
-        if(b.getOptions() != null && !b.getOptions().equals(getOptions())){ 
-            return false;
+
+        public boolean equals(AmqpNoop b) {
+
+            if(b.getOptions() == null ^ getOptions() == null) {
+                return false;
+            }
+            if(b.getOptions() != null && !b.getOptions().equals(getOptions())){ 
+                return false;
+            }
+            return true;
         }
-        return true;
-    }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
+        }
     }
-}
 
     public static class AmqpNoopBuffer extends AmqpList.AmqpListBuffer implements AmqpNoop{
 
         private AmqpNoopBean bean;
 
-        protected AmqpNoopBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpNoopBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -206,10 +206,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpNoop.AmqpNoopBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -238,7 +234,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpNoop.AmqpNoopBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpNoop.AmqpNoopBuffer 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/AmqpOpen.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOpen.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/AmqpOpen.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOpen.java Sat Feb 13 03:20:16 2010
@@ -270,7 +270,7 @@
      * need not be supplied in the outgoing-locales.
      * </p>
      */
-    public IAmqpList getOutgoingLocales();
+    public IAmqpList<AmqpType<?, ?>> getOutgoingLocales();
 
     /**
      * desired locales for incoming text in decreasing level of preference
@@ -298,7 +298,7 @@
      * specified in the outgoing-locales field.
      * </p>
      */
-    public IAmqpList getIncomingLocales();
+    public IAmqpList<AmqpType<?, ?>> getIncomingLocales();
 
     /**
      * peer properties
@@ -338,7 +338,7 @@
      * not present in the offered-capability list then it MUST close the connection.
      * </p>
      */
-    public IAmqpList getOfferedCapabilities();
+    public IAmqpList<AmqpType<?, ?>> getOfferedCapabilities();
 
     /**
      * the extension capabilities the sender may use if the receiver supports them
@@ -364,7 +364,7 @@
      * Connection.
      * </p>
      */
-    public IAmqpList getDesiredCapabilities();
+    public IAmqpList<AmqpType<?, ?>> getDesiredCapabilities();
 
     public static class AmqpOpenBean implements AmqpOpen{
 
@@ -385,398 +385,398 @@
         AmqpOpenBean() {
         }
 
-        AmqpOpenBean(IAmqpList value) {
+        AmqpOpenBean(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));
+            }
         }
-    }
-
-    AmqpOpenBean(AmqpOpen.AmqpOpenBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpOpenBean copy() {
-        return new AmqpOpen.AmqpOpenBean(bean);
-    }
-
-    public final void handle(AmqpCommandHandler handler) throws Exception {
-        handler.handleOpen(this);
-    }
 
-    public final AmqpOpen.AmqpOpenBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpOpenBuffer(marshaller.encode(this));
+        AmqpOpenBean(AmqpOpen.AmqpOpenBean 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 setOptions(AmqpOptions options) {
-        copyCheck();
-        bean.options = options;
-    }
-
-    public final AmqpOptions getOptions() {
-        return bean.options;
-    }
-
-    public void setContainerId(String containerId) {
-        setContainerId(TypeFactory.createAmqpString(containerId));
-    }
-
-
-    public final void setContainerId(AmqpString containerId) {
-        copyCheck();
-        bean.containerId = containerId;
-    }
-
-    public final String getContainerId() {
-        return bean.containerId.getValue();
-    }
-
-    public void setHostname(String hostname) {
-        setHostname(TypeFactory.createAmqpString(hostname));
-    }
 
+        public final AmqpOpenBean copy() {
+            return new AmqpOpen.AmqpOpenBean(bean);
+        }
 
-    public final void setHostname(AmqpString hostname) {
-        copyCheck();
-        bean.hostname = hostname;
-    }
+        public final void handle(AmqpCommandHandler handler) throws Exception {
+            handler.handleOpen(this);
+        }
 
-    public final String getHostname() {
-        return bean.hostname.getValue();
-    }
+        public final AmqpOpen.AmqpOpenBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpOpenBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public void setMaxFrameSize(Long maxFrameSize) {
-        setMaxFrameSize(TypeFactory.createAmqpUint(maxFrameSize));
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
 
-    public void setMaxFrameSize(long maxFrameSize) {
-        setMaxFrameSize(TypeFactory.createAmqpUint(maxFrameSize));
-    }
+        public final void setOptions(AmqpOptions options) {
+            copyCheck();
+            bean.options = options;
+        }
 
+        public final AmqpOptions getOptions() {
+            return bean.options;
+        }
 
-    public final void setMaxFrameSize(AmqpUint maxFrameSize) {
-        copyCheck();
-        bean.maxFrameSize = maxFrameSize;
-    }
+        public void setContainerId(String containerId) {
+            setContainerId(TypeFactory.createAmqpString(containerId));
+        }
 
-    public final Long getMaxFrameSize() {
-        return bean.maxFrameSize.getValue();
-    }
 
-    public void setChannelMax(Integer channelMax) {
-        setChannelMax(TypeFactory.createAmqpUshort(channelMax));
-    }
+        public final void setContainerId(AmqpString containerId) {
+            copyCheck();
+            bean.containerId = containerId;
+        }
 
+        public final String getContainerId() {
+            return bean.containerId.getValue();
+        }
 
-    public void setChannelMax(int channelMax) {
-        setChannelMax(TypeFactory.createAmqpUshort(channelMax));
-    }
+        public void setHostname(String hostname) {
+            setHostname(TypeFactory.createAmqpString(hostname));
+        }
 
 
-    public final void setChannelMax(AmqpUshort channelMax) {
-        copyCheck();
-        bean.channelMax = channelMax;
-    }
+        public final void setHostname(AmqpString hostname) {
+            copyCheck();
+            bean.hostname = hostname;
+        }
 
-    public final Integer getChannelMax() {
-        return bean.channelMax.getValue();
-    }
+        public final String getHostname() {
+            return bean.hostname.getValue();
+        }
 
-    public void setHeartbeatInterval(Integer heartbeatInterval) {
-        setHeartbeatInterval(TypeFactory.createAmqpUshort(heartbeatInterval));
-    }
+        public void setMaxFrameSize(Long maxFrameSize) {
+            setMaxFrameSize(TypeFactory.createAmqpUint(maxFrameSize));
+        }
 
 
-    public void setHeartbeatInterval(int heartbeatInterval) {
-        setHeartbeatInterval(TypeFactory.createAmqpUshort(heartbeatInterval));
-    }
+        public void setMaxFrameSize(long maxFrameSize) {
+            setMaxFrameSize(TypeFactory.createAmqpUint(maxFrameSize));
+        }
 
 
-    public final void setHeartbeatInterval(AmqpUshort heartbeatInterval) {
-        copyCheck();
-        bean.heartbeatInterval = heartbeatInterval;
-    }
+        public final void setMaxFrameSize(AmqpUint maxFrameSize) {
+            copyCheck();
+            bean.maxFrameSize = maxFrameSize;
+        }
 
-    public final Integer getHeartbeatInterval() {
-        return bean.heartbeatInterval.getValue();
-    }
+        public final Long getMaxFrameSize() {
+            return bean.maxFrameSize.getValue();
+        }
 
-    public final void setOutgoingLocales(AmqpList outgoingLocales) {
-        copyCheck();
-        bean.outgoingLocales = outgoingLocales;
-    }
+        public void setChannelMax(Integer channelMax) {
+            setChannelMax(TypeFactory.createAmqpUshort(channelMax));
+        }
 
-    public final IAmqpList getOutgoingLocales() {
-        return bean.outgoingLocales.getValue();
-    }
 
-    public final void setIncomingLocales(AmqpList incomingLocales) {
-        copyCheck();
-        bean.incomingLocales = incomingLocales;
-    }
+        public void setChannelMax(int channelMax) {
+            setChannelMax(TypeFactory.createAmqpUshort(channelMax));
+        }
 
-    public final IAmqpList getIncomingLocales() {
-        return bean.incomingLocales.getValue();
-    }
 
-    public final void setPeerProperties(AmqpMap peerProperties) {
-        copyCheck();
-        bean.peerProperties = peerProperties;
-    }
+        public final void setChannelMax(AmqpUshort channelMax) {
+            copyCheck();
+            bean.channelMax = channelMax;
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getPeerProperties() {
-        return bean.peerProperties.getValue();
-    }
+        public final Integer getChannelMax() {
+            return bean.channelMax.getValue();
+        }
 
-    public final void setOfferedCapabilities(AmqpList offeredCapabilities) {
-        copyCheck();
-        bean.offeredCapabilities = offeredCapabilities;
-    }
+        public void setHeartbeatInterval(Integer heartbeatInterval) {
+            setHeartbeatInterval(TypeFactory.createAmqpUshort(heartbeatInterval));
+        }
 
-    public final IAmqpList getOfferedCapabilities() {
-        return bean.offeredCapabilities.getValue();
-    }
 
-    public final void setDesiredCapabilities(AmqpList desiredCapabilities) {
-        copyCheck();
-        bean.desiredCapabilities = desiredCapabilities;
-    }
+        public void setHeartbeatInterval(int heartbeatInterval) {
+            setHeartbeatInterval(TypeFactory.createAmqpUshort(heartbeatInterval));
+        }
 
-    public final IAmqpList getDesiredCapabilities() {
-        return bean.desiredCapabilities.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setOptions((AmqpOptions) value);
-            break;
-        }
-        case 1: {
-            setContainerId((AmqpString) value);
-            break;
-        }
-        case 2: {
-            setHostname((AmqpString) value);
-            break;
-        }
-        case 3: {
-            setMaxFrameSize((AmqpUint) value);
-            break;
-        }
-        case 4: {
-            setChannelMax((AmqpUshort) value);
-            break;
-        }
-        case 5: {
-            setHeartbeatInterval((AmqpUshort) value);
-            break;
-        }
-        case 6: {
-            setOutgoingLocales((AmqpList) value);
-            break;
-        }
-        case 7: {
-            setIncomingLocales((AmqpList) value);
-            break;
-        }
-        case 8: {
-            setPeerProperties((AmqpMap) value);
-            break;
-        }
-        case 9: {
-            setOfferedCapabilities((AmqpList) value);
-            break;
-        }
-        case 10: {
-            setDesiredCapabilities((AmqpList) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setHeartbeatInterval(AmqpUshort heartbeatInterval) {
+            copyCheck();
+            bean.heartbeatInterval = heartbeatInterval;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.options;
-        }
-        case 1: {
-            return bean.containerId;
-        }
-        case 2: {
-            return bean.hostname;
-        }
-        case 3: {
-            return bean.maxFrameSize;
-        }
-        case 4: {
-            return bean.channelMax;
+        public final Integer getHeartbeatInterval() {
+            return bean.heartbeatInterval.getValue();
         }
-        case 5: {
-            return bean.heartbeatInterval;
+
+        public final void setOutgoingLocales(AmqpList outgoingLocales) {
+            copyCheck();
+            bean.outgoingLocales = outgoingLocales;
         }
-        case 6: {
+
+        public final IAmqpList<AmqpType<?, ?>> getOutgoingLocales() {
             return bean.outgoingLocales;
         }
-        case 7: {
+
+        public final void setIncomingLocales(AmqpList incomingLocales) {
+            copyCheck();
+            bean.incomingLocales = incomingLocales;
+        }
+
+        public final IAmqpList<AmqpType<?, ?>> getIncomingLocales() {
             return bean.incomingLocales;
         }
-        case 8: {
+
+        public final void setPeerProperties(AmqpMap peerProperties) {
+            copyCheck();
+            bean.peerProperties = peerProperties;
+        }
+
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getPeerProperties() {
             return bean.peerProperties;
         }
-        case 9: {
+
+        public final void setOfferedCapabilities(AmqpList offeredCapabilities) {
+            copyCheck();
+            bean.offeredCapabilities = offeredCapabilities;
+        }
+
+        public final IAmqpList<AmqpType<?, ?>> getOfferedCapabilities() {
             return bean.offeredCapabilities;
         }
-        case 10: {
+
+        public final void setDesiredCapabilities(AmqpList desiredCapabilities) {
+            copyCheck();
+            bean.desiredCapabilities = desiredCapabilities;
+        }
+
+        public final IAmqpList<AmqpType<?, ?>> getDesiredCapabilities() {
             return bean.desiredCapabilities;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setOptions((AmqpOptions) value);
+                break;
+            }
+            case 1: {
+                setContainerId((AmqpString) value);
+                break;
+            }
+            case 2: {
+                setHostname((AmqpString) value);
+                break;
+            }
+            case 3: {
+                setMaxFrameSize((AmqpUint) value);
+                break;
+            }
+            case 4: {
+                setChannelMax((AmqpUshort) value);
+                break;
+            }
+            case 5: {
+                setHeartbeatInterval((AmqpUshort) value);
+                break;
+            }
+            case 6: {
+                setOutgoingLocales((AmqpList) value);
+                break;
+            }
+            case 7: {
+                setIncomingLocales((AmqpList) value);
+                break;
+            }
+            case 8: {
+                setPeerProperties((AmqpMap) value);
+                break;
+            }
+            case 9: {
+                setOfferedCapabilities((AmqpList) value);
+                break;
+            }
+            case 10: {
+                setDesiredCapabilities((AmqpList) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.options;
+            }
+            case 1: {
+                return bean.containerId;
+            }
+            case 2: {
+                return bean.hostname;
+            }
+            case 3: {
+                return bean.maxFrameSize;
+            }
+            case 4: {
+                return bean.channelMax;
+            }
+            case 5: {
+                return bean.heartbeatInterval;
+            }
+            case 6: {
+                return bean.outgoingLocales;
+            }
+            case 7: {
+                return bean.incomingLocales;
+            }
+            case 8: {
+                return bean.peerProperties;
+            }
+            case 9: {
+                return bean.offeredCapabilities;
+            }
+            case 10: {
+                return bean.desiredCapabilities;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 11;
-    }
+        public int getListCount() {
+            return 11;
+        }
 
-    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(AmqpOpen.AmqpOpenBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpOpen.AmqpOpenBean 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 AmqpOpen)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpOpen)) {
-            return false;
+            return equals((AmqpOpen) o);
         }
 
-        return equals((AmqpOpen) o);
-    }
+        public boolean equals(AmqpOpen b) {
 
-    public boolean equals(AmqpOpen 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.getContainerId() == null ^ getContainerId() == null) {
+                return false;
+            }
+            if(b.getContainerId() != null && !b.getContainerId().equals(getContainerId())){ 
+                return false;
+            }
 
-        if(b.getContainerId() == null ^ getContainerId() == null) {
-            return false;
-        }
-        if(b.getContainerId() != null && !b.getContainerId().equals(getContainerId())){ 
-            return false;
-        }
+            if(b.getHostname() == null ^ getHostname() == null) {
+                return false;
+            }
+            if(b.getHostname() != null && !b.getHostname().equals(getHostname())){ 
+                return false;
+            }
 
-        if(b.getHostname() == null ^ getHostname() == null) {
-            return false;
-        }
-        if(b.getHostname() != null && !b.getHostname().equals(getHostname())){ 
-            return false;
-        }
+            if(b.getMaxFrameSize() == null ^ getMaxFrameSize() == null) {
+                return false;
+            }
+            if(b.getMaxFrameSize() != null && !b.getMaxFrameSize().equals(getMaxFrameSize())){ 
+                return false;
+            }
 
-        if(b.getMaxFrameSize() == null ^ getMaxFrameSize() == null) {
-            return false;
-        }
-        if(b.getMaxFrameSize() != null && !b.getMaxFrameSize().equals(getMaxFrameSize())){ 
-            return false;
-        }
+            if(b.getChannelMax() == null ^ getChannelMax() == null) {
+                return false;
+            }
+            if(b.getChannelMax() != null && !b.getChannelMax().equals(getChannelMax())){ 
+                return false;
+            }
 
-        if(b.getChannelMax() == null ^ getChannelMax() == null) {
-            return false;
-        }
-        if(b.getChannelMax() != null && !b.getChannelMax().equals(getChannelMax())){ 
-            return false;
-        }
+            if(b.getHeartbeatInterval() == null ^ getHeartbeatInterval() == null) {
+                return false;
+            }
+            if(b.getHeartbeatInterval() != null && !b.getHeartbeatInterval().equals(getHeartbeatInterval())){ 
+                return false;
+            }
 
-        if(b.getHeartbeatInterval() == null ^ getHeartbeatInterval() == null) {
-            return false;
-        }
-        if(b.getHeartbeatInterval() != null && !b.getHeartbeatInterval().equals(getHeartbeatInterval())){ 
-            return false;
-        }
+            if(b.getOutgoingLocales() == null ^ getOutgoingLocales() == null) {
+                return false;
+            }
+            if(b.getOutgoingLocales() != null && !b.getOutgoingLocales().equals(getOutgoingLocales())){ 
+                return false;
+            }
 
-        if(b.getOutgoingLocales() == null ^ getOutgoingLocales() == null) {
-            return false;
-        }
-        if(b.getOutgoingLocales() != null && !b.getOutgoingLocales().equals(getOutgoingLocales())){ 
-            return false;
-        }
+            if(b.getIncomingLocales() == null ^ getIncomingLocales() == null) {
+                return false;
+            }
+            if(b.getIncomingLocales() != null && !b.getIncomingLocales().equals(getIncomingLocales())){ 
+                return false;
+            }
 
-        if(b.getIncomingLocales() == null ^ getIncomingLocales() == null) {
-            return false;
-        }
-        if(b.getIncomingLocales() != null && !b.getIncomingLocales().equals(getIncomingLocales())){ 
-            return false;
-        }
+            if(b.getPeerProperties() == null ^ getPeerProperties() == null) {
+                return false;
+            }
+            if(b.getPeerProperties() != null && !b.getPeerProperties().equals(getPeerProperties())){ 
+                return false;
+            }
 
-        if(b.getPeerProperties() == null ^ getPeerProperties() == null) {
-            return false;
-        }
-        if(b.getPeerProperties() != null && !b.getPeerProperties().equals(getPeerProperties())){ 
-            return false;
-        }
+            if(b.getOfferedCapabilities() == null ^ getOfferedCapabilities() == null) {
+                return false;
+            }
+            if(b.getOfferedCapabilities() != null && !b.getOfferedCapabilities().equals(getOfferedCapabilities())){ 
+                return false;
+            }
 
-        if(b.getOfferedCapabilities() == null ^ getOfferedCapabilities() == null) {
-            return false;
-        }
-        if(b.getOfferedCapabilities() != null && !b.getOfferedCapabilities().equals(getOfferedCapabilities())){ 
-            return false;
+            if(b.getDesiredCapabilities() == null ^ getDesiredCapabilities() == null) {
+                return false;
+            }
+            if(b.getDesiredCapabilities() != null && !b.getDesiredCapabilities().equals(getDesiredCapabilities())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getDesiredCapabilities() == null ^ getDesiredCapabilities() == null) {
-            return false;
-        }
-        if(b.getDesiredCapabilities() != null && !b.getDesiredCapabilities().equals(getDesiredCapabilities())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
-    }
-
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
     }
-}
 
     public static class AmqpOpenBuffer extends AmqpList.AmqpListBuffer implements AmqpOpen{
 
         private AmqpOpenBean bean;
 
-        protected AmqpOpenBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpOpenBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -867,7 +867,7 @@
             bean().setOutgoingLocales(outgoingLocales);
         }
 
-        public final IAmqpList getOutgoingLocales() {
+        public final IAmqpList<AmqpType<?, ?>> getOutgoingLocales() {
             return bean().getOutgoingLocales();
         }
 
@@ -875,7 +875,7 @@
             bean().setIncomingLocales(incomingLocales);
         }
 
-        public final IAmqpList getIncomingLocales() {
+        public final IAmqpList<AmqpType<?, ?>> getIncomingLocales() {
             return bean().getIncomingLocales();
         }
 
@@ -891,7 +891,7 @@
             bean().setOfferedCapabilities(offeredCapabilities);
         }
 
-        public final IAmqpList getOfferedCapabilities() {
+        public final IAmqpList<AmqpType<?, ?>> getOfferedCapabilities() {
             return bean().getOfferedCapabilities();
         }
 
@@ -899,7 +899,7 @@
             bean().setDesiredCapabilities(desiredCapabilities);
         }
 
-        public final IAmqpList getDesiredCapabilities() {
+        public final IAmqpList<AmqpType<?, ?>> getDesiredCapabilities() {
             return bean().getDesiredCapabilities();
         }
 
@@ -919,10 +919,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpOpen.AmqpOpenBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -951,7 +947,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpOpen.AmqpOpenBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpOpen.AmqpOpenBuffer 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/AmqpOptions.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOptions.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/AmqpOptions.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOptions.java Sat Feb 13 03:20:16 2010
@@ -47,7 +47,7 @@
         private IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value;
 
         AmqpOptionsBean() {
-            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>, AmqpType<?,?>>(new HashMap<AmqpType<?,?>, AmqpType<?,?>>());
+            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>,AmqpType<?,?>>(new HashMap<AmqpType<?,?>,AmqpType<?,?>>());
         }
 
         AmqpOptionsBean(IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value) {
@@ -73,12 +73,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);
         }
 
@@ -86,14 +86,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) {;
@@ -141,11 +137,11 @@
         protected AmqpOptionsBuffer(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);
         }
 
@@ -153,14 +149,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 AmqpOptions.AmqpOptionsBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpProperties.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpProperties.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/AmqpProperties.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpProperties.java Sat Feb 13 03:20:16 2010
@@ -266,297 +266,297 @@
         AmqpPropertiesBean() {
         }
 
-        AmqpPropertiesBean(IAmqpList value) {
+        AmqpPropertiesBean(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));
+            }
         }
-    }
-
-    AmqpPropertiesBean(AmqpProperties.AmqpPropertiesBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpPropertiesBean copy() {
-        return new AmqpProperties.AmqpPropertiesBean(bean);
-    }
 
-    public final AmqpProperties.AmqpPropertiesBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpPropertiesBuffer(marshaller.encode(this));
+        AmqpPropertiesBean(AmqpProperties.AmqpPropertiesBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
 
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
+        public final AmqpPropertiesBean copy() {
+            return new AmqpProperties.AmqpPropertiesBean(bean);
+        }
 
+        public final AmqpProperties.AmqpPropertiesBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpPropertiesBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public void setMessageId(Buffer messageId) {
-        setMessageId(TypeFactory.createAmqpBinary(messageId));
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
 
-    public final void setMessageId(AmqpBinary messageId) {
-        copyCheck();
-        bean.messageId = messageId;
-    }
+        public void setMessageId(Buffer messageId) {
+            setMessageId(TypeFactory.createAmqpBinary(messageId));
+        }
 
-    public final Buffer getMessageId() {
-        return bean.messageId.getValue();
-    }
 
-    public void setUserId(Buffer userId) {
-        setUserId(TypeFactory.createAmqpBinary(userId));
-    }
+        public final void setMessageId(AmqpBinary messageId) {
+            copyCheck();
+            bean.messageId = messageId;
+        }
 
+        public final Buffer getMessageId() {
+            return bean.messageId.getValue();
+        }
 
-    public final void setUserId(AmqpBinary userId) {
-        copyCheck();
-        bean.userId = userId;
-    }
+        public void setUserId(Buffer userId) {
+            setUserId(TypeFactory.createAmqpBinary(userId));
+        }
 
-    public final Buffer getUserId() {
-        return bean.userId.getValue();
-    }
 
-    public void setTo(String to) {
-        setTo(TypeFactory.createAmqpString(to));
-    }
+        public final void setUserId(AmqpBinary userId) {
+            copyCheck();
+            bean.userId = userId;
+        }
 
+        public final Buffer getUserId() {
+            return bean.userId.getValue();
+        }
 
-    public final void setTo(AmqpString to) {
-        copyCheck();
-        bean.to = to;
-    }
+        public void setTo(String to) {
+            setTo(TypeFactory.createAmqpString(to));
+        }
 
-    public final String getTo() {
-        return bean.to.getValue();
-    }
 
-    public void setReplyTo(String replyTo) {
-        setReplyTo(TypeFactory.createAmqpString(replyTo));
-    }
+        public final void setTo(AmqpString to) {
+            copyCheck();
+            bean.to = to;
+        }
 
+        public final String getTo() {
+            return bean.to.getValue();
+        }
 
-    public final void setReplyTo(AmqpString replyTo) {
-        copyCheck();
-        bean.replyTo = replyTo;
-    }
+        public void setReplyTo(String replyTo) {
+            setReplyTo(TypeFactory.createAmqpString(replyTo));
+        }
 
-    public final String getReplyTo() {
-        return bean.replyTo.getValue();
-    }
 
-    public void setCorrelationId(Buffer correlationId) {
-        setCorrelationId(TypeFactory.createAmqpBinary(correlationId));
-    }
+        public final void setReplyTo(AmqpString replyTo) {
+            copyCheck();
+            bean.replyTo = replyTo;
+        }
 
+        public final String getReplyTo() {
+            return bean.replyTo.getValue();
+        }
 
-    public final void setCorrelationId(AmqpBinary correlationId) {
-        copyCheck();
-        bean.correlationId = correlationId;
-    }
+        public void setCorrelationId(Buffer correlationId) {
+            setCorrelationId(TypeFactory.createAmqpBinary(correlationId));
+        }
 
-    public final Buffer getCorrelationId() {
-        return bean.correlationId.getValue();
-    }
 
-    public void setContentLength(BigInteger contentLength) {
-        setContentLength(TypeFactory.createAmqpUlong(contentLength));
-    }
+        public final void setCorrelationId(AmqpBinary correlationId) {
+            copyCheck();
+            bean.correlationId = correlationId;
+        }
 
+        public final Buffer getCorrelationId() {
+            return bean.correlationId.getValue();
+        }
 
-    public final void setContentLength(AmqpUlong contentLength) {
-        copyCheck();
-        bean.contentLength = contentLength;
-    }
+        public void setContentLength(BigInteger contentLength) {
+            setContentLength(TypeFactory.createAmqpUlong(contentLength));
+        }
 
-    public final BigInteger getContentLength() {
-        return bean.contentLength.getValue();
-    }
 
-    public void setContentType(String contentType) {
-        setContentType(TypeFactory.createAmqpSymbol(contentType));
-    }
+        public final void setContentLength(AmqpUlong contentLength) {
+            copyCheck();
+            bean.contentLength = contentLength;
+        }
 
+        public final BigInteger getContentLength() {
+            return bean.contentLength.getValue();
+        }
 
-    public final void setContentType(AmqpSymbol contentType) {
-        copyCheck();
-        bean.contentType = contentType;
-    }
+        public void setContentType(String contentType) {
+            setContentType(TypeFactory.createAmqpSymbol(contentType));
+        }
 
-    public final String getContentType() {
-        return bean.contentType.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setMessageId((AmqpBinary) value);
-            break;
-        }
-        case 1: {
-            setUserId((AmqpBinary) value);
-            break;
-        }
-        case 2: {
-            setTo((AmqpString) value);
-            break;
-        }
-        case 3: {
-            setReplyTo((AmqpString) value);
-            break;
-        }
-        case 4: {
-            setCorrelationId((AmqpBinary) value);
-            break;
-        }
-        case 5: {
-            setContentLength((AmqpUlong) value);
-            break;
-        }
-        case 6: {
-            setContentType((AmqpSymbol) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setContentType(AmqpSymbol contentType) {
+            copyCheck();
+            bean.contentType = contentType;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.messageId;
-        }
-        case 1: {
-            return bean.userId;
-        }
-        case 2: {
-            return bean.to;
-        }
-        case 3: {
-            return bean.replyTo;
-        }
-        case 4: {
-            return bean.correlationId;
-        }
-        case 5: {
-            return bean.contentLength;
-        }
-        case 6: {
-            return bean.contentType;
+        public final String getContentType() {
+            return bean.contentType.getValue();
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setMessageId((AmqpBinary) value);
+                break;
+            }
+            case 1: {
+                setUserId((AmqpBinary) value);
+                break;
+            }
+            case 2: {
+                setTo((AmqpString) value);
+                break;
+            }
+            case 3: {
+                setReplyTo((AmqpString) value);
+                break;
+            }
+            case 4: {
+                setCorrelationId((AmqpBinary) value);
+                break;
+            }
+            case 5: {
+                setContentLength((AmqpUlong) value);
+                break;
+            }
+            case 6: {
+                setContentType((AmqpSymbol) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.messageId;
+            }
+            case 1: {
+                return bean.userId;
+            }
+            case 2: {
+                return bean.to;
+            }
+            case 3: {
+                return bean.replyTo;
+            }
+            case 4: {
+                return bean.correlationId;
+            }
+            case 5: {
+                return bean.contentLength;
+            }
+            case 6: {
+                return bean.contentType;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 7;
-    }
+        public int getListCount() {
+            return 7;
+        }
 
-    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(AmqpProperties.AmqpPropertiesBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpProperties.AmqpPropertiesBean 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 AmqpProperties)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpProperties)) {
-            return false;
+            return equals((AmqpProperties) o);
         }
 
-        return equals((AmqpProperties) o);
-    }
+        public boolean equals(AmqpProperties b) {
 
-    public boolean equals(AmqpProperties b) {
+            if(b.getMessageId() == null ^ getMessageId() == null) {
+                return false;
+            }
+            if(b.getMessageId() != null && !b.getMessageId().equals(getMessageId())){ 
+                return false;
+            }
 
-        if(b.getMessageId() == null ^ getMessageId() == null) {
-            return false;
-        }
-        if(b.getMessageId() != null && !b.getMessageId().equals(getMessageId())){ 
-            return false;
-        }
+            if(b.getUserId() == null ^ getUserId() == null) {
+                return false;
+            }
+            if(b.getUserId() != null && !b.getUserId().equals(getUserId())){ 
+                return false;
+            }
 
-        if(b.getUserId() == null ^ getUserId() == null) {
-            return false;
-        }
-        if(b.getUserId() != null && !b.getUserId().equals(getUserId())){ 
-            return false;
-        }
+            if(b.getTo() == null ^ getTo() == null) {
+                return false;
+            }
+            if(b.getTo() != null && !b.getTo().equals(getTo())){ 
+                return false;
+            }
 
-        if(b.getTo() == null ^ getTo() == null) {
-            return false;
-        }
-        if(b.getTo() != null && !b.getTo().equals(getTo())){ 
-            return false;
-        }
+            if(b.getReplyTo() == null ^ getReplyTo() == null) {
+                return false;
+            }
+            if(b.getReplyTo() != null && !b.getReplyTo().equals(getReplyTo())){ 
+                return false;
+            }
 
-        if(b.getReplyTo() == null ^ getReplyTo() == null) {
-            return false;
-        }
-        if(b.getReplyTo() != null && !b.getReplyTo().equals(getReplyTo())){ 
-            return false;
-        }
+            if(b.getCorrelationId() == null ^ getCorrelationId() == null) {
+                return false;
+            }
+            if(b.getCorrelationId() != null && !b.getCorrelationId().equals(getCorrelationId())){ 
+                return false;
+            }
 
-        if(b.getCorrelationId() == null ^ getCorrelationId() == null) {
-            return false;
-        }
-        if(b.getCorrelationId() != null && !b.getCorrelationId().equals(getCorrelationId())){ 
-            return false;
-        }
+            if(b.getContentLength() == null ^ getContentLength() == null) {
+                return false;
+            }
+            if(b.getContentLength() != null && !b.getContentLength().equals(getContentLength())){ 
+                return false;
+            }
 
-        if(b.getContentLength() == null ^ getContentLength() == null) {
-            return false;
-        }
-        if(b.getContentLength() != null && !b.getContentLength().equals(getContentLength())){ 
-            return false;
+            if(b.getContentType() == null ^ getContentType() == null) {
+                return false;
+            }
+            if(b.getContentType() != null && !b.getContentType().equals(getContentType())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getContentType() == null ^ getContentType() == null) {
-            return false;
-        }
-        if(b.getContentType() != null && !b.getContentType().equals(getContentType())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
     }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
-    }
-}
-
     public static class AmqpPropertiesBuffer extends AmqpList.AmqpListBuffer implements AmqpProperties{
 
         private AmqpPropertiesBean bean;
 
-        protected AmqpPropertiesBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpPropertiesBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -660,10 +660,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpProperties.AmqpPropertiesBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -688,7 +684,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpProperties.AmqpPropertiesBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpProperties.AmqpPropertiesBuffer 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/AmqpRejected.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRejected.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/AmqpRejected.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRejected.java Sat Feb 13 03:20:16 2010
@@ -114,7 +114,7 @@
         private IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value;
 
         AmqpRejectedBean() {
-            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>, AmqpType<?,?>>(new HashMap<AmqpType<?,?>, AmqpType<?,?>>());
+            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>,AmqpType<?,?>>(new HashMap<AmqpType<?,?>,AmqpType<?,?>>());
         }
 
         AmqpRejectedBean(IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value) {
@@ -166,14 +166,14 @@
         }
 
         public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getRejectProperties() {
-            return bean.rejectProperties.getValue();
+            return bean.rejectProperties;
         }
-        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);
         }
 
@@ -181,14 +181,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) {;
@@ -270,11 +266,11 @@
         public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getRejectProperties() {
             return bean().getRejectProperties();
         }
-        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);
         }
 
@@ -282,14 +278,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 AmqpRejected.AmqpRejectedBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpReleased.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpReleased.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/AmqpReleased.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpReleased.java Sat Feb 13 03:20:16 2010
@@ -233,7 +233,7 @@
         private IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value;
 
         AmqpReleasedBean() {
-            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>, AmqpType<?,?>>(new HashMap<AmqpType<?,?>, AmqpType<?,?>>());
+            this.value = new IAmqpMap.AmqpWrapperMap<AmqpType<?,?>,AmqpType<?,?>>(new HashMap<AmqpType<?,?>,AmqpType<?,?>>());
         }
 
         AmqpReleasedBean(IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> value) {
@@ -334,12 +334,12 @@
         public final AmqpMessageAttributes getDeliveryAttrs() {
             return bean.deliveryAttrs;
         }
-        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);
         }
 
@@ -347,14 +347,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) {;
@@ -499,11 +495,11 @@
         public final AmqpMessageAttributes getDeliveryAttrs() {
             return bean().getDeliveryAttrs();
         }
-        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);
         }
 
@@ -511,14 +507,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 AmqpReleased.AmqpReleasedBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRelink.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRelink.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/AmqpRelink.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRelink.java Sat Feb 13 03:20:16 2010
@@ -129,207 +129,207 @@
         AmqpRelinkBean() {
         }
 
-        AmqpRelinkBean(IAmqpList value) {
+        AmqpRelinkBean(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));
+            }
         }
-    }
-
-    AmqpRelinkBean(AmqpRelink.AmqpRelinkBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpRelinkBean copy() {
-        return new AmqpRelink.AmqpRelinkBean(bean);
-    }
-
-    public final void handle(AmqpCommandHandler handler) throws Exception {
-        handler.handleRelink(this);
-    }
 
-    public final AmqpRelink.AmqpRelinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpRelinkBuffer(marshaller.encode(this));
+        AmqpRelinkBean(AmqpRelink.AmqpRelinkBean 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 setOptions(AmqpOptions options) {
-        copyCheck();
-        bean.options = options;
-    }
-
-    public final AmqpOptions getOptions() {
-        return bean.options;
-    }
+        public final AmqpRelinkBean copy() {
+            return new AmqpRelink.AmqpRelinkBean(bean);
+        }
 
-    public void setHandle(Long handle) {
-        setHandle(TypeFactory.createAmqpHandle(handle));
-    }
+        public final void handle(AmqpCommandHandler handler) throws Exception {
+            handler.handleRelink(this);
+        }
 
+        public final AmqpRelink.AmqpRelinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpRelinkBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public void setHandle(long handle) {
-        setHandle(TypeFactory.createAmqpHandle(handle));
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
 
-    public final void setHandle(AmqpHandle handle) {
-        copyCheck();
-        bean.handle = handle;
-    }
+        public final void setOptions(AmqpOptions options) {
+            copyCheck();
+            bean.options = options;
+        }
 
-    public final AmqpHandle getHandle() {
-        return bean.handle;
-    }
+        public final AmqpOptions getOptions() {
+            return bean.options;
+        }
 
-    public final void setSource(AmqpMap source) {
-        copyCheck();
-        bean.source = source;
-    }
+        public void setHandle(Long handle) {
+            setHandle(TypeFactory.createAmqpHandle(handle));
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getSource() {
-        return bean.source.getValue();
-    }
 
-    public final void setTarget(AmqpMap target) {
-        copyCheck();
-        bean.target = target;
-    }
+        public void setHandle(long handle) {
+            setHandle(TypeFactory.createAmqpHandle(handle));
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getTarget() {
-        return bean.target.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setOptions((AmqpOptions) value);
-            break;
-        }
-        case 1: {
-            setHandle((AmqpHandle) value);
-            break;
-        }
-        case 2: {
-            setSource((AmqpMap) value);
-            break;
-        }
-        case 3: {
-            setTarget((AmqpMap) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setHandle(AmqpHandle handle) {
+            copyCheck();
+            bean.handle = handle;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.options;
-        }
-        case 1: {
+        public final AmqpHandle getHandle() {
             return bean.handle;
         }
-        case 2: {
+
+        public final void setSource(AmqpMap source) {
+            copyCheck();
+            bean.source = source;
+        }
+
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getSource() {
             return bean.source;
         }
-        case 3: {
+
+        public final void setTarget(AmqpMap target) {
+            copyCheck();
+            bean.target = target;
+        }
+
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getTarget() {
             return bean.target;
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setOptions((AmqpOptions) value);
+                break;
+            }
+            case 1: {
+                setHandle((AmqpHandle) value);
+                break;
+            }
+            case 2: {
+                setSource((AmqpMap) value);
+                break;
+            }
+            case 3: {
+                setTarget((AmqpMap) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.options;
+            }
+            case 1: {
+                return bean.handle;
+            }
+            case 2: {
+                return bean.source;
+            }
+            case 3: {
+                return bean.target;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
-    }
 
-    public int getListCount() {
-        return 4;
-    }
+        public int getListCount() {
+            return 4;
+        }
 
-    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(AmqpRelink.AmqpRelinkBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpRelink.AmqpRelinkBean 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 AmqpRelink)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpRelink)) {
-            return false;
+            return equals((AmqpRelink) o);
         }
 
-        return equals((AmqpRelink) o);
-    }
+        public boolean equals(AmqpRelink b) {
 
-    public boolean equals(AmqpRelink 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.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.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;
+            }
+            return true;
         }
 
-        if(b.getTarget() == null ^ getTarget() == null) {
-            return false;
-        }
-        if(b.getTarget() != null && !b.getTarget().equals(getTarget())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
     }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
-    }
-}
-
     public static class AmqpRelinkBuffer extends AmqpList.AmqpListBuffer implements AmqpRelink{
 
         private AmqpRelinkBean bean;
 
-        protected AmqpRelinkBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpRelinkBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -390,10 +390,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpRelink.AmqpRelinkBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -422,7 +418,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpRelink.AmqpRelinkBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpRelink.AmqpRelinkBuffer 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/AmqpSaslChallenge.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslChallenge.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/AmqpSaslChallenge.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslChallenge.java Sat Feb 13 03:20:16 2010
@@ -83,152 +83,152 @@
         AmqpSaslChallengeBean() {
         }
 
-        AmqpSaslChallengeBean(IAmqpList value) {
+        AmqpSaslChallengeBean(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));
+            }
         }
-    }
-
-    AmqpSaslChallengeBean(AmqpSaslChallenge.AmqpSaslChallengeBean other) {
-        this.bean = other;
-    }
-
-    public final AmqpSaslChallengeBean copy() {
-        return new AmqpSaslChallenge.AmqpSaslChallengeBean(bean);
-    }
 
-    public final AmqpSaslChallenge.AmqpSaslChallengeBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
-        if(buffer == null) {
-            buffer = new AmqpSaslChallengeBuffer(marshaller.encode(this));
+        AmqpSaslChallengeBean(AmqpSaslChallenge.AmqpSaslChallengeBean other) {
+            this.bean = other;
         }
-        return buffer;
-    }
 
-    public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
-        getBuffer(marshaller).marshal(out, marshaller);
-    }
+        public final AmqpSaslChallengeBean copy() {
+            return new AmqpSaslChallenge.AmqpSaslChallengeBean(bean);
+        }
 
+        public final AmqpSaslChallenge.AmqpSaslChallengeBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
+            if(buffer == null) {
+                buffer = new AmqpSaslChallengeBuffer(marshaller.encode(this));
+            }
+            return buffer;
+        }
 
-    public final void setOptions(AmqpMap options) {
-        copyCheck();
-        bean.options = options;
-    }
+        public final void marshal(DataOutput out, AmqpMarshaller marshaller) throws IOException, AmqpEncodingError{
+            getBuffer(marshaller).marshal(out, marshaller);
+        }
 
-    public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getOptions() {
-        return bean.options.getValue();
-    }
 
-    public void setChallenge(Buffer challenge) {
-        setChallenge(TypeFactory.createAmqpBinary(challenge));
-    }
+        public final void setOptions(AmqpMap options) {
+            copyCheck();
+            bean.options = options;
+        }
 
+        public final IAmqpMap<AmqpType<?, ?>, AmqpType<?, ?>> getOptions() {
+            return bean.options;
+        }
 
-    public final void setChallenge(AmqpBinary challenge) {
-        copyCheck();
-        bean.challenge = challenge;
-    }
+        public void setChallenge(Buffer challenge) {
+            setChallenge(TypeFactory.createAmqpBinary(challenge));
+        }
 
-    public final Buffer getChallenge() {
-        return bean.challenge.getValue();
-    }
 
-    public void set(int index, AmqpType<?, ?> value) {
-        switch(index) {
-        case 0: {
-            setOptions((AmqpMap) value);
-            break;
-        }
-        case 1: {
-            setChallenge((AmqpBinary) value);
-            break;
-        }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
+        public final void setChallenge(AmqpBinary challenge) {
+            copyCheck();
+            bean.challenge = challenge;
         }
-    }
 
-    public AmqpType<?, ?> get(int index) {
-        switch(index) {
-        case 0: {
-            return bean.options;
-        }
-        case 1: {
-            return bean.challenge;
+        public final Buffer getChallenge() {
+            return bean.challenge.getValue();
         }
-        default : {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
+
+        public void set(int index, AmqpType<?, ?> value) {
+            switch(index) {
+            case 0: {
+                setOptions((AmqpMap) value);
+                break;
+            }
+            case 1: {
+                setChallenge((AmqpBinary) value);
+                break;
+            }
+            default : {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+            }
         }
+
+        public AmqpType<?, ?> get(int index) {
+            switch(index) {
+            case 0: {
+                return bean.options;
+            }
+            case 1: {
+                return bean.challenge;
+            }
+            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(AmqpSaslChallenge.AmqpSaslChallengeBean other) {
+            bean = this;
         }
-    }
 
-    private final void copy(AmqpSaslChallenge.AmqpSaslChallengeBean 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 AmqpSaslChallenge)) {
+                return false;
+            }
 
-        if(o == null || !(o instanceof AmqpSaslChallenge)) {
-            return false;
+            return equals((AmqpSaslChallenge) o);
         }
 
-        return equals((AmqpSaslChallenge) o);
-    }
+        public boolean equals(AmqpSaslChallenge b) {
 
-    public boolean equals(AmqpSaslChallenge 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.getChallenge() == null ^ getChallenge() == null) {
+                return false;
+            }
+            if(b.getChallenge() != null && !b.getChallenge().equals(getChallenge())){ 
+                return false;
+            }
+            return true;
         }
 
-        if(b.getChallenge() == null ^ getChallenge() == null) {
-            return false;
-        }
-        if(b.getChallenge() != null && !b.getChallenge().equals(getChallenge())){ 
-            return false;
+        public int hashCode() {
+            return AbstractAmqpList.hashCodeFor(this);
         }
-        return true;
     }
 
-    public int hashCode() {
-        return AbstractAmqpList.hashCodeFor(this);
-    }
-}
-
     public static class AmqpSaslChallengeBuffer extends AmqpList.AmqpListBuffer implements AmqpSaslChallenge{
 
         private AmqpSaslChallengeBean bean;
 
-        protected AmqpSaslChallengeBuffer(Encoded<IAmqpList> encoded) {
+        protected AmqpSaslChallengeBuffer(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             super(encoded);
         }
 
@@ -268,10 +268,6 @@
             return bean().iterator();
         }
 
-        public IAmqpList getValue() {
-            return bean().getValue();
-        }
-
         public AmqpSaslChallenge.AmqpSaslChallengeBuffer getBuffer(AmqpMarshaller marshaller) throws AmqpEncodingError{
             return this;
         }
@@ -296,7 +292,7 @@
             return bean().hashCode();
         }
 
-        public static AmqpSaslChallenge.AmqpSaslChallengeBuffer create(Encoded<IAmqpList> encoded) {
+        public static AmqpSaslChallenge.AmqpSaslChallengeBuffer create(Encoded<IAmqpList<AmqpType<?, ?>>> encoded) {
             if(encoded.isNull()) {
                 return null;
             }



Mime
View raw message