Author: trustin
Date: Mon Sep 17 03:51:29 2007
New Revision: 576354
URL: http://svn.apache.org/viewvc?rev=576354&view=rev
Log:
* Removed compiler warnings in filter.codec.demux
* MessageEncoder.getMessageTypes() now can return more kinds of classes.
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/MessageEncoder.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=576354&r1=576353&r2=576354&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
Mon Sep 17 03:51:29 2007
@@ -154,11 +154,14 @@
session.getService();
}
+ @SuppressWarnings("unchecked")
private class ProtocolEncoderImpl implements ProtocolEncoder {
- private final Map<Class<?>, MessageEncoder> encoders = new
IdentityHashMap<Class<?>, MessageEncoder>();
+ private final Map<Class<?>, MessageEncoder> encoders =
+ new IdentityHashMap<Class<?>, MessageEncoder>();
private ProtocolEncoderImpl() throws Exception {
- MessageEncoderFactory[] encoderFactories =
DemuxingProtocolCodecFactory.this.encoderFactories;
+ MessageEncoderFactory[] encoderFactories =
+ DemuxingProtocolCodecFactory.this.encoderFactories;
for (int i = encoderFactories.length - 1; i >= 0; i--) {
MessageEncoder encoder = encoderFactories[i].getEncoder();
Set<Class<?>> messageTypes = encoder.getMessageTypes();
@@ -360,11 +363,12 @@
}
}
- private static class DefaultConstructorMessageEncoderFactory<T> implements
- MessageEncoderFactory<T> {
- private final Class<MessageEncoder<T>> encoderClass;
+ @SuppressWarnings("unchecked")
+ private static class DefaultConstructorMessageEncoderFactory implements
+ MessageEncoderFactory {
+ private final Class encoderClass;
- private
DefaultConstructorMessageEncoderFactory(Class<MessageEncoder<T>> encoderClass) {
+ private DefaultConstructorMessageEncoderFactory(Class encoderClass) {
if (encoderClass == null) {
throw new NullPointerException("encoderClass");
}
@@ -376,8 +380,8 @@
this.encoderClass = encoderClass;
}
- public MessageEncoder<T> getEncoder() throws Exception {
- return encoderClass.newInstance();
+ public MessageEncoder getEncoder() throws Exception {
+ return (MessageEncoder) encoderClass.newInstance();
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java?rev=576354&r1=576353&r2=576354&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
Mon Sep 17 03:51:29 2007
@@ -38,7 +38,7 @@
/**
* Returns the set of message classes this encoder can encode.
*/
- Set<Class<T>> getMessageTypes();
+ Set<Class<? extends T>> getMessageTypes();
/**
* Encodes higher-level message objects into binary or protocol-specific
data.
