You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC

svn commit: r584925 [17/34] - in /wicket/trunk/jdk-1.4/wicket/src: main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/ main/java/org/apache/wicket/ajax/calldecorator/ main/java/org/apache/wicket/ajax/form/ main/java/org/apache/wicket/ajax/ma...

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java Mon Oct 15 14:21:25 2007
@@ -5,22 +5,22 @@
   permission, from JDK1.2 ArrayList.java
   which carries the following copyright:
 
-     * Copyright 1997 by Sun Microsystems, Inc.,
-     * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
-     * All rights reserved.
-     *
-     * This software is the confidential and proprietary information
-     * of Sun Microsystems, Inc. ("Confidential Information").  You
-     * shall not disclose such Confidential Information and shall use
-     * it only in accordance with the terms of the license agreement
-     * you entered into with Sun.
+ * Copyright 1997 by Sun Microsystems, Inc.,
+ * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
+ * All rights reserved.
+ *
+ * This software is the confidential and proprietary information
+ * of Sun Microsystems, Inc. ("Confidential Information").  You
+ * shall not disclose such Confidential Information and shall use
+ * it only in accordance with the terms of the license agreement
+ * you entered into with Sun.
 
   History:
   Date       Who                What
   21Jun1998  dl               Create public version
    9Oct1999  dl               faster equals
   29jun2001  dl               Serialization methods now private
-*/
+ */
 package org.apache.wicket.util.concurrent;
 
 import java.util.AbstractList;
@@ -32,46 +32,39 @@
 import java.util.NoSuchElementException;
 
 /**
- * This class implements a variant of java.util.ArrayList in which all mutative
- * operations (add, set, and so on) are implemented by making a fresh copy of
- * the underlying array.
+ * This class implements a variant of java.util.ArrayList in which all mutative operations (add,
+ * set, and so on) are implemented by making a fresh copy of the underlying array.
  * <p>
- * This is ordinarily too costly, but it becomes attractive when traversal
- * operations vastly overwhelm mutations, and, especially, when you cannot or
- * don't want to synchronize traversals, yet need to preclude interference among
- * concurrent threads. The iterator method uses a reference to the state of the
- * array at the point that the iterator was created. This array never changes
- * during the lifetime of the iterator, so interference is impossible. (The
- * iterator will not traverse elements added or changed since the iterator was
- * created, but usually this is a desirable feature.)
+ * This is ordinarily too costly, but it becomes attractive when traversal operations vastly
+ * overwhelm mutations, and, especially, when you cannot or don't want to synchronize traversals,
+ * yet need to preclude interference among concurrent threads. The iterator method uses a reference
+ * to the state of the array at the point that the iterator was created. This array never changes
+ * during the lifetime of the iterator, so interference is impossible. (The iterator will not
+ * traverse elements added or changed since the iterator was created, but usually this is a
+ * desirable feature.)
  * <p>
- * As much code and documentation as possible was shamelessly copied from
- * java.util.ArrayList (Thanks, Josh!), with the intent of preserving all
- * semantics of ArrayList except for the copy-on-write property. (The java.util
- * collection code could not be subclassed here since all of the existing
- * collection classes assume elementwise mutability.)
+ * As much code and documentation as possible was shamelessly copied from java.util.ArrayList
+ * (Thanks, Josh!), with the intent of preserving all semantics of ArrayList except for the
+ * copy-on-write property. (The java.util collection code could not be subclassed here since all of
+ * the existing collection classes assume elementwise mutability.)
  * <p>
- * Because of the copy-on-write policy, some one-by-one mutative operations in
- * the java.util.Arrays and java.util.Collections classes are so time/space
- * intensive as to never be worth calling (except perhaps as benchmarks for
- * garbage collectors :-).
+ * Because of the copy-on-write policy, some one-by-one mutative operations in the java.util.Arrays
+ * and java.util.Collections classes are so time/space intensive as to never be worth calling
+ * (except perhaps as benchmarks for garbage collectors :-).
  * <p>
- * Three methods are supported in addition to those described in List and
- * ArrayList. The addIfAbsent and addAllAbsent methods provide Set semantics for
- * add, and are used in CopyOnWriteArraySet. However, they can also be used
- * directly from this List version. The copyIn method (and a constructor that
- * invokes it) allow you to copy in an initial array to use. This method can be
- * useful when you first want to perform many operations on a plain array, and
- * then make a copy available for use through the collection API.
+ * Three methods are supported in addition to those described in List and ArrayList. The addIfAbsent
+ * and addAllAbsent methods provide Set semantics for add, and are used in CopyOnWriteArraySet.
+ * However, they can also be used directly from this List version. The copyIn method (and a
+ * constructor that invokes it) allow you to copy in an initial array to use. This method can be
+ * useful when you first want to perform many operations on a plain array, and then make a copy
+ * available for use through the collection API.
  * <p>
- * Due to their strict read-only nature, element-changing operations on
- * iterators (remove, set, and add) are not supported. These are the only
- * methods throwing UnsupportedOperationException.
+ * Due to their strict read-only nature, element-changing operations on iterators (remove, set, and
+ * add) are not supported. These are the only methods throwing UnsupportedOperationException.
  * <p>
- * <p>[<a
- * href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
+ * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
  * Introduction to this package. </a>]
- *
+ * 
  * @see CopyOnWriteArraySet
  */
 
@@ -87,9 +80,8 @@
 	protected transient Object[] array_;
 
 	/**
-	 * Accessor to the array intended to be called from within unsynchronized
-	 * read-only methods
-	 *
+	 * Accessor to the array intended to be called from within unsynchronized read-only methods
+	 * 
 	 * @return The internal array
 	 */
 	protected synchronized Object[] array()
