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/03/21 04:54:20 UTC
svn commit: r520737 - in /mina/branches/1.1:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/support/
example/src/main/java/org/apache/mina/example/chat/client/
example/src/main/java/org/apache/mina/example/httpserv...
Author: trustin
Date: Tue Mar 20 20:54:19 2007
New Revision: 520737
URL: http://svn.apache.org/viewvc?view=rev&rev=520737
Log:
* Fixed compilation errors in examples
* Fixed more compiler warnings
Modified:
mina/branches/1.1/core/src/main/java/org/apache/mina/common/IoFilterChain.java
mina/branches/1.1/core/src/main/java/org/apache/mina/common/TransportType.java
mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/common/IoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/IoFilterChain.java?view=diff&rev=520737&r1=520736&r2=520737
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/common/IoFilterChain.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/common/IoFilterChain.java Tue Mar 20 20:54:19 2007
@@ -61,12 +61,12 @@
/**
* Returns the list of all {@link Entry}s this chain contains.
*/
- List getAll();
+ List<Entry> getAll();
/**
* Returns the reversed list of all {@link Entry}s this chain contains.
*/
- List getAllReversed();
+ List<Entry> getAllReversed();
/**
* Returns <tt>true</tt> if this chain contains an {@link IoFilter} with the
@@ -83,7 +83,7 @@
* Returns <tt>true</tt> if this chain contains an {@link IoFilter} of the
* specified <tt>filterType</tt>.
*/
- boolean contains( Class filterType );
+ boolean contains( Class<? extends IoFilter> filterType );
/**
* Adds the specified filter with the specified name at the beginning of this chain.
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/common/TransportType.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/TransportType.java?view=diff&rev=520737&r1=520736&r2=520737
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/common/TransportType.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/common/TransportType.java Tue Mar 20 20:54:19 2007
@@ -114,7 +114,7 @@
private final transient boolean connectionless;
- private final transient Class envelopeType;
+ private final transient Class<? extends Object> envelopeType;
/**
* Creates a new instance. New transport type is automatically registered
@@ -139,7 +139,7 @@
*
* @throws IllegalArgumentException if <tt>names</tt> are already registered or empty
*/
- public TransportType( String[] names, Class envelopeType, boolean connectionless )
+ public TransportType( String[] names, Class<? extends Object> envelopeType, boolean connectionless )
{
if( names == null )
{
@@ -179,7 +179,7 @@
return connectionless;
}
- public Class getEnvelopeType()
+ public Class<? extends Object> getEnvelopeType()
{
return envelopeType;
}
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?view=diff&rev=520737&r1=520736&r2=520737
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java Tue Mar 20 20:54:19 2007
@@ -63,7 +63,7 @@
AbstractIoFilterChain.class.getName() + ".connectFuture";
private final IoSession session;
- private final Map name2entry = new HashMap();
+ private final Map<String, Entry> name2entry = new HashMap<String, Entry>();
private final EntryImpl head;
private final EntryImpl tail;
@@ -87,7 +87,7 @@
public Entry getEntry( String name )
{
- Entry e = ( Entry ) name2entry.get( name );
+ Entry e = name2entry.get( name );
if ( e == null )
{
return null;
@@ -158,10 +158,10 @@
public synchronized void clear() throws Exception
{
- Iterator it = new ArrayList( name2entry.keySet() ).iterator();
+ Iterator<String> it = new ArrayList<String>( name2entry.keySet() ).iterator();
while ( it.hasNext() )
{
- this.remove( ( String ) it.next() );
+ this.remove( it.next() );
}
}
@@ -469,9 +469,9 @@
}
}
- public List getAll()
+ public List<Entry> getAll()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
EntryImpl e = head.nextEntry;
while( e != tail )
{
@@ -482,9 +482,9 @@
return list;
}
- public List getAllReversed()
+ public List<Entry> getAllReversed()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
EntryImpl e = tail.prevEntry;
while( e != head )
{
@@ -513,7 +513,7 @@
return false;
}
- public boolean contains( Class filterType )
+ public boolean contains( Class<? extends IoFilter> filterType )
{
EntryImpl e = head.nextEntry;
while( e != tail )
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?view=diff&rev=520737&r1=520736&r2=520737
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Tue Mar 20 20:54:19 2007
@@ -107,13 +107,7 @@
{
session.write( "QUIT" );
// Wait until the chat ends.
- try
- {
- session.getCloseFuture().join();
- } catch( InterruptedException e )
- {
- throw new RuntimeIOException( e );
- }
+ session.getCloseFuture().join();
}
session.close();
}
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java?view=diff&rev=520737&r1=520736&r2=520737
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java Tue Mar 20 20:54:19 2007
@@ -68,13 +68,7 @@
if( response != null )
{
- try
- {
- session.write( response ).join();
- } catch( InterruptedException e )
- {
- throw new RuntimeIOException( e );
- }
+ session.write( response ).join();
}
}