Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 91110 invoked from network); 9 May 2006 16:54:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 May 2006 16:54:55 -0000 Received: (qmail 75260 invoked by uid 500); 9 May 2006 16:54:54 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 75221 invoked by uid 500); 9 May 2006 16:54:54 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 75210 invoked by uid 99); 9 May 2006 16:54:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 May 2006 09:54:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 09 May 2006 09:54:53 -0700 Received: (qmail 90935 invoked by uid 65534); 9 May 2006 16:54:33 -0000 Message-ID: <20060509165433.90934.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r405465 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio/src: main/java/java/nio/channels/spi/ main/java/org/apache/harmony/nio/internal/ test/java/org/apache/harmony/tests/java/nio/channels/ Date: Tue, 09 May 2006 16:54:31 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tellison Date: Tue May 9 09:54:29 2006 New Revision: 405465 URL: http://svn.apache.org/viewcvs?rev=405465&view=rev Log: Generics uplift for NIO internals Tidy up compiler warnings on NIO tests Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java Tue May 9 09:54:29 2006 @@ -36,7 +36,7 @@ public abstract class AbstractInterruptibleChannel implements Channel, InterruptibleChannel { - private static List blockingThreads = new LinkedList(); + private static List blockingThreads = new LinkedList(); private volatile boolean closed = false; Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java Tue May 9 09:54:29 2006 @@ -41,7 +41,7 @@ /* * The collection of key. */ - private List keyList = new ArrayList(); + private List keyList = new ArrayList(); private final Object blockingLock = new Object(); Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java Tue May 9 09:54:29 2006 @@ -52,8 +52,6 @@ private static SelectorProvider provider = null; - private static Channel inheritedChannel = null; - /** * Constructor for this class. * @@ -107,9 +105,9 @@ Enumeration enumeration = null; SelectorProvider tempProvider = null; - ClassLoader classLoader = (ClassLoader) AccessController - .doPrivileged(new PrivilegedAction() { - public Object run() { + ClassLoader classLoader = AccessController.doPrivileged( + new PrivilegedAction() { + public ClassLoader run() { return ClassLoader.getSystemClassLoader(); } }); @@ -158,18 +156,18 @@ * load by system property. */ static SelectorProvider loadProviderByProperty() { - return (SelectorProvider) AccessController - .doPrivileged(new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged( + new PrivilegedAction() { + public SelectorProvider run() { // FIXME check if use this ClassLoader or system // ClassLoader try { - final String className = System - .getProperty(PROVIDER_IN_SYSTEM_PROPERTY); + final String className = + System.getProperty(PROVIDER_IN_SYSTEM_PROPERTY); if (null != className) { - return Thread.currentThread() - .getContextClassLoader().loadClass( - className); + Class spClass = Thread.currentThread() + .getContextClassLoader().loadClass(className); + return (SelectorProvider)spClass.newInstance(); } return null; } catch (Exception e) { @@ -177,7 +175,6 @@ } } }); - } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java Tue May 9 09:54:29 2006 @@ -38,7 +38,7 @@ } }; - private final SortedSet locks = new TreeSet(lockComparator); + private final SortedSet locks = new TreeSet(lockComparator); /* * Default Constructor. Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Tue May 9 09:54:29 2006 @@ -557,6 +557,8 @@ public void testConnect_UnsupportedType() throws IOException { assertFalse(this.channel1.isConnected()); class SubSocketAddress extends SocketAddress { + private static final long serialVersionUID = 1L; + public SubSocketAddress() { super(); } @@ -1572,6 +1574,7 @@ // ------------------------------------------------------------------- private class mockAddress extends SocketAddress { + private static final long serialVersionUID = 1L; } public void testSend_MockSocketAddress() throws Exception { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java?rev=405465&r1=405464&r2=405465&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java Tue May 9 09:54:29 2006 @@ -1220,6 +1220,8 @@ public void testCFII_UnsupportedType() throws Exception { class SubSocketAddress extends SocketAddress { + private static final long serialVersionUID = 1L; + //empty public SubSocketAddress() { super();