@@ -99,7 +91,7 @@
 
 	/**
 	 * Constructs an empty list
-	 *
+	 * 
 	 */
 	public CopyOnWriteArrayList()
 	{
@@ -107,10 +99,11 @@
 	}
 
 	/**
-	 * Constructs an list containing the elements of the specified Collection,
-	 * in the order they are returned by the Collection's iterator.
-	 *
-	 * @param c The collection to get the objects from.
+	 * Constructs an list containing the elements of the specified Collection, in the order they are
+	 * returned by the Collection's iterator.
+	 * 
+	 * @param c
+	 *            The collection to get the objects from.
 	 */
 	public CopyOnWriteArrayList(Collection c)
 	{
@@ -125,7 +118,7 @@
 
 	/**
 	 * Create a new CopyOnWriteArrayList holding a copy of given array
-	 *
+	 * 
 	 * @param toCopyIn
 	 *            the array. A copy of this array is used as the internal array.
 	 */
@@ -135,19 +128,17 @@
 	}
 
 	/**
-	 * Replace the held array with a copy of the <code>n</code> elements of
-	 * the provided array, starting at position <code>first</code>. To copy
-	 * an entire array, call with arguments (array, 0, array.length).
-	 *
+	 * Replace the held array with a copy of the <code>n</code> elements of the provided array,
+	 * starting at position <code>first</code>. To copy an entire array, call with arguments
+	 * (array, 0, array.length).
+	 * 
 	 * @param toCopyIn
-	 *            the array. A copy of the indicated elements of this array is
-	 *            used as the internal array.
+	 *            the array. A copy of the indicated elements of this array is used as the internal
+	 *            array.
 	 * @param first
-	 *            The index of first position of the array to start copying
-	 *            from.
+	 *            The index of first position of the array to start copying from.
 	 * @param n
-	 *            the number of elements to copy. This will be the new size of
-	 *            the list.
+	 *            the number of elements to copy. This will be the new size of the list.
 	 */
 	public synchronized void copyIn(Object[] toCopyIn, int first, int n)
 	{
@@ -157,7 +148,7 @@
 
 	/**
 	 * Returns the number of components in this list.
-	 *
+	 * 
 	 * @return the number of components in this list.
 	 */
 	public int size()
@@ -167,9 +158,8 @@
 
 	/**
 	 * Tests if this list has no components.
-	 *
-	 * @return <code>true</code> if this list has no components;
-	 *         <code>false</code> otherwise.
+	 * 
+	 * @return <code>true</code> if this list has no components; <code>false</code> otherwise.
 	 */
 	public boolean isEmpty()
 	{
@@ -178,7 +168,7 @@
 
 	/**
 	 * Returns true if this list contains the specified element.
-	 *
+	 * 
 	 * @param o
 	 *            element whose presence in this List is to be tested.
 	 */
@@ -190,13 +180,13 @@
 	}
 
 	/**
-	 * Searches for the first occurrence of the given argument, testing for
-	 * equality using the <code>equals</code> method.
-	 *
+	 * Searches for the first occurrence of the given argument, testing for equality using the
+	 * <code>equals</code> method.
+	 * 
 	 * @param elem
 	 *            an object.
-	 * @return the index of the first occurrence of the argument in this list;
-	 *         returns <code>-1</code> if the object is not found.
+	 * @return the index of the first occurrence of the argument in this list; returns
+	 *         <code>-1</code> if the object is not found.
 	 * @see Object#equals(Object)
 	 */
 	public int indexOf(Object elem)
@@ -208,8 +198,8 @@
 
 
 	/**
-	 * static version allows repeated call without needed to grab lock for array
-	 * each time
+	 * static version allows repeated call without needed to grab lock for array each time
+	 * 
 	 * @param elem
 	 * @param elementData
 	 * @param len
@@ -242,17 +232,16 @@
 	}
 
 	/**
-	 * Searches for the first occurrence of the given argument, beginning the
-	 * search at <code>index</code>, and testing for equality using the
-	 * <code>equals</code> method.
-	 *
+	 * Searches for the first occurrence of the given argument, beginning the search at
+	 * <code>index</code>, and testing for equality using the <code>equals</code> method.
+	 * 
 	 * @param elem
 	 *            an object.
 	 * @param index
 	 *            the index to start searching from.
-	 * @return the index of the first occurrence of the object argument in this
-	 *         List at position <code>index</code> or later in the List;
-	 *         returns <code>-1</code> if the object is not found.
+	 * @return the index of the first occurrence of the object argument in this List at position
+	 *         <code>index</code> or later in the List; returns <code>-1</code> if the object is
+	 *         not found.
 	 * @see Object#equals(Object)
 	 */
 
@@ -286,13 +275,12 @@
 	}
 
 	/**
-	 * Returns the index of the last occurrence of the specified object in this
-	 * list.
-	 *
+	 * Returns the index of the last occurrence of the specified object in this list.
+	 * 
 	 * @param elem
 	 *            the desired component.
-	 * @return the index of the last occurrence of the specified object in this
-	 *         list; returns -1 if the object is not found.
+	 * @return the index of the last occurrence of the specified object in this list; returns -1 if
+	 *         the object is not found.
 	 */
 	public int lastIndexOf(Object elem)
 	{
@@ -327,16 +315,15 @@
 	}
 
 	/**
-	 * Searches backwards for the specified object, starting from the specified
-	 * index, and returns an index to it.
-	 *
+	 * Searches backwards for the specified object, starting from the specified index, and returns
+	 * an index to it.
+	 * 
 	 * @param elem
 	 *            the desired component.
 	 * @param index
 	 *            the index to start searching from.
-	 * @return the index of the last occurrence of the specified object in this
-	 *         List at position less than index in the List; -1 if the object is
-	 *         not found.
+	 * @return the index of the last occurrence of the specified object in this List at position
+	 *         less than index in the List; -1 if the object is not found.
 	 */
 
 	public int lastIndexOf(Object elem, int index)
