You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/09 03:02:41 UTC
svn commit: r593385 - in
/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux:
DemuxingProtocolCodecFactory.java DemuxingProtocolEncoder.java
Author: trustin
Date: Thu Nov 8 18:02:40 2007
New Revision: 593385
URL: http://svn.apache.org/viewvc?rev=593385&view=rev
Log:
Moved the new addMessageEncoder methods to DemuxingProtocolEncoder and made DemuxingProtocolCodecFactory just forward the call.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?rev=593385&r1=593384&r2=593385&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Thu Nov 8 18:02:40 2007
@@ -19,8 +19,6 @@
*/
package org.apache.mina.filter.codec.demux;
-import java.util.Collection;
-
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
@@ -66,22 +64,16 @@
}
@SuppressWarnings("unchecked")
- public void addMessageEncoder(Collection<Class<?>> messageTypes, Class<? extends MessageEncoder> encoderClass) {
- for (Class<?> messageType : messageTypes) {
- this.encoder.addMessageEncoder(messageType, encoderClass);
- }
+ public void addMessageEncoder(Iterable<Class<?>> messageTypes, Class<? extends MessageEncoder> encoderClass) {
+ this.encoder.addMessageEncoder(messageTypes, encoderClass);
}
- public <T> void addMessageEncoder(Collection<Class<? extends T>> messageTypes, MessageEncoder<? super T> encoder) {
- for (Class<? extends T> messageType : messageTypes) {
- this.encoder.addMessageEncoder(messageType, encoder);
- }
+ public <T> void addMessageEncoder(Iterable<Class<? extends T>> messageTypes, MessageEncoder<? super T> encoder) {
+ this.encoder.addMessageEncoder(messageTypes, encoder);
}
- public <T> void addMessageEncoder(Collection<Class<? extends T>> messageTypes, MessageEncoderFactory<? super T> factory) {
- for (Class<? extends T> messageType : messageTypes) {
- this.encoder.addMessageEncoder(messageType, factory);
- }
+ public <T> void addMessageEncoder(Iterable<Class<? extends T>> messageTypes, MessageEncoderFactory<? super T> factory) {
+ this.encoder.addMessageEncoder(messageTypes, factory);
}
public void addMessageDecoder(Class<? extends MessageDecoder> decoderClass) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java?rev=593385&r1=593384&r2=593385&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java Thu Nov 8 18:02:40 2007
@@ -107,6 +107,25 @@
}
}
+ @SuppressWarnings("unchecked")
+ public void addMessageEncoder(Iterable<Class<?>> messageTypes, Class<? extends MessageEncoder> encoderClass) {
+ for (Class<?> messageType : messageTypes) {
+ addMessageEncoder(messageType, encoderClass);
+ }
+ }
+
+ public <T> void addMessageEncoder(Iterable<Class<? extends T>> messageTypes, MessageEncoder<? super T> encoder) {
+ for (Class<? extends T> messageType : messageTypes) {
+ addMessageEncoder(messageType, encoder);
+ }
+ }
+
+ public <T> void addMessageEncoder(Iterable<Class<? extends T>> messageTypes, MessageEncoderFactory<? super T> factory) {
+ for (Class<? extends T> messageType : messageTypes) {
+ addMessageEncoder(messageType, factory);
+ }
+ }
+
public void encode(IoSession session, Object message,
ProtocolEncoderOutput out) throws Exception {
State state = getState(session);