Author: mheath
Date: Mon Jul 2 18:43:30 2007
New Revision: 552640
URL: http://svn.apache.org/viewvc?view=rev&rev=552640
Log:
Added type parameter to all Class types.
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?view=diff&rev=552640&r1=552639&r2=552640
==============================================================================
---
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 Jul 2 18:43:30 2007
@@ -65,7 +65,7 @@
private MessageDecoderFactory[] decoderFactories = new
MessageDecoderFactory[0];
private MessageEncoderFactory[] encoderFactories = new
MessageEncoderFactory[0];
- private static final Class[] EMPTY_PARAMS = new Class[0];
+ private static final Class<?>[] EMPTY_PARAMS = new Class[0];
public DemuxingProtocolCodecFactory()
{
@@ -170,7 +170,7 @@
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
{
@@ -178,16 +178,16 @@
for( int i = encoderFactories.length - 1; i >= 0; i-- )
{
MessageEncoder encoder = encoderFactories[ i ].getEncoder();
- Set<Class> messageTypes = encoder.getMessageTypes();
+ Set<Class<?>> messageTypes = encoder.getMessageTypes();
if (messageTypes == null) {
throw new IllegalStateException(
encoder.getClass().getName() + "#getMessageTypes()
may not return null.");
}
- Iterator it = messageTypes.iterator();
+ Iterator<Class<?>> it = messageTypes.iterator();
while( it.hasNext() )
{
- Class type = ( Class ) it.next();
+ Class<?> type = it.next();
encoders.put( type, encoder );
}
}
@@ -196,7 +196,7 @@
public void encode( IoSession session, Object message,
ProtocolEncoderOutput out ) throws Exception
{
- Class type = message.getClass();
+ Class<?> type = message.getClass();
MessageEncoder encoder = findEncoder( type );
if( encoder == null )
{
@@ -206,18 +206,18 @@
encoder.encode( session, message, out );
}
- private MessageEncoder findEncoder( Class type )
+ private MessageEncoder findEncoder( Class<?> type )
{
MessageEncoder encoder = encoders.get( type );
if( encoder == null )
{
- encoder = findEncoder( type, new IdentityHashSet<Class>() );
+ encoder = findEncoder( type, new IdentityHashSet<Class<?>>() );
}
return encoder;
}
- private MessageEncoder findEncoder( Class type, Set<Class>
triedClasses )
+ private MessageEncoder findEncoder( Class<?> type, Set<Class<?>>
triedClasses )
{
MessageEncoder encoder;
@@ -234,8 +234,8 @@
return encoder;
}
- Class[] interfaces = type.getInterfaces();
- for (Class element : interfaces) {
+ Class<?>[] interfaces = type.getInterfaces();
+ for (Class<?> element : interfaces) {
encoder = findEncoder( element, triedClasses );
if( encoder != null ) {
return encoder;
@@ -407,9 +407,9 @@
private static class DefaultConstructorMessageEncoderFactory implements
MessageEncoderFactory
{
- private final Class encoderClass;
+ private final Class<?> encoderClass;
- private DefaultConstructorMessageEncoderFactory( Class encoderClass )
+ private DefaultConstructorMessageEncoderFactory( Class<?> encoderClass
)
{
if( encoderClass == null )
{
@@ -431,9 +431,9 @@
private static class DefaultConstructorMessageDecoderFactory implements
MessageDecoderFactory
{
- private final Class decoderClass;
+ private final Class<?> decoderClass;
- private DefaultConstructorMessageDecoderFactory( Class decoderClass )
+ private DefaultConstructorMessageDecoderFactory( Class<?> decoderClass
)
{
if( decoderClass == null )
{
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?view=diff&rev=552640&r1=552639&r2=552640
==============================================================================
---
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 Jul 2 18:43:30 2007
@@ -39,7 +39,7 @@
/**
* Returns the set of message classes this encoder can encode.
*/
- Set<Class> getMessageTypes();
+ Set<Class<?>> getMessageTypes();
/**
* Encodes higher-level message objects into binary or protocol-specific
data.