@@ -367,9 +354,8 @@
 	}
 
 	/**
-	 * Returns a shallow copy of this list. (The elements themselves are not
-	 * copied.)
-	 *
+	 * Returns a shallow copy of this list. (The elements themselves are not copied.)
+	 * 
 	 * @return a clone of this list.
 	 */
 	public Object clone()
@@ -390,8 +376,7 @@
 	}
 
 	/**
-	 * Returns an array containing all of the elements in this list in the
-	 * correct order.
+	 * Returns an array containing all of the elements in this list in the correct order.
 	 */
 	public Object[] toArray()
 	{
@@ -402,26 +387,24 @@
 	}
 
 	/**
-	 * Returns an array containing all of the elements in this list in the
-	 * correct order. The runtime type of the returned array is that of the
-	 * specified array. If the list fits in the specified array, it is returned
-	 * therein. Otherwise, a new array is allocated with the runtime type of the
-	 * specified array and the size of this list.
+	 * Returns an array containing all of the elements in this list in the correct order. The
+	 * runtime type of the returned array is that of the specified array. If the list fits in the
+	 * specified array, it is returned therein. Otherwise, a new array is allocated with the runtime
+	 * type of the specified array and the size of this list.
 	 * <p>
-	 * If the list fits in the specified array with room to spare (i.e., the
-	 * array has more elements than the list), the element in the array
-	 * immediately following the end of the collection is set to null. This is
-	 * useful in determining the length of the list <em>only</em> if the
+	 * If the list fits in the specified array with room to spare (i.e., the array has more elements
+	 * than the list), the element in the array immediately following the end of the collection is
+	 * set to null. This is useful in determining the length of the list <em>only</em> if the
 	 * caller knows that the list does not contain any null elements.
-	 *
+	 * 
 	 * @param a
-	 *            the array into which the elements of the list are to be
-	 *            stored, if it is big enough; otherwise, a new array of the
-	 *            same runtime type is allocated for this purpose.
+	 *            the array into which the elements of the list are to be stored, if it is big
+	 *            enough; otherwise, a new array of the same runtime type is allocated for this
+	 *            purpose.
 	 * @return an array containing the elements of the list.
 	 * @exception ArrayStoreException
-	 *                the runtime type of a is not a supertype of the runtime
-	 *                type of every element in this list.
+	 *                the runtime type of a is not a supertype of the runtime type of every element
+	 *                in this list.
 	 */
 	public Object[] toArray(Object a[])
 	{
@@ -447,12 +430,11 @@
 
 	/**
 	 * Returns the element at the specified position in this list.
-	 *
+	 * 
 	 * @param index
 	 *            index of element to return.
 	 * @exception IndexOutOfBoundsException
-	 *                index is out of range (index &lt; 0 || index &gt;=
-	 *                size()).
+	 *                index is out of range (index &lt; 0 || index &gt;= size()).
 	 */
 	public Object get(int index)
 	{
@@ -462,9 +444,8 @@
 	}
 
 	/**
-	 * Replaces the element at the specified position in this list with the
-	 * specified element.
-	 *
+	 * Replaces the element at the specified position in this list with the specified element.
+	 * 
 	 * @param index
 	 *            index of element to replace.
 	 * @param element
@@ -492,7 +473,7 @@
 
 	/**
 	 * Appends the specified element to the end of this list.
-	 *
+	 * 
 	 * @param element
 	 *            element to be appended to this list.
 	 * @return true (as per the general contract of Collection.add).
@@ -508,10 +489,10 @@
 	}
 
 	/**
-	 * Inserts the specified element at the specified position in this list.
-	 * Shifts the element currently at that position (if any) and any subsequent
-	 * elements to the right (adds one to their indices).
-	 *
+	 * Inserts the specified element at the specified position in this list. Shifts the element
+	 * currently at that position (if any) and any subsequent elements to the right (adds one to
+	 * their indices).
+	 * 
 	 * @param index
 	 *            index at which the specified element is to be inserted.
 	 * @param element
@@ -535,10 +516,10 @@
 	}
 
 	/**
-	 * Removes the element at the specified position in this list. Shifts any
-	 * subsequent elements to the left (subtracts one from their indices).
-	 * Returns the element that was removed from the list.
-	 *
+	 * Removes the element at the specified position in this list. Shifts any subsequent elements to
+	 * the left (subtracts one from their indices). Returns the element that was removed from the
+	 * list.
+	 * 
 	 * @param index
 	 *            the index of the element to removed.
 	 * @exception IndexOutOfBoundsException
@@ -561,14 +542,13 @@
 	}
 
 	/**
-	 * Removes a single instance of the specified element from this Collection,
-	 * if it is present (optional operation). More formally, removes an element
-	 * <code>e</code> such that <code>(o==null ? e==null :
-	 * o.equals(e))</code>,
-	 * if the Collection contains one or more such elements. Returns true if the
-	 * Collection contained the specified element (or equivalently, if the
-	 * Collection changed as a result of the call).
-	 *
+	 * Removes a single instance of the specified element from this Collection, if it is present
+	 * (optional operation). More formally, removes an element <code>e</code> such that
+	 * <code>(o==null ? e==null :
+	 * o.equals(e))</code>, if the Collection contains one or more
+	 * such elements. Returns true if the Collection contained the specified element (or
+	 * equivalently, if the Collection changed as a result of the call).
+	 * 
 	 * @param element
 	 *            element to be removed from this Collection, if present.
 	 * @return true if the Collection changed as a result of the call.
@@ -620,20 +600,18 @@
 
 
 	/**
-	 * Removes from this List all of the elements whose index is between
-	 * fromIndex, inclusive and toIndex, exclusive. Shifts any succeeding
-	 * elements to the left (reduces their index). This call shortens the List
-	 * by (toIndex - fromIndex) elements. (If toIndex==fromIndex, this operation
-	 * has no effect.)
-	 *
+	 * Removes from this List all of the elements whose index is between fromIndex, inclusive and
+	 * toIndex, exclusive. Shifts any succeeding elements to the left (reduces their index). This
+	 * call shortens the List by (toIndex - fromIndex) elements. (If toIndex==fromIndex, this
+	 * operation has no effect.)
+	 * 
 	 * @param fromIndex
 	 *            index of first element to be removed.
 	 * @param toIndex
 	 *            index after last element to be removed.
 	 * @exception IndexOutOfBoundsException
-	 *                fromIndex or toIndex out of range (fromIndex &lt; 0 ||
-	 *                fromIndex &gt;= size() || toIndex &gt; size() || toIndex
-	 *                &lt; fromIndex).
+	 *                fromIndex or toIndex out of range (fromIndex &lt; 0 || fromIndex &gt;= size() ||
+	 *                toIndex &gt; size() || toIndex &lt; fromIndex).
 	 */
 	public synchronized void removeRange(int fromIndex, int toIndex)
 	{
@@ -654,9 +632,9 @@
 
 
 	/**
-	 * Append the element if not present. This operation can be used to obtain
-	 * Set semantics for lists.
-	 *
+	 * Append the element if not present. This operation can be used to obtain Set semantics for
+	 * lists.
+	 * 
 	 * @param element
 	 *            element to be added to this Collection, if absent.
 	 * @return true if added
@@ -684,14 +662,12 @@
 	}
 
 	/**
-	 * Returns true if this Collection contains all of the elements in the
-	 * specified Collection.
+	 * Returns true if this Collection contains all of the elements in the specified Collection.
 	 * <p>
-	 * This implementation iterates over the specified Collection, checking each
-	 * element returned by the Iterator in turn to see if it's contained in this
-	 * Collection. If all elements are so contained true is returned, otherwise
-	 * false.
-	 *
+	 * This implementation iterates over the specified Collection, checking each element returned by
+	 * the Iterator in turn to see if it's contained in this Collection. If all elements are so
+	 * contained true is returned, otherwise false.
+	 * 
 	 */
 	public boolean containsAll(Collection c)
 	{
@@ -711,11 +687,11 @@
 
 
 	/**
-	 * Removes from this Collection all of its elements that are contained in
-	 * the specified Collection. This is a particularly expensive operation in
-	 * this class because of the need for an internal temporary array.
+	 * Removes from this Collection all of its elements that are contained in the specified
+	 * Collection. This is a particularly expensive operation in this class because of the need for
+	 * an internal temporary array.
 	 * <p>
-	 *
+	 * 
 	 * @return true if this Collection changed as a result of the call.
 	 */
 	public synchronized boolean removeAll(Collection c)
@@ -752,11 +728,10 @@
 	}
 
 	/**
-	 * Retains only the elements in this Collection that are contained in the
-	 * specified Collection (optional operation). In other words, removes from
-	 * this Collection all of its elements that are not contained in the
-	 * specified Collection.
-	 *
+	 * Retains only the elements in this Collection that are contained in the specified Collection
+	 * (optional operation). In other words, removes from this Collection all of its elements that
+	 * are not contained in the specified Collection.
+	 * 
 	 * @return true if this Collection changed as a result of the call.
 	 */
 	public synchronized boolean retainAll(Collection c)
@@ -791,10 +766,10 @@
 	}
 
 	/**
-	 * Appends all of the elements in the specified Collection that are not
-	 * already contained in this list, to the end of this list, in the order
-	 * that they are returned by the specified Collection's Iterator.
-	 *
+	 * Appends all of the elements in the specified Collection that are not already contained in
+	 * this list, to the end of this list, in the order that they are returned by the specified
+	 * Collection's Iterator.
+	 * 
 	 * @param c
 	 *            elements to be added into this list.
 	 * @return the number of elements added
@@ -840,7 +815,7 @@
 
 	/**
 	 * Removes all of the elements from this list.
-	 *
+	 * 
 	 */
 	public synchronized void clear()
 	{
@@ -848,10 +823,9 @@
 	}
 
 	/**
-	 * Appends all of the elements in the specified Collection to the end of
-	 * this list, in the order that they are returned by the specified
-	 * Collection's Iterator.
-	 *
+	 * Appends all of the elements in the specified Collection to the end of this list, in the order
+	 * that they are returned by the specified Collection's Iterator.
+	 * 
 	 * @param c
 	 *            elements to be inserted into this list.
 	 */
@@ -877,15 +851,13 @@
 	}
 
 	/**
-	 * Inserts all of the elements in the specified Collection into this list,
-	 * starting at the specified position. Shifts the element currently at that
-	 * position (if any) and any subsequent elements to the right (increases
-	 * their indices). The new elements will appear in the list in the order
-	 * that they are returned by the specified Collection's iterator.
-	 *
+	 * Inserts all of the elements in the specified Collection into this list, starting at the
+	 * specified position. Shifts the element currently at that position (if any) and any subsequent
+	 * elements to the right (increases their indices). The new elements will appear in the list in
+	 * the order that they are returned by the specified Collection's iterator.
+	 * 
 	 * @param index
-	 *            index at which to insert first element from the specified
-	 *            collection.
+	 *            index at which to insert first element from the specified collection.
 	 * @param c
 	 *            elements to be inserted into this list.
 	 * @exception IndexOutOfBoundsException
@@ -923,8 +895,8 @@
 	}
 
 	/**
-	 * Check if the given index is in range. If not, throw an appropriate
-	 * runtime exception.
+	 * Check if the given index is in range. If not, throw an appropriate runtime exception.
+	 * 
 	 * @param index
 	 * @param length
 	 */
