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/07/05 11:00:36 UTC
svn commit: r553426 - in /mina:
branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/
branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/
branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/
tru...
Author: trustin
Date: Thu Jul 5 02:00:34 2007
New Revision: 553426
URL: http://svn.apache.org/viewvc?view=rev&rev=553426
Log:
* Added nbproject to svn:ignore
* Backported the changes related with Java 5 Generics to branches/1.1
Modified:
mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
mina/trunk/ (props changed)
mina/trunk/example/ (props changed)
mina/trunk/filter-codec-netty/ (props changed)
mina/trunk/filter-compression/ (props changed)
mina/trunk/integration-jmx/ (props changed)
mina/trunk/integration-spring/ (props changed)
mina/trunk/transport-serial/ (props changed)
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?view=diff&rev=553426&r1=553425&r2=553426
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Thu Jul 5 02:00:34 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;
@@ -232,7 +232,7 @@
if( encoder != null )
return encoder;
- Class[] interfaces = type.getInterfaces();
+ Class<?>[] interfaces = type.getInterfaces();
for( int i = 0; i < interfaces.length; i ++ )
{
encoder = findEncoder( interfaces[ i ], triedClasses );
@@ -402,9 +402,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 )
{
@@ -426,9 +426,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/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java?view=diff&rev=553426&r1=553425&r2=553426
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java Thu Jul 5 02:00:34 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.
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java?view=diff&rev=553426&r1=553425&r2=553426
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java Thu Jul 5 02:00:34 2007
@@ -41,11 +41,11 @@
*/
public class HttpResponseEncoder implements MessageEncoder
{
- private static final Set<Class> TYPES;
+ private static final Set<Class<?>> TYPES;
static
{
- Set<Class> types = new HashSet<Class>();
+ Set<Class<?>> types = new HashSet<Class<?>>();
types.add( HttpResponseMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -110,7 +110,7 @@
out.write( buf );
}
- public Set<Class> getMessageTypes()
+ public Set<Class<?>> getMessageTypes()
{
return TYPES;
}
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java?view=diff&rev=553426&r1=553425&r2=553426
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java Thu Jul 5 02:00:34 2007
@@ -37,11 +37,11 @@
*/
public class AddMessageEncoder extends AbstractMessageEncoder
{
- private static final Set<Class> TYPES;
+ private static final Set<Class<?>> TYPES;
static
{
- Set<Class> types = new HashSet<Class>();
+ Set<Class<?>> types = new HashSet<Class<?>>();
types.add( AddMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -57,7 +57,7 @@
out.putInt( m.getValue() );
}
- public Set<Class> getMessageTypes()
+ public Set<Class<?>> getMessageTypes()
{
return TYPES;
}
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java?view=diff&rev=553426&r1=553425&r2=553426
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java Thu Jul 5 02:00:34 2007
@@ -37,11 +37,11 @@
*/
public class ResultMessageEncoder extends AbstractMessageEncoder
{
- private static final Set<Class> TYPES;
+ private static final Set<Class<?>> TYPES;
static
{
- Set<Class> types = new HashSet<Class>();
+ Set<Class<?>> types = new HashSet<Class<?>>();
types.add( ResultMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -65,7 +65,7 @@
}
}
- public Set<Class> getMessageTypes()
+ public Set<Class<?>> getMessageTypes()
{
return TYPES;
}
Propchange: mina/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -1,3 +1,4 @@
*.iws
*.ipr
*.iml
+target
Propchange: mina/trunk/example/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -8,3 +8,4 @@
.deployables
.project
*.log
+nbproject
Propchange: mina/trunk/filter-codec-netty/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -8,3 +8,4 @@
.deployables
*.log
target
+nbproject
Propchange: mina/trunk/filter-compression/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -1,5 +1,5 @@
-
target
.settings
.classpath
.project
+nbproject
Propchange: mina/trunk/integration-jmx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -1,5 +1,5 @@
-
target
.settings
.classpath
.project
+nbproject
Propchange: mina/trunk/integration-spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -8,3 +8,4 @@
.project
*.log
target
+nbproject
Propchange: mina/trunk/transport-serial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 02:00:34 2007
@@ -2,3 +2,4 @@
.settings
.classpath
.project
+nbproject