Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 6806 invoked from network); 22 Jan 2006 13:53:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Jan 2006 13:53:30 -0000 Received: (qmail 15938 invoked by uid 500); 22 Jan 2006 13:53:30 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 15886 invoked by uid 500); 22 Jan 2006 13:53:29 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 15869 invoked by uid 99); 22 Jan 2006 13:53:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2006 05:53:29 -0800 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; Sun, 22 Jan 2006 05:53:26 -0800 Received: (qmail 6630 invoked by uid 65534); 22 Jan 2006 13:53:05 -0000 Message-ID: <20060122135305.6629.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r371290 [1/2] - in /directory/sandbox/trustin/mina-spi/core/src: main/java/org/apache/mina/common/support/discovery/ main/java/org/apache/mina/common/support/discovery/jdk/ main/java/org/apache/mina/common/support/discovery/tools/ main/java... Date: Sun, 22 Jan 2006 13:52:59 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Sun Jan 22 05:52:31 2006 New Revision: 371290 URL: http://svn.apache.org/viewcvs?rev=371290&view=rev Log: * Fixed all warnings in forked libraries * Implemented overriden attributes for nio:socket tranrport type Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/DiscoveryException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK11Hooks.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK12Hooks.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverClass.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverSingleton.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ManagedProperties.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ResourceUtils.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/SPInterface.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/Service.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/Entities.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IllegalClassException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IncompleteArgumentException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NotImplementedException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NullArgumentException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/SerializationException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/StringEscapeUtils.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/UnhandledException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/CompareToBuilder.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ReflectionToStringBuilder.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/StandardToStringStyle.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringBuilder.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringStyle.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/enums/Enum.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableDelegate.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableError.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableRuntimeException.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/math/JVMRandom.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/FastDateFormat.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/Constants.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAddresses.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/DiscoveryException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/DiscoveryException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/DiscoveryException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/DiscoveryException.java Sun Jan 22 05:52:31 2006 @@ -73,6 +73,7 @@ */ public class DiscoveryException extends RuntimeException { + private static final long serialVersionUID = -8986496693942421545L; /** * Construct a new exception with null as its detail message. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK11Hooks.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK11Hooks.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK11Hooks.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK11Hooks.java Sun Jan 22 05:52:31 2006 @@ -131,7 +131,7 @@ * and eliminate the redundent element. */ - final URL first = (URL)loader.getResource(resourceName); + final URL first = loader.getResource(resourceName); final Enumeration rest = loader.getResources(resourceName); return new Enumeration() { Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK12Hooks.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK12Hooks.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK12Hooks.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDK12Hooks.java Sun Jan 22 05:52:31 2006 @@ -146,7 +146,7 @@ * and eliminate the redundent element. */ - final URL first = (URL)loader.getResource(resourceName); + final URL first = loader.getResource(resourceName); final Enumeration rest = loader.getResources(resourceName); return new Enumeration() { Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverClass.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverClass.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverClass.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverClass.java Sun Jan 22 05:52:31 2006 @@ -213,7 +213,7 @@ } - public ClassLoaders getClassLoaders(Class spiClass) { + public ClassLoaders getClassLoaders() { return classLoaders; } @@ -232,7 +232,7 @@ public Class find(Class spiClass) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return find(getClassLoaders(), new SPInterface(spiClass), nullProperties, nullDefaultImpl); @@ -254,7 +254,7 @@ public Class find(Class spiClass, Properties properties) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return find(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(properties), nullDefaultImpl); @@ -276,7 +276,7 @@ public Class find(Class spiClass, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return find(getClassLoaders(), new SPInterface(spiClass), nullProperties, new DefaultClassHolder(defaultImpl)); @@ -300,7 +300,7 @@ public Class find(Class spiClass, Properties properties, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return find(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(properties), new DefaultClassHolder(defaultImpl)); @@ -311,8 +311,6 @@ * * @param spiClass Service Provider Interface Class. * - * @param properties Used to determine name of SPI implementation,. - * * @param defaultImpl Default implementation class. * * @return Class implementing the SPI. @@ -324,7 +322,7 @@ public Class find(Class spiClass, String propertiesFileName, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return find(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(propertiesFileName), new DefaultClassHolder(defaultImpl)); @@ -333,8 +331,6 @@ /** * Find class implementing SPI. * - * @param spiClass Service Provider Interface Class. - * * @param properties Used to determine name of SPI implementation,. * * @param defaultImpl Default implementation class. @@ -424,7 +420,7 @@ NoSuchMethodException, InvocationTargetException { - return newInstance(getClassLoaders(spiClass), + return newInstance(getClassLoaders(), new SPInterface(spiClass), nullProperties, nullDefaultImpl); @@ -453,7 +449,7 @@ NoSuchMethodException, InvocationTargetException { - return newInstance(getClassLoaders(spiClass), + return newInstance(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(properties), nullDefaultImpl); @@ -480,7 +476,7 @@ NoSuchMethodException, InvocationTargetException { - return newInstance(getClassLoaders(spiClass), + return newInstance(getClassLoaders(), new SPInterface(spiClass), nullProperties, new DefaultClassHolder(defaultImpl)); @@ -511,7 +507,7 @@ NoSuchMethodException, InvocationTargetException { - return newInstance(getClassLoaders(spiClass), + return newInstance(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(properties), new DefaultClassHolder(defaultImpl)); @@ -522,10 +518,6 @@ * * @param spiClass Service Provider Interface Class. * - * @param properties Used to determine name of SPI implementation, - * and passed to implementation.init() method if - * implementation implements Service interface. - * * @param defaultImpl Default implementation. * * @return Instance of a class implementing the SPI. @@ -542,7 +534,7 @@ NoSuchMethodException, InvocationTargetException { - return newInstance(getClassLoaders(spiClass), + return newInstance(getClassLoaders(), new SPInterface(spiClass), new PropertiesHolder(propertiesFileName), new DefaultClassHolder(defaultImpl)); @@ -551,8 +543,6 @@ /** * Create new instance of class implementing SPI. * - * @param spiClass Service Provider Interface Class. - * * @param properties Used to determine name of SPI implementation, * and passed to implementation.init() method if * implementation implements Service interface. @@ -640,9 +630,6 @@ * System Property. * * @see ManagedProperties - * - * @param attribute the name of the system property whose value is - * the name of the class to load. */ public static String getManagedProperty(String propertyName) { String value; Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverSingleton.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverSingleton.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverSingleton.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DiscoverSingleton.java Sun Jan 22 05:52:31 2006 @@ -357,10 +357,6 @@ * * @param spiClass Service Provider Interface Class. * - * @param properties Used to determine name of SPI implementation, - * and passed to implementation.init() method if - * implementation implements Service interface. - * * @param defaultImpl Default implementation. * * @return Instance of a class implementing the SPI. @@ -387,8 +383,6 @@ /** * Find implementation of SPI. - * - * @param spiClass Service Provider Interface Class. * * @param properties Used to determine name of SPI implementation, * and passed to implementation.init() method if Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ManagedProperties.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ManagedProperties.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ManagedProperties.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ManagedProperties.java Sun Jan 22 05:52:31 2006 @@ -127,7 +127,6 @@ /** * Get value for property bound to the current thread context class loader. * - * @param property property name. * @return property value if found, otherwise default. */ public static String getProperty(String propertyName) { @@ -138,7 +137,6 @@ * Get value for property bound to the current thread context class loader. * If not found, then return default. * - * @param property property name. * @param dephault default value. * @return property value if found, otherwise default. */ @@ -150,7 +148,6 @@ * Get value for property bound to the class loader. * * @param classLoader - * @param property property name. * @return property value if found, otherwise default. */ public static String getProperty(ClassLoader classLoader, String propertyName) { @@ -169,7 +166,6 @@ * If not found, then return default. * * @param classLoader - * @param property property name. * @param dephault default value. * @return property value if found, otherwise default. */ @@ -180,7 +176,6 @@ /** * Set value for property bound to the current thread context class loader. - * @param property property name * @param value property value (non-default) If null, remove the property. */ public static void setProperty(String propertyName, String value) { @@ -189,7 +184,6 @@ /** * Set value for property bound to the current thread context class loader. - * @param property property name * @param value property value. If null, remove the property. * @param isDefault determines if property is default or not. * A non-default property cannot be overriden. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ResourceUtils.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ResourceUtils.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ResourceUtils.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/ResourceUtils.java Sun Jan 22 05:52:31 2006 @@ -153,7 +153,6 @@ *
  • System Class Loader
    • * * - * @param * @param propertiesFileName The property file name. * * @return Instance of a class implementing the SPI. @@ -186,9 +185,9 @@ } } } catch (IOException e) { - ; // ignore + // ignore } catch (SecurityException e) { - ; // ignore + // ignore } } Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/SPInterface.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/SPInterface.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/SPInterface.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/SPInterface.java Sun Jan 22 05:52:31 2006 @@ -110,8 +110,6 @@ /** * Construct object representing Class provider. * - * @param provider The SPI class - * * @param propertyName when looking for the name of a class implementing * the provider class, a discovery strategy may involve looking for * (system or other) properties having either the name of the class @@ -145,8 +143,6 @@ /** * Construct object representing Class provider. - * - * @param provider The SPI class * * @param propertyName when looking for the name of a class implementing * the provider class, a discovery strategy may involve looking for Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/Service.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/Service.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/Service.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/Service.java Sun Jan 22 05:52:31 2006 @@ -112,8 +112,6 @@ * This version lets you specify constructor arguments.. * * @param spi SPI to look for and load. - * @param classLoaders loaders to use in search. - * If null then use ClassLoaders.getAppLoaders(). */ public static Enumeration providers(final SPInterface spi, ClassLoaders loaders) Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/Entities.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/Entities.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/Entities.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/Entities.java Sun Jan 22 05:52:31 2006 @@ -23,10 +23,9 @@ *

    Provides HTML and XML entity utilities.

    * * @see ISO Entities - * @see
    HTML 3.2 Character Entities for ISO Latin-1 - * @see
    HTML 4.0 Character entity references - * @see
    HTML 4.01 Character References - * @see
    HTML 4.01 Code positions + * @see HTML 4.0 Character entity references + * @see HTML 4.01 Character References + * @see HTML 4.01 Code positions * * @author Alexander Day Chaffee * @author Gary Gregory Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IllegalClassException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IllegalClassException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IllegalClassException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IllegalClassException.java Sun Jan 22 05:52:31 2006 @@ -43,6 +43,8 @@ */ public class IllegalClassException extends IllegalArgumentException { + private static final long serialVersionUID = -600044693950668242L; + /** *

    Instantiates with the expected type, and actual object.

    * Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IncompleteArgumentException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IncompleteArgumentException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IncompleteArgumentException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/IncompleteArgumentException.java Sun Jan 22 05:52:31 2006 @@ -46,6 +46,8 @@ */ public class IncompleteArgumentException extends IllegalArgumentException { + private static final long serialVersionUID = -3393951133496552729L; + /** *

    Instantiates with the specified description.

    * Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NotImplementedException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NotImplementedException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NotImplementedException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NotImplementedException.java Sun Jan 22 05:52:31 2006 @@ -51,6 +51,8 @@ public class NotImplementedException extends UnsupportedOperationException implements Nestable { + private static final long serialVersionUID = -6364524699015450174L; + /** * The exception helper to delegate nested exception handling to. */ Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NullArgumentException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NullArgumentException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NullArgumentException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/NullArgumentException.java Sun Jan 22 05:52:31 2006 @@ -44,11 +44,13 @@ */ public class NullArgumentException extends IllegalArgumentException { - /** - *

    Instantiates with the given argument name.

    - * - * @param argName the name of the argument that was null. - */ + private static final long serialVersionUID = 8479187058155227052L; + + /** + *

    Instantiates with the given argument name.

    + * + * @param argName the name of the argument that was null. + */ public NullArgumentException(String argName) { super((argName == null ? "Argument" : argName) + " must not be null."); } Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/SerializationException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/SerializationException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/SerializationException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/SerializationException.java Sun Jan 22 05:52:31 2006 @@ -28,6 +28,8 @@ */ public class SerializationException extends NestableRuntimeException { + private static final long serialVersionUID = -7277488055663408836L; + /** *

    Constructs a new SerializationException without specified * detail message.

    Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/StringEscapeUtils.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/StringEscapeUtils.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/StringEscapeUtils.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/StringEscapeUtils.java Sun Jan 22 05:52:31 2006 @@ -414,11 +414,11 @@ * @return a new escaped String, null if null string input * * @see #unescapeHtml(String) - * @see
    ISO Entities - * @see
    HTML 3.2 Character Entities for ISO Latin-1 - * @see
    HTML 4.0 Character entity references - * @see
    HTML 4.01 Character References - * @see
    HTML 4.01 Code positions + * @see ISO Entities + * @see HTML 3.2 Character Entities for ISO Latin-1 + * @see HTML 4.0 Character entity references + * @see HTML 4.01 Character References + * @see HTML 4.01 Code positions **/ public static String escapeHtml(String str) { if (str == null) { Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/UnhandledException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/UnhandledException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/UnhandledException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/UnhandledException.java Sun Jan 22 05:52:31 2006 @@ -43,6 +43,8 @@ */ public class UnhandledException extends NestableRuntimeException { + private static final long serialVersionUID = 1735489915501857490L; + /** * Constructs the exception using a cause. * Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/CompareToBuilder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/CompareToBuilder.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/CompareToBuilder.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/CompareToBuilder.java Sun Jan 22 05:52:31 2006 @@ -59,7 +59,7 @@ * } * * - *

    Alternatively, there is are {@link #reflectionCompare reflectionCompare} method that uses + *

    Alternatively, there is are {@link #reflectionCompare(Object, Object) reflectionCompare} method that uses * reflection to determine the fields to append. Because fields can be private, * reflectionCompare uses {@link java.lang.reflect.AccessibleObject#setAccessible(boolean)} to * bypass normal access control checks. This will fail under a security manager, Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ReflectionToStringBuilder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ReflectionToStringBuilder.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ReflectionToStringBuilder.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ReflectionToStringBuilder.java Sun Jan 22 05:52:31 2006 @@ -632,7 +632,7 @@ // append a simple Object.toString style string. this.getStyle().appendFieldStart(this.getStringBuffer(), fieldName); this.appendAsObjectToString(fieldValue); - this.getStyle().appendFieldEnd(this.getStringBuffer(), fieldName); + this.getStyle().appendFieldEnd(this.getStringBuffer()); // The recursion out of // builder.append(fieldName, fieldValue); // below will append the field Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/StandardToStringStyle.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/StandardToStringStyle.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/StandardToStringStyle.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/StandardToStringStyle.java Sun Jan 22 05:52:31 2006 @@ -32,6 +32,8 @@ */ public class StandardToStringStyle extends ToStringStyle { + private static final long serialVersionUID = 3798838105619403995L; + /** *

    Constructor.

    */ Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringBuilder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringBuilder.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringBuilder.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringBuilder.java Sun Jan 22 05:52:31 2006 @@ -1034,7 +1034,7 @@ if (this.getObject() == null) { this.getStringBuffer().append(this.getStyle().getNullText()); } else { - style.appendEnd(this.getStringBuffer(), this.getObject()); + style.appendEnd(this.getStringBuffer()); } return this.getStringBuffer().toString(); } Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringStyle.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringStyle.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringStyle.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/builder/ToStringStyle.java Sun Jan 22 05:52:31 2006 @@ -263,10 +263,8 @@ *

    Append to the toString the end of data indicator.

    * * @param buffer the StringBuffer to populate - * @param object the Object to build a - * toString for. */ - public void appendEnd(StringBuffer buffer, Object object) { + public void appendEnd(StringBuffer buffer) { if (this.fieldSeparatorAtEnd == false) { removeLastFieldSeparator(buffer); } @@ -313,13 +311,13 @@ appendFieldStart(buffer, fieldName); if (value == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else { appendInternal(buffer, fieldName, value, isFullDetail(fullDetail)); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -348,86 +346,86 @@ } else if (value instanceof Collection) { if (detail) { - appendDetail(buffer, fieldName, (Collection) value); + appendDetail(buffer, (Collection) value); } else { - appendSummarySize(buffer, fieldName, ((Collection) value).size()); + appendSummarySize(buffer, ((Collection) value).size()); } } else if (value instanceof Map) { if (detail) { - appendDetail(buffer, fieldName, (Map) value); + appendDetail(buffer, (Map) value); } else { - appendSummarySize(buffer, fieldName, ((Map) value).size()); + appendSummarySize(buffer, ((Map) value).size()); } } else if (value instanceof long[]) { if (detail) { - appendDetail(buffer, fieldName, (long[]) value); + appendDetail(buffer, (long[]) value); } else { - appendSummary(buffer, fieldName, (long[]) value); + appendSummary(buffer, (long[]) value); } } else if (value instanceof int[]) { if (detail) { - appendDetail(buffer, fieldName, (int[]) value); + appendDetail(buffer, (int[]) value); } else { - appendSummary(buffer, fieldName, (int[]) value); + appendSummary(buffer, (int[]) value); } } else if (value instanceof short[]) { if (detail) { - appendDetail(buffer, fieldName, (short[]) value); + appendDetail(buffer, (short[]) value); } else { - appendSummary(buffer, fieldName, (short[]) value); + appendSummary(buffer, (short[]) value); } } else if (value instanceof byte[]) { if (detail) { - appendDetail(buffer, fieldName, (byte[]) value); + appendDetail(buffer, (byte[]) value); } else { - appendSummary(buffer, fieldName, (byte[]) value); + appendSummary(buffer, (byte[]) value); } } else if (value instanceof char[]) { if (detail) { - appendDetail(buffer, fieldName, (char[]) value); + appendDetail(buffer, (char[]) value); } else { - appendSummary(buffer, fieldName, (char[]) value); + appendSummary(buffer, (char[]) value); } } else if (value instanceof double[]) { if (detail) { - appendDetail(buffer, fieldName, (double[]) value); + appendDetail(buffer, (double[]) value); } else { - appendSummary(buffer, fieldName, (double[]) value); + appendSummary(buffer, (double[]) value); } } else if (value instanceof float[]) { if (detail) { - appendDetail(buffer, fieldName, (float[]) value); + appendDetail(buffer, (float[]) value); } else { - appendSummary(buffer, fieldName, (float[]) value); + appendSummary(buffer, (float[]) value); } } else if (value instanceof boolean[]) { if (detail) { - appendDetail(buffer, fieldName, (boolean[]) value); + appendDetail(buffer, (boolean[]) value); } else { - appendSummary(buffer, fieldName, (boolean[]) value); + appendSummary(buffer, (boolean[]) value); } } else if (value.getClass().isArray()) { if (detail) { appendDetail(buffer, fieldName, (Object[]) value); } else { - appendSummary(buffer, fieldName, (Object[]) value); + appendSummary(buffer, (Object[]) value); } } else { if (detail) { - appendDetail(buffer, fieldName, value); + appendDetail(buffer, value); } else { - appendSummary(buffer, fieldName, value); + appendSummary(buffer, value); } } } @@ -437,11 +435,10 @@ * value, printing the full detail of the Object.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, Object value) { + protected void appendDetail(StringBuffer buffer, Object value) { buffer.append(value); } @@ -449,11 +446,10 @@ *

    Append to the toString a Collection.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param coll the Collection to add to the * toString, not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, Collection coll) { + protected void appendDetail(StringBuffer buffer, Collection coll) { buffer.append(coll); } @@ -461,11 +457,10 @@ *

    Append to the toString a Map.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param map the Map to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, Map map) { + protected void appendDetail(StringBuffer buffer, Map map) { buffer.append(map); } @@ -474,11 +469,10 @@ * value, printing a summary of the Object.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, Object value) { + protected void appendSummary(StringBuffer buffer, Object value) { buffer.append(summaryObjectStartText); buffer.append(getShortClassName(value.getClass())); buffer.append(summaryObjectEndText); @@ -496,8 +490,8 @@ */ public void append(StringBuffer buffer, String fieldName, long value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -505,10 +499,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, long value) { + protected void appendDetail(StringBuffer buffer, long value) { buffer.append(value); } @@ -524,8 +517,8 @@ */ public void append(StringBuffer buffer, String fieldName, int value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -533,10 +526,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, int value) { + protected void appendDetail(StringBuffer buffer, int value) { buffer.append(value); } @@ -552,8 +544,8 @@ */ public void append(StringBuffer buffer, String fieldName, short value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -561,10 +553,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, short value) { + protected void appendDetail(StringBuffer buffer, short value) { buffer.append(value); } @@ -580,8 +571,8 @@ */ public void append(StringBuffer buffer, String fieldName, byte value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -589,10 +580,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, byte value) { + protected void appendDetail(StringBuffer buffer, byte value) { buffer.append(value); } @@ -608,8 +598,8 @@ */ public void append(StringBuffer buffer, String fieldName, char value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -617,10 +607,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, char value) { + protected void appendDetail(StringBuffer buffer, char value) { buffer.append(value); } @@ -636,8 +625,8 @@ */ public void append(StringBuffer buffer, String fieldName, double value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -645,10 +634,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, double value) { + protected void appendDetail(StringBuffer buffer, double value) { buffer.append(value); } @@ -664,8 +652,8 @@ */ public void append(StringBuffer buffer, String fieldName, float value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -673,10 +661,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, float value) { + protected void appendDetail(StringBuffer buffer, float value) { buffer.append(value); } @@ -692,8 +679,8 @@ */ public void append(StringBuffer buffer, String fieldName, boolean value) { appendFieldStart(buffer, fieldName); - appendDetail(buffer, fieldName, value); - appendFieldEnd(buffer, fieldName); + appendDetail(buffer, value); + appendFieldEnd(buffer); } /** @@ -701,10 +688,9 @@ * value.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param value the value to add to the toString */ - protected void appendDetail(StringBuffer buffer, String fieldName, boolean value) { + protected void appendDetail(StringBuffer buffer, boolean value) { buffer.append(value); } @@ -722,16 +708,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { appendDetail(buffer, fieldName, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } //---------------------------------------------------------------------------- @@ -753,7 +739,7 @@ buffer.append(arraySeparator); } if (item == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else { appendInternal(buffer, fieldName, item, arrayContentDetail); @@ -780,7 +766,7 @@ buffer.append(arraySeparator); } if (item == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else { appendInternal(buffer, fieldName, item, arrayContentDetail); @@ -794,12 +780,11 @@ * Object array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, Object[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, Object[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -818,16 +803,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -835,17 +820,16 @@ * long array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, long[] array) { + protected void appendDetail(StringBuffer buffer, long[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -855,12 +839,11 @@ * long array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, long[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, long[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -879,16 +862,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -896,17 +879,16 @@ * int array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, int[] array) { + protected void appendDetail(StringBuffer buffer, int[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -916,12 +898,11 @@ * int array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, int[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, int[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -940,16 +921,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -957,17 +938,16 @@ * short array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, short[] array) { + protected void appendDetail(StringBuffer buffer, short[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -977,12 +957,11 @@ * short array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, short[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, short[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1001,16 +980,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -1018,17 +997,16 @@ * byte array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, byte[] array) { + protected void appendDetail(StringBuffer buffer, byte[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -1038,12 +1016,11 @@ * byte array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, byte[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, byte[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1062,16 +1039,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -1079,17 +1056,16 @@ * char array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, char[] array) { + protected void appendDetail(StringBuffer buffer, char[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -1099,12 +1075,11 @@ * char array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, char[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, char[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1123,16 +1098,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -1140,17 +1115,16 @@ * double array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, double[] array) { + protected void appendDetail(StringBuffer buffer, double[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -1160,12 +1134,11 @@ * double array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, double[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, double[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1184,16 +1157,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -1201,17 +1174,16 @@ * float array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, float[] array) { + protected void appendDetail(StringBuffer buffer, float[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -1221,12 +1193,11 @@ * float array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, float[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, float[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1245,16 +1216,16 @@ appendFieldStart(buffer, fieldName); if (array == null) { - appendNullText(buffer, fieldName); + appendNullText(buffer); } else if (isFullDetail(fullDetail)) { - appendDetail(buffer, fieldName, array); + appendDetail(buffer, array); } else { - appendSummary(buffer, fieldName, array); + appendSummary(buffer, array); } - appendFieldEnd(buffer, fieldName); + appendFieldEnd(buffer); } /** @@ -1262,17 +1233,16 @@ * boolean array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, boolean[] array) { + protected void appendDetail(StringBuffer buffer, boolean[] array) { buffer.append(arrayStart); for (int i = 0; i < array.length; i++) { if (i > 0) { buffer.append(arraySeparator); } - appendDetail(buffer, fieldName, array[i]); + appendDetail(buffer, array[i]); } buffer.append(arrayEnd); } @@ -1282,12 +1252,11 @@ * boolean array.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param array the array to add to the toString, * not null */ - protected void appendSummary(StringBuffer buffer, String fieldName, boolean[] array) { - appendSummarySize(buffer, fieldName, array.length); + protected void appendSummary(StringBuffer buffer, boolean[] array) { + appendSummarySize(buffer, array.length); } //---------------------------------------------------------------------------- @@ -1345,9 +1314,8 @@ *

    The default indicator is '<null>'.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended */ - protected void appendNullText(StringBuffer buffer, String fieldName) { + protected void appendNullText(StringBuffer buffer) { buffer.append(nullText); } @@ -1377,9 +1345,8 @@ *

    Append to the toString the field end.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended */ - protected void appendFieldEnd(StringBuffer buffer, String fieldName) { + protected void appendFieldEnd(StringBuffer buffer) { appendFieldSeparator(buffer); } @@ -1395,10 +1362,9 @@ *

    The default format is '<size=n>'.

    * * @param buffer the StringBuffer to populate - * @param fieldName the field name, typically not used as already appended * @param size the size to append */ - protected void appendSummarySize(StringBuffer buffer, String fieldName, int size) { + protected void appendSummarySize(StringBuffer buffer, int size) { buffer.append(sizeStartText); buffer.append(size); buffer.append(sizeEndText); @@ -1981,6 +1947,8 @@ */ private static final class DefaultToStringStyle extends ToStringStyle { + private static final long serialVersionUID = 5569711763517190629L; + /** *

    Constructor.

    * @@ -2012,6 +1980,8 @@ */ private static final class NoFieldNameToStringStyle extends ToStringStyle { + private static final long serialVersionUID = -3444143728986025511L; + /** *

    Constructor.

    * @@ -2044,6 +2014,8 @@ */ private static final class ShortPrefixToStringStyle extends ToStringStyle { + private static final long serialVersionUID = 7783377436733592775L; + /** *

    Constructor.

    * @@ -2074,6 +2046,8 @@ */ private static final class SimpleToStringStyle extends ToStringStyle { + private static final long serialVersionUID = -8812944128283409949L; + /** *

    Constructor.

    * @@ -2107,6 +2081,8 @@ * StandardToStringStyle to ensure its immutability.

    */ private static final class MultiLineToStringStyle extends ToStringStyle { + + private static final long serialVersionUID = -8748806436058291717L; /** *

    Constructor.

    Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/enums/Enum.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/enums/Enum.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/enums/Enum.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/enums/Enum.java Sun Jan 22 05:52:31 2006 @@ -364,7 +364,7 @@ if (entry == null) { return null; } - return (Enum) entry.map.get(getName()); + return entry.map.get(getName()); } //-------------------------------------------------------------------------------- Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableDelegate.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableDelegate.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableDelegate.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableDelegate.java Sun Jan 22 05:52:31 2006 @@ -45,6 +45,8 @@ */ public class NestableDelegate implements Serializable { + private static final long serialVersionUID = 9080566082994893654L; + /** * Constructor error message. */ Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableError.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableError.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableError.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableError.java Sun Jan 22 05:52:31 2006 @@ -28,6 +28,8 @@ */ public class NestableError extends Error implements Nestable { + private static final long serialVersionUID = 7845835345089848497L; + /** * The helper instance which contains much of the code which we * delegate to. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableException.java Sun Jan 22 05:52:31 2006 @@ -88,6 +88,8 @@ */ public class NestableException extends Exception implements Nestable { + private static final long serialVersionUID = 1904514890537151867L; + /** * The helper instance which contains much of the code which we * delegate to. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableRuntimeException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableRuntimeException.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableRuntimeException.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/exception/NestableRuntimeException.java Sun Jan 22 05:52:31 2006 @@ -32,6 +32,8 @@ */ public class NestableRuntimeException extends RuntimeException implements Nestable { + private static final long serialVersionUID = 5530242104497359762L; + /** * The helper instance which contains much of the code which we * delegate to. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/math/JVMRandom.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/math/JVMRandom.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/math/JVMRandom.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/math/JVMRandom.java Sun Jan 22 05:52:31 2006 @@ -28,6 +28,8 @@ */ public final class JVMRandom extends Random { + private static final long serialVersionUID = 4443875130494662933L; + /** * Ensures that only the constructor can call reseed. */ Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/FastDateFormat.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/FastDateFormat.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/FastDateFormat.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/FastDateFormat.java Sun Jan 22 05:52:31 2006 @@ -64,6 +64,9 @@ * @version $Id$ */ public class FastDateFormat extends Format { + + private static final long serialVersionUID = 1163691066495297716L; + // A lot of the speed in this class comes from caching, but some comes // from the special int to StringBuffer conversion. // Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/Constants.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/Constants.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/Constants.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/Constants.java Sun Jan 22 05:52:31 2006 @@ -34,8 +34,8 @@ public static final String BACKLOG = "backlog"; public static final String OOB_INLINE = "OOBInline"; public static final String KEEP_ALIVE = "keepAlive"; - public static final String SO_LINGER = "soLinger"; - public static final String TCP_NO_DELAY = "TCPNoDelay"; + public static final String LINGER = "linger"; + public static final String NO_DELAY = "noDelay"; public static final String CONNECT_TIMEOUT = "connectTimeout"; public static final String DISCONNECT_ON_UNBIND = "disconnectOnUnbind"; Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAddresses.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAddresses.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAddresses.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAddresses.java Sun Jan 22 05:52:31 2006 @@ -24,7 +24,7 @@ import org.apache.mina.common.IoAddress; /** - * TODO Document me + * Provides conversion between {@link SocketAddress} and {@link IoAddress}. * * @author The Apache Directory Project (dev@directory.apache.org) * @version $Rev$, $Date$ Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Sun Jan 22 05:52:31 2006 @@ -164,9 +164,9 @@ ch.socket().setSendBufferSize( Integer.parseInt( props.getProperty( Constants.SEND_BUFFER_SIZE ) ) ); } - if( props.containsKey( Constants.SO_LINGER ) ) + if( props.containsKey( Constants.LINGER ) ) { - String val = props.getProperty( Constants.SO_LINGER ); + String val = props.getProperty( Constants.LINGER ); if( val.equalsIgnoreCase( "off" ) ) { ch.socket().setSoLinger( false, 0 ); @@ -176,9 +176,9 @@ ch.socket().setSoLinger( true, Integer.parseInt( val ) ); } } - if( props.containsKey( Constants.TCP_NO_DELAY ) ) + if( props.containsKey( Constants.NO_DELAY ) ) { - ch.socket().setTcpNoDelay( "true".equalsIgnoreCase( props.getProperty( Constants.TCP_NO_DELAY ) ) ); + ch.socket().setTcpNoDelay( "true".equalsIgnoreCase( props.getProperty( Constants.NO_DELAY ) ) ); } if( props.containsKey( Constants.TRAFFIC_CLASS ) ) { Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?rev=371290&r1=371289&r2=371290&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Sun Jan 22 05:52:31 2006 @@ -278,7 +278,7 @@ private void read( SocketSession session ) { - ByteBuffer buf = ByteBuffer.allocate( session.getSessionReceiveBufferSize() ); + ByteBuffer buf = ByteBuffer.allocate( session.getReadBufferSize() ); SocketChannel ch = session.getChannel(); try