@@ -938,12 +910,12 @@
 
 	/**
 	 * Save the state of the list to a stream (i.e., serialize it).
+	 * 
 	 * @param s
 	 * @throws java.io.IOException
-	 *
-	 * @serialData The length of the array backing the list is emitted (int),
-	 *             followed by all of its elements (each an Object) in the
-	 *             proper order.
+	 * 
+	 * @serialData The length of the array backing the list is emitted (int), followed by all of its
+	 *             elements (each an Object) in the proper order.
 	 */
 	private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException
 	{
@@ -963,6 +935,7 @@
 
 	/**
 	 * Reconstitute the list from a stream (i.e., deserialize it).
+	 * 
 	 * @param s
 	 * @throws java.io.IOException
 	 * @throws ClassNotFoundException
@@ -986,8 +959,8 @@
 	}
 
 	/**
-	 * Returns a string representation of this Collection, containing the String
-	 * representation of each element.
+	 * Returns a string representation of this Collection, containing the String representation of
+	 * each element.
 	 */
 	public String toString()
 	{
@@ -1009,23 +982,20 @@
 
 
 	/**
-	 * Compares the specified Object with this List for equality. Returns true
-	 * if and only if the specified Object is also a List, both Lists have the
-	 * same size, and all corresponding pairs of elements in the two Lists are
-	 * <em>equal</em>. (Two elements <code>e1</code> and <code>e2</code>
-	 * are <em>equal</em> if
-	 * <code>(e1==null ? e2==null : e1.equals(e2))</code>.) In other words,
-	 * two Lists are defined to be equal if they contain the same elements in
-	 * the same order.
+	 * Compares the specified Object with this List for equality. Returns true if and only if the
+	 * specified Object is also a List, both Lists have the same size, and all corresponding pairs
+	 * of elements in the two Lists are <em>equal</em>. (Two elements <code>e1</code> and
+	 * <code>e2</code> are <em>equal</em> if <code>(e1==null ? e2==null : e1.equals(e2))</code>.)
+	 * In other words, two Lists are defined to be equal if they contain the same elements in the
+	 * same order.
 	 * <p>
-	 * This implementation first checks if the specified object is this List. If
-	 * so, it returns true; if not, it checks if the specified object is a List.
-	 * If not, it returns false; if so, it iterates over both lists, comparing
-	 * corresponding pairs of elements. If any comparison returns false, this
-	 * method returns false. If either Iterator runs out of elements before
-	 * before the other it returns false (as the Lists are of unequal length);
-	 * otherwise it returns true when the iterations complete.
-	 *
+	 * This implementation first checks if the specified object is this List. If so, it returns
+	 * true; if not, it checks if the specified object is a List. If not, it returns false; if so,
+	 * it iterates over both lists, comparing corresponding pairs of elements. If any comparison
+	 * returns false, this method returns false. If either Iterator runs out of elements before
+	 * before the other it returns false (as the Lists are of unequal length); otherwise it returns
+	 * true when the iterations complete.
+	 * 
 	 * @param o
 	 *            the Object to be compared for equality with this List.
 	 * @return true if the specified Object is equal to this List.
@@ -1064,8 +1034,8 @@
 	/**
 	 * Returns the hash code value for this List.
 	 * <p>
-	 * This implementation uses exactly the code that is used to define the List
-	 * hash function in the documentation for List.hashCode.
+	 * This implementation uses exactly the code that is used to define the List hash function in
+	 * the documentation for List.hashCode.
 	 */
 	public int hashCode()
 	{
@@ -1080,10 +1050,9 @@
 	}
 
 	/**
-	 * Returns an Iterator over the elements contained in this collection. The
-	 * iterator provides a snapshot of the state of the list when the iterator
-	 * was constructed. No synchronization is needed while traversing the
-	 * iterator. The iterator does <em>NOT</em> support the
+	 * Returns an Iterator over the elements contained in this collection. The iterator provides a
+	 * snapshot of the state of the list when the iterator was constructed. No synchronization is
+	 * needed while traversing the iterator. The iterator does <em>NOT</em> support the
 	 * <code>remove</code> method.
 	 */
 	public Iterator iterator()
@@ -1092,13 +1061,11 @@
 	}
 
 	/**
-	 * Returns an Iterator of the elements in this List (in proper sequence).
-	 * The iterator provides a snapshot of the state of the list when the
-	 * iterator was constructed. No synchronization is needed while traversing
-	 * the iterator. The iterator does <em>NOT</em> support the
-	 * <code>remove</code>, <code>set</code>, or <code>add</code>
-	 * methods.
-	 *
+	 * Returns an Iterator of the elements in this List (in proper sequence). The iterator provides
+	 * a snapshot of the state of the list when the iterator was constructed. No synchronization is
+	 * needed while traversing the iterator. The iterator does <em>NOT</em> support the
+	 * <code>remove</code>, <code>set</code>, or <code>add</code> methods.
+	 * 
 	 */
 
 	public ListIterator listIterator()
@@ -1107,17 +1074,16 @@
 	}
 
 	/**
-	 * Returns a ListIterator of the elements in this List (in proper sequence),
-	 * starting at the specified position in the List. The specified index
-	 * indicates the first element that would be returned by an initial call to
-	 * nextElement. An initial call to previousElement would return the element
-	 * with the specified index minus one. The ListIterator returned by this
-	 * implementation will throw an UnsupportedOperationException in its remove,
-	 * set and add methods.
-	 *
+	 * Returns a ListIterator of the elements in this List (in proper sequence), starting at the
+	 * specified position in the List. The specified index indicates the first element that would be
+	 * returned by an initial call to nextElement. An initial call to previousElement would return
+	 * the element with the specified index minus one. The ListIterator returned by this
+	 * implementation will throw an UnsupportedOperationException in its remove, set and add
+	 * methods.
+	 * 
 	 * @param index
-	 *            index of first element to be returned from the ListIterator
-	 *            (by a call to getNext).
+	 *            index of first element to be returned from the ListIterator (by a call to
+	 *            getNext).
 	 * @exception IndexOutOfBoundsException
 	 *                index is out of range (index &lt; 0 || index &gt; size()).
 	 */
@@ -1196,7 +1162,7 @@
 
 		/**
 		 * Not supported. Always throws UnsupportedOperationException.
-		 *
+		 * 
 		 * @exception UnsupportedOperationException
 		 *                remove is not supported by this Iterator.
 		 */
@@ -1208,7 +1174,7 @@
 
 		/**
 		 * Not supported. Always throws UnsupportedOperationException.
-		 *
+		 * 
 		 * @exception UnsupportedOperationException
 		 *                set is not supported by this Iterator.
 		 */
@@ -1219,7 +1185,7 @@
 
 		/**
 		 * Not supported. Always throws UnsupportedOperationException.
-		 *
+		 * 
 		 * @exception UnsupportedOperationException
 		 *                add is not supported by this Iterator.
 		 */
@@ -1231,26 +1197,24 @@
 
 
 	/**
-	 * Returns a view of the portion of this List between fromIndex, inclusive,
-	 * and toIndex, exclusive. The returned List is backed by this List, so
-	 * changes in the returned List are reflected in this List, and vice-versa.
-	 * While mutative operations are supported, they are probably not very
-	 * useful for CopyOnWriteArrays.
+	 * Returns a view of the portion of this List between fromIndex, inclusive, and toIndex,
+	 * exclusive. The returned List is backed by this List, so changes in the returned List are
+	 * reflected in this List, and vice-versa. While mutative operations are supported, they are
+	 * probably not very useful for CopyOnWriteArrays.
 	 * </p>
-	 * The semantics of the List returned by this method become undefined if the
-	 * backing list (i.e., this List) is <i>structurally modified</i> in any
-	 * way other than via the returned List. (Structural modifications are those
-	 * that change the size of the List, or otherwise perturb it in such a
-	 * fashion that iterations in progress may yield incorrect results.)
-	 *
+	 * The semantics of the List returned by this method become undefined if the backing list (i.e.,
+	 * this List) is <i>structurally modified</i> in any way other than via the returned List.
+	 * (Structural modifications are those that change the size of the List, or otherwise perturb it
+	 * in such a fashion that iterations in progress may yield incorrect results.)
+	 * 
 	 * @param fromIndex
 	 *            low endpoint (inclusive) of the subList.
 	 * @param toKey
 	 *            high endpoint (exclusive) of the subList.
 	 * @return a view of the specified range within this List.
 	 * @exception IndexOutOfBoundsException
-	 *                Illegal endpoint index value (fromIndex &lt; 0 || toIndex
-	 *                &gt; size || fromIndex &gt; toIndex).
+	 *                Illegal endpoint index value (fromIndex &lt; 0 || toIndex &gt; size ||
+	 *                fromIndex &gt; toIndex).
 	 */
 	public synchronized List subList(int fromIndex, int toIndex)
 	{
@@ -1267,19 +1231,16 @@
 	{
 
 		/*
-		 * This is currently a bit sleazy. The class extends AbstractList merely
-		 * for convenience, to avoid having to define addAll, etc. This doesn't
-		 * hurt, but is stupid and wasteful. This class does not need or use
-		 * modCount mechanics in AbstractList, but does need to check for
-		 * concurrent modification using similar mechanics. On each operation,
-		 * the array that we expect the backing list to use is checked and
-		 * updated. Since we do this for all of the base operations invoked by
-		 * those defined in AbstractList, all is well.
-		 *
-		 * It's not clear whether this is worth cleaning up. The kinds of list
-		 * operations inherited from AbstractList are are already so slow on COW
-		 * sublists that adding a bit more space/time doesn't seem even
-		 * noticeable.
+		 * This is currently a bit sleazy. The class extends AbstractList merely for convenience, to
+		 * avoid having to define addAll, etc. This doesn't hurt, but is stupid and wasteful. This
+		 * class does not need or use modCount mechanics in AbstractList, but does need to check for
+		 * concurrent modification using similar mechanics. On each operation, the array that we
+		 * expect the backing list to use is checked and updated. Since we do this for all of the
+		 * base operations invoked by those defined in AbstractList, all is well.
+		 * 
+		 * It's not clear whether this is worth cleaning up. The kinds of list operations inherited
+		 * from AbstractList are are already so slow on COW sublists that adding a bit more
+		 * space/time doesn't seem even noticeable.
 		 */
 
 		protected final CopyOnWriteArrayList l;

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java Mon Oct 15 14:21:25 2007
@@ -135,7 +135,7 @@
 	 * 
 	 * @return the target property type.
 	 */
-	public final Class/*<?>*/ getTargetType()
+	public final Class/* <?> */getTargetType()
 	{
 		return Classes.resolveClass(targetTypeName);
 	}
@@ -199,15 +199,13 @@
 	 *            sets the target property type
 	 * @return This
 	 */
-	public final ConversionException setTargetType(Class/*?*/ targetType)
+	public final ConversionException setTargetType(Class/* ? */targetType)
 	{
 		this.targetTypeName = targetType.getName();
 		return this;
 	}
 
 
-	
-
 	/**
 	 * @return The resource key for the message that should be displayed
 	 */
@@ -221,7 +219,7 @@
 	 * Set the resource key for the message that should be displayed.
 	 * 
 	 * @param resourceKey
-	 * 				sets the resource key
+	 *            sets the resource key
 	 * @return This
 	 */
 	public ConversionException setResourceKey(String resourceKey)

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java Mon Oct 15 14:21:25 2007
@@ -39,9 +39,9 @@
 
 
 /**
- * Implementation of {@link IConverterLocator} interface, which locates
- * converters for a given type. It serves as a registry for {@link IConverter}
- * instances stored by type, and is the default locator for Wicket.
+ * Implementation of {@link IConverterLocator} interface, which locates converters for a given type.
+ * It serves as a registry for {@link IConverter} instances stored by type, and is the default
+ * locator for Wicket.
  * 
  * @see IConverterLocator
  * @author Eelco Hillenius
@@ -56,7 +56,7 @@
 	{
 		private static final long serialVersionUID = 1L;
 
-		private final WeakReference/*<Class<?>>*/ type;
+		private final WeakReference/* <Class<?>> */type;
 
 		/**
 		 * Construct.
@@ -149,8 +149,8 @@
 	 * 
 	 * @param c
 	 *            The class to get the type converter for
-	 * @return The type converter that is registered for class c or null if no
-	 *         type converter was registered for class c
+	 * @return The type converter that is registered for class c or null if no type converter was
+	 *         registered for class c
 	 */
 	public final IConverter get(Class/* ? */c)
 	{
@@ -189,10 +189,9 @@
 	 * Removes the type converter currently registered for class c.
 	 * 
 	 * @param c
-	 *            The class for which the converter registration should be
-	 *            removed
-	 * @return The converter that was registered for class c before removal or
-	 *         null if none was registered
+	 *            The class for which the converter registration should be removed
+	 * @return The converter that was registered for class c before removal or null if none was
+	 *         registered
 	 */
 	public final IConverter remove(Class/* ? */c)
 	{
@@ -206,8 +205,8 @@
 	 *            The converter to add
 	 * @param c
 	 *            The class for which the converter should be used
-	 * @return The previous registered converter for class c or null if none was
-	 *         registered yet for class c
+	 * @return The previous registered converter for class c or null if none was registered yet for
+	 *         class c
 	 */
 	public final IConverter set(final Class/* ? */c, final IConverter converter)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java Mon Oct 15 14:21:25 2007
@@ -23,18 +23,15 @@
 
 
 /**
- * Converts input to output and vice versa. Converters are needed in web
- * applications because we have to switch between Java objects on the server and
- * Strings in the browser output and input.
+ * Converts input to output and vice versa. Converters are needed in web applications because we
+ * have to switch between Java objects on the server and Strings in the browser output and input.
  * <p>
- * Output conversion, which is handled by
- * {@link #convertToString(Object, Locale)}, is typically used by components
- * when they render, so that a date can be displayed as '12/12/2007'. Input
- * conversion, handled by {@link #convertToObject(String, Locale)}, is
- * typically used by form components to interpret incoming values Such values
- * are strings as they are send as request parameters from browsers. An incoming
- * value could be the string '12/12/2007' which could be translated to a
- * corresponding {@link Date} object.
+ * Output conversion, which is handled by {@link #convertToString(Object, Locale)}, is typically
+ * used by components when they render, so that a date can be displayed as '12/12/2007'. Input
+ * conversion, handled by {@link #convertToObject(String, Locale)}, is typically used by form
+ * components to interpret incoming values Such values are strings as they are send as request
+ * parameters from browsers. An incoming value could be the string '12/12/2007' which could be
+ * translated to a corresponding {@link Date} object.
  * </p>
  * 
  * @author Eelco Hillenius

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/MaskConverter.java Mon Oct 15 14:21:25 2007
@@ -26,13 +26,12 @@
 
 
 /**
- * A converter that takes a mask into account. It is specifically meant for
- * overrides on individual components, that provide their own converter by
- * returning it from {@link Component#getConverter(Class)}. It uses an instance
- * of {@link MaskFormatter} to delegate the masking and unmasking to.
+ * A converter that takes a mask into account. It is specifically meant for overrides on individual
+ * components, that provide their own converter by returning it from
+ * {@link Component#getConverter(Class)}. It uses an instance of {@link MaskFormatter} to delegate
+ * the masking and unmasking to.
  * <p>
- * The following characters can be specified (adopted from the MaskFormatter
- * documentation):
+ * The following characters can be specified (adopted from the MaskFormatter documentation):
  * 
  * <table border=1 summary="Valid characters and their descriptions">
  * <tr>
@@ -49,18 +48,17 @@
  * </tr>
  * <tr>
  * <td>'</td>
- * <td>Escape character, used to escape any of the special formatting
- * characters.</td>
+ * <td>Escape character, used to escape any of the special formatting characters.</td>
  * </tr>
  * <tr>
  * <td>U</td>
- * <td>Any character (<code>Character.isLetter</code>). All lowercase
- * letters are mapped to upper case.</td>
+ * <td>Any character (<code>Character.isLetter</code>). All lowercase letters are mapped to
+ * upper case.</td>
  * </tr>
  * <tr>
  * <td>L</td>
- * <td>Any character (<code>Character.isLetter</code>). All upper case
- * letters are mapped to lower case.</td>
+ * <td>Any character (<code>Character.isLetter</code>). All upper case letters are mapped to
+ * lower case.</td>
  * </tr>
  * <tr>
  * <td>A</td>
@@ -82,9 +80,8 @@
  * </table>
  * 
  * <p>
- * Typically characters correspond to one char, but in certain languages this is
- * not the case. The mask is on a per character basis, and will thus adjust to
- * fit as many chars as are needed.
+ * Typically characters correspond to one char, but in certain languages this is not the case. The
+ * mask is on a per character basis, and will thus adjust to fit as many chars as are needed.
  * </p>
  * 
  * @see MaskFormatter
@@ -151,11 +148,9 @@
 	}
 
 	/**
-	 * Converts a string to an object using
-	 * {@link MaskFormatter#stringToValue(String)}.
+	 * Converts a string to an object using {@link MaskFormatter#stringToValue(String)}.
 	 * 
-	 * @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
-	 *      Locale)
+	 * @see org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String, Locale)
 	 */
 	public Object convertToObject(String value, Locale locale)
 	{
@@ -170,11 +165,9 @@
 	}
 
 	/**
-	 * Converts the value to a string using
-	 * {@link MaskFormatter#valueToString(Object)}.
+	 * Converts the value to a string using {@link MaskFormatter#valueToString(Object)}.
 	 * 
-	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
-	 *      Locale)
+	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
 	 */
 	public String convertToString(Object value, Locale locale)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractConverter.java Mon Oct 15 14:21:25 2007
@@ -86,8 +86,7 @@
 	protected abstract Class getTargetType();
 
 	/**
-	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
-	 *      Locale)
+	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
 	 */
 	public String convertToString(Object value, Locale locale)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractDecimalConverter.java Mon Oct 15 14:21:25 2007
@@ -33,7 +33,10 @@
 	 */
 	private static final long serialVersionUID = 1L;
 	/** The date format to use */
-	private final Map/*<Locale, NumberFormat>*/ numberFormats = new HashMap/*<Locale, NumberFormat>*/();
+	private final Map/* <Locale, NumberFormat> */numberFormats = new HashMap/*
+																			 * <Locale,
+																			 * NumberFormat>
+																			 */();
 
 
 	/**

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java Mon Oct 15 14:21:25 2007
@@ -24,13 +24,13 @@
 
 /**
  * Base class for all number converters.
- *
+ * 
  * @author Jonathan Locke
  */
 public abstract class AbstractNumberConverter extends AbstractConverter
 {
 	/**
-	 *
+	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
@@ -43,7 +43,7 @@
 
 	/**
 	 * Parses a value as a String and returns a Number.
-	 *
+	 * 
 	 * @param value
 	 *            The object to parse (after converting with toString())
 	 * @param min
@@ -96,8 +96,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
-	 *      Locale)
+	 * @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object, Locale)
 	 */
 	public String convertToString(final Object value, Locale locale)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ByteConverter.java Mon Oct 15 14:21:25 2007
@@ -21,7 +21,6 @@
 import org.apache.wicket.util.convert.IConverter;
 
 
-
 /**
  * Converts from Object to Byte.
  * 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DoubleConverter.java Mon Oct 15 14:21:25 2007
@@ -37,7 +37,7 @@
 	public static final IConverter INSTANCE = new DoubleConverter();
 
 	/**
-	 * @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale) 
+	 * @see org.apache.wicket.util.convert.IConverter#convertToObject(String, java.util.Locale)
 	 */
 	public Object convertToObject(final String value, Locale locale)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/ZeroPaddingIntegerConverter.java Mon Oct 15 14:21:25 2007
@@ -35,8 +35,7 @@
 	 * Constructs this converter.
 	 * 
 	 * @param zeroPadLength
-	 *            Minimum length of String to be outputted (will be
-	 *            zero-padded).
+	 *            Minimum length of String to be outputted (will be zero-padded).
 	 */
 	public ZeroPaddingIntegerConverter(int zeroPadLength)
 	{

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java Mon Oct 15 14:21:25 2007
@@ -28,7 +28,7 @@
 
 /**
  * Abstract base class for JCE based ICrypt implementations.
- *
+ * 
  * @author Juergen Donnerstag
  */
 public abstract class AbstractCrypt implements ICrypt
@@ -54,7 +54,7 @@
 
 	/**
 	 * Decrypts a string into a string.
-	 *
+	 * 
 	 * @param text
 	 *            text to decrypt
 	 * @return the decrypted text
@@ -74,7 +74,7 @@
 
 	/**
 	 * Encrypt a string into a string using URL safe Base64 encoding.
-	 *
+	 * 
 	 * @param plainText
 	 *            text to encrypt
 	 * @return encrypted string
@@ -95,7 +95,7 @@
 
 	/**
 	 * Get encryption private key
-	 *
+	 * 
 	 * @return encryption private key
 	 */
 	public String getKey()
@@ -105,7 +105,7 @@
 
 	/**
 	 * Set encryption private key
-	 *
+	 * 
 	 * @param key
 	 *            private key to make de-/encryption unique
 	 */
@@ -116,7 +116,7 @@
 
 	/**
 	 * Crypts the given byte array
-	 *
+	 * 
 	 * @param input
 	 *            byte array to be crypted
 	 * @param mode
@@ -129,7 +129,7 @@
 
 	/**
 	 * Decrypts an encrypted, but Base64 decoded byte array into a byte array.
-	 *
+	 * 
 	 * @param encrypted
 	 *            byte array to decrypt
 	 * @return the decrypted text
@@ -142,13 +142,14 @@
 		}
 		catch (GeneralSecurityException e)
 		{
-			throw new WicketRuntimeException("Unable to decrypt the text '" + encrypted.toString() + "'", e);
+			throw new WicketRuntimeException("Unable to decrypt the text '" + encrypted.toString() +
+					"'", e);
 		}
 	}
 
 	/**
 	 * Encrypts the given text into a byte array.
-	 *
+	 * 
 	 * @param plainText
 	 *            text to encrypt
 	 * @return the string encrypted