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 [26/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/thread/Task.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java Mon Oct 15 14:21:25 2007
@@ -23,21 +23,18 @@
 
 
 /**
- * Runs a block of code periodically. A <code>Task</code> can be started at a
- * given time in the future and can be a daemon. The block of code will be
- * passed a <code>Log</code> object each time it is run through its
- * <code>ICode</code> interface.
+ * Runs a block of code periodically. A <code>Task</code> can be started at a given time in the
+ * future and can be a daemon. The block of code will be passed a <code>Log</code> object each
+ * time it is run through its <code>ICode</code> interface.
  * <p>
- * If the code block takes longer than the period to run, the next task
- * invocation will occur immediately. In this case, tasks will not occur at
- * precise multiples of the period. For example, if you run a task every 30
- * seconds, and the first run takes 40 seconds but the second takes 20 seconds,
- * your task will be invoked at 0 seconds, 40 seconds and 70 seconds (40 seconds +
- * 30 seconds), which is not an even multiple of 30 seconds.
+ * If the code block takes longer than the period to run, the next task invocation will occur
+ * immediately. In this case, tasks will not occur at precise multiples of the period. For example,
+ * if you run a task every 30 seconds, and the first run takes 40 seconds but the second takes 20
+ * seconds, your task will be invoked at 0 seconds, 40 seconds and 70 seconds (40 seconds + 30
+ * seconds), which is not an even multiple of 30 seconds.
  * <p>
- * In general, this is a simple task class designed for polling activities. If
- * you need precise guarantees, you probably should be using a different task
- * class.
+ * In general, this is a simple task class designed for polling activities. If you need precise
+ * guarantees, you probably should be using a different task class.
  * 
  * @author Jonathan Locke
  * @since 1.2.6
@@ -77,9 +74,9 @@
 	}
 
 	/**
-	 * Runs this <code>Task</code> at the given frequency. You may only call
-	 * this method if the task has not yet been started. If the task is already
-	 * running, an <code>IllegalStateException</code> will be thrown.
+	 * Runs this <code>Task</code> at the given frequency. You may only call this method if the
+	 * task has not yet been started. If the task is already running, an
+	 * <code>IllegalStateException</code> will be thrown.
 	 * 
 	 * @param frequency
 	 *            the frequency at which to run the code
@@ -147,13 +144,13 @@
 	}
 
 	/**
-	 * Sets daemon or not. For obvious reasons, this value can only be set before
-	 * the task starts running. If you attempt to set this value after the task
-	 * starts running, an <code>IllegalStateException</code> will be thrown.
+	 * Sets daemon or not. For obvious reasons, this value can only be set before the task starts
+	 * running. If you attempt to set this value after the task starts running, an
+	 * <code>IllegalStateException</code> will be thrown.
 	 * 
 	 * @param daemon
-	 *            <code>true</code> if this <code>Task</code>'s
-	 *            <code>Thread</code> should be a daemon
+	 *            <code>true</code> if this <code>Task</code>'s <code>Thread</code> should be
+	 *            a daemon
 	 * @throws IllegalStateException
 	 *             thrown if task is already running
 	 */

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java Mon Oct 15 14:21:25 2007
@@ -21,16 +21,16 @@
 import java.util.Date;
 
 /**
- * Abstract base class for subclasses that represent a point in time (as opposed
- * to a {@link Duration} of time).
- *
+ * Abstract base class for subclasses that represent a point in time (as opposed to a
+ * {@link Duration} of time).
+ * 
  * @author Jonathan Locke
  * @since 1.2.6
  */
 abstract class AbstractTime extends AbstractTimeValue
 {
 	/**
-	 *
+	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
@@ -50,9 +50,9 @@
 	}
 
 	/**
-	 * Returns <code>true</code> if this <code>Time</code> value is after
-	 * the given <code>Time</code> argument's value.
-	 *
+	 * Returns <code>true</code> if this <code>Time</code> value is after the given
+	 * <code>Time</code> argument's value.
+	 * 
 	 * @param that
 	 *            the <code>AbstractTimeValue</code> to compare with
 	 * @return <code>true</code> if this <code>Time</code> value is after
@@ -64,9 +64,9 @@
 	}
 
 	/**
-	 * Returns <code>true</code> if this <code>Time</code> value is before
-	 * the given <code>Time</code> argument's value.
-	 *
+	 * Returns <code>true</code> if this <code>Time</code> value is before the given
+	 * <code>Time</code> argument's value.
+	 * 
 	 * @param that
 	 *            the <code>AbstractTimeValue</code> to compare with
 	 * @return <code>true</code> if this <code>Time</code> value is before
@@ -78,9 +78,9 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> to a time <code>String</code> using
-	 * the formatter 'h.mma'.
-	 *
+	 * Converts this <code>Time</code> to a time <code>String</code> using the formatter
+	 * 'h.mma'.
+	 * 
 	 * @return the <code>Time</code> <code>String</code>
 	 */
 	public final String toTimeString()
@@ -89,9 +89,9 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> to a <code>Date String</code> using
-	 * the <code>Date</code> formatter 'h.mma'.
-	 *
+	 * Converts this <code>Time</code> to a <code>Date String</code> using the <code>Date</code>
+	 * formatter 'h.mma'.
+	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use in the conversion
 	 * @return the <code>Date</code> <code>String</code>
@@ -109,9 +109,9 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> to a <code>String</code> suitable for
-	 * use in a file system name.
-	 *
+	 * Converts this <code>Time</code> to a <code>String</code> suitable for use in a file
+	 * system name.
+	 * 
 	 * @return this <code>Time</code> as a formatted <code>String</code>
 	 */
 	public String toString()

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTimeValue.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTimeValue.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTimeValue.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTimeValue.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
 import org.apache.wicket.util.value.LongValue;
 
 /**
- * Package local class for representing immutable time values in milliseconds
- * and typical operations on such values.
+ * Package local class for representing immutable time values in milliseconds and typical operations
+ * on such values.
  * 
  * @author Jonathan Locke
  * @since 1.2.6

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java Mon Oct 15 14:21:25 2007
@@ -27,12 +27,11 @@
 
 
 /**
- * A <code>Duration</code> is an immutable length of time stored as a number
- * of milliseconds. Various factory and conversion methods are available for
- * convenience.
+ * A <code>Duration</code> is an immutable length of time stored as a number of milliseconds.
+ * Various factory and conversion methods are available for convenience.
  * <p>
- * These static factory methods allow easy construction of value objects using
- * either long values like <code>seconds(2034)</code> or <code>hours(3)</code>:
+ * These static factory methods allow easy construction of value objects using either long values
+ * like <code>seconds(2034)</code> or <code>hours(3)</code>:
  * <p>
  * <ul>
  * <li><code>Duration.milliseconds(long)</code>
@@ -52,15 +51,13 @@
  * <li><code>Duration.days(double)</code>
  * </ul>
  * <p>
- * In the case of <code>milliseconds(double)</code>, the value will be
- * rounded off to the nearest integral millisecond using
- * <code>Math.round()</code>.
- * <p>
- * The precise number of milliseconds represented by a <code>Duration</code>
- * object can be retrieved by calling the <code>getMilliseconds</code> method.
- * The value of a <code>Duration</code> object in a given unit like days or
- * hours can be retrieved by calling one of the following unit methods, each of
- * which returns a double-precision floating point number:
+ * In the case of <code>milliseconds(double)</code>, the value will be rounded off to the nearest
+ * integral millisecond using <code>Math.round()</code>.
+ * <p>
+ * The precise number of milliseconds represented by a <code>Duration</code> object can be
+ * retrieved by calling the <code>getMilliseconds</code> method. The value of a
+ * <code>Duration</code> object in a given unit like days or hours can be retrieved by calling one
+ * of the following unit methods, each of which returns a double-precision floating point number:
  * <p>
  * <ul>
  * <li><code>seconds()</code>
@@ -70,26 +67,23 @@
  * </ul>
  * <p>
  * Values can be added and subtracted using the <code>add(Duration)</code> and
- * <code>subtract(Duration)</code> methods, each of which returns a new
- * immutable <code>Duration</code> object.
+ * <code>subtract(Duration)</code> methods, each of which returns a new immutable
+ * <code>Duration</code> object.
+ * <p>
+ * <code>String</code> values can be converted to <code>Duration</code> objects using the static
+ * <code>valueOf</code> factory methods. The <code>String</code> format is the opposite of the
+ * one created by <code>toString()</code>, which converts a <code>Duration</code> object to a
+ * readable form, such as "3.2 hours" or "32.5 minutes". Valid units are: milliseconds, seconds,
+ * minutes hours and days. Correct English plural forms are used in creating <code>String</code>
+ * values and are parsed as well. The <code>Locale</code> is respected and "," will be used
+ * instead of "." in the Eurozone.
+ * <p>
+ * The benchmark method will "benchmark" a <code>Runnable</code> or an {@link ICode} implementing
+ * object, returning a <code>Duration</code> object that represents the amount of time elapsed in
+ * running the code.
  * <p>
- * <code>String</code> values can be converted to <code>Duration</code>
- * objects using the static <code>valueOf</code> factory methods. The
- * <code>String</code> format is the opposite of the one created by
- * <code>toString()</code>, which converts a <code>Duration</code> object
- * to a readable form, such as "3.2 hours" or "32.5 minutes". Valid units are:
- * milliseconds, seconds, minutes hours and days. Correct English plural forms
- * are used in creating <code>String</code> values and are parsed as well. The
- * <code>Locale</code> is respected and "," will be used instead of "." in the
- * Eurozone.
- * <p>
- * The benchmark method will "benchmark" a <code>Runnable</code> or an
- * {@link ICode} implementing object, returning a <code>Duration</code> object
- * that represents the amount of time elapsed in running the code.
- * <p>
- * Finally, the <code>sleep</code> method will sleep for the value of a
- * <code>Duration</code>.
- *
+ * Finally, the <code>sleep</code> method will sleep for the value of a <code>Duration</code>.
+ * 
  * @author Jonathan Locke
  * @since 1.2.6
  */
@@ -125,7 +119,7 @@
 
 	/**
 	 * Benchmark the given command.
-	 *
+	 * 
 	 * @param code
 	 *            an <code>ICode</code>
 	 * @param log
@@ -146,7 +140,7 @@
 
 	/**
 	 * Benchmark the given command.
-	 *
+	 * 
 	 * @param code
 	 *            a <code>Runnable</code>
 	 * @return the <code>Time</code> value it took to run the code
@@ -165,7 +159,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on days.
-	 *
+	 * 
 	 * @param days
 	 *            days <code>double</code> value
 	 * @return the <code>Duration</code> based on days
@@ -177,7 +171,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on days.
-	 *
+	 * 
 	 * @param days
 	 *            days <code>int</code> value
 	 * @return the <code>Duration</code> based on days
@@ -189,7 +183,7 @@
 
 	/**
 	 * Calculates the amount of time elapsed since start time.
-	 *
+	 * 
 	 * @param start
 	 *            the start <code>Time</code>
 	 * @return the elapsed period as a <code>Duration</code>
@@ -203,7 +197,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on hours.
-	 *
+	 * 
 	 * @param hours
 	 *            hours <code>double</code> value
 	 * @return the <code>Duration</code> based on hours
@@ -215,7 +209,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on hours.
-	 *
+	 * 
 	 * @param hours
 	 *            hours <code>int</code> value
 	 * @return the <code>Duration</code> based on hours
@@ -227,7 +221,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on milliseconds.
-	 *
+	 * 
 	 * @param milliseconds
 	 *            milliseconds <code>double</code> value
 	 * @return the <code>Duration</code> based on milliseconds
@@ -239,7 +233,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on milliseconds.
-	 *
+	 * 
 	 * @param milliseconds
 	 *            milliseconds <code>long</code> value
 	 * @return the <code>Duration</code> based on milliseconds
@@ -251,7 +245,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on minutes.
-	 *
+	 * 
 	 * @param minutes
 	 *            minutes <code>double</code> value
 	 * @return the <code>Duration</code> based on minutes
@@ -263,7 +257,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on minutes.
-	 *
+	 * 
 	 * @param minutes
 	 *            minutes <code>int</code> value
 	 * @return the <code>Duration</code> based on minutes
@@ -275,7 +269,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on seconds.
-	 *
+	 * 
 	 * @param seconds
 	 *            seconds <code>double</code> value
 	 * @return the <code>Duration</code> based on seconds
@@ -287,7 +281,7 @@
 
 	/**
 	 * Retrieves the <code>Duration</code> based on seconds.
-	 *
+	 * 
 	 * @param seconds
 	 *            seconds <code>int</code> value
 	 * @return the <code>Duration</code> based on seconds
@@ -299,7 +293,7 @@
 
 	/**
 	 * Retrieves the given <code>long</code> as a <code>Duration</code>.
-	 *
+	 * 
 	 * @param time
 	 *            the duration <code>long</code> value in milliseconds
 	 * @return the <code>Duration</code> value
@@ -310,15 +304,13 @@
 	}
 
 	/**
-	 * Converts the given <code>String</code> to a new <code>Duration</code>
-	 * object. The string can take the form of a floating point number followed
-	 * by a number of milliseconds, seconds, minutes, hours or days. For example
-	 * "6 hours" or "3.4 days". Parsing is case-insensitive.
-	 *
+	 * Converts the given <code>String</code> to a new <code>Duration</code> object. The string
+	 * can take the form of a floating point number followed by a number of milliseconds, seconds,
+	 * minutes, hours or days. For example "6 hours" or "3.4 days". Parsing is case-insensitive.
+	 * 
 	 * @param string
 	 *            a <code>String</code> to parse
-	 * @return the <code>Duration</code> value of the given
-	 *         <code>String</code>
+	 * @return the <code>Duration</code> value of the given <code>String</code>
 	 * @throws StringValueConversionException
 	 */
 	public static Duration valueOf(final String string) throws StringValueConversionException
@@ -327,17 +319,15 @@
 	}
 
 	/**
-	 * Converts the given <code>String</code> to a new <code>Duration</code>
-	 * object. The string can take the form of a floating point number followed
-	 * by a number of milliseconds, seconds, minutes, hours or days. For example
-	 * "6 hours" or "3.4 days". Parsing is case-insensitive.
-	 *
+	 * Converts the given <code>String</code> to a new <code>Duration</code> object. The string
+	 * can take the form of a floating point number followed by a number of milliseconds, seconds,
+	 * minutes, hours or days. For example "6 hours" or "3.4 days". Parsing is case-insensitive.
+	 * 
 	 * @param string
 	 *            a <code>String</code> to parse
 	 * @param locale
 	 *            the <code>Locale</code> used for parsing
-	 * @return the <code>Duration</code> value of the given
-	 *         <code>String</code>
+	 * @return the <code>Duration</code> value of the given <code>String</code>
 	 * @throws StringValueConversionException
 	 */
 	public static Duration valueOf(final String string, final Locale locale)
@@ -383,7 +373,7 @@
 
 	/**
 	 * Private constructor forces use of static factory methods.
-	 *
+	 * 
 	 * @param milliseconds
 	 *            number of milliseconds in this <code>Duration</code>
 	 */
@@ -394,7 +384,7 @@
 
 	/**
 	 * Adds a given <code>Duration</code> to this <code>Duration</code>.
-	 *
+	 * 
 	 * @param duration
 	 *            the <code>Duration</code> to add
 	 * @return the sum of the <code>Duration</code>s
@@ -406,7 +396,7 @@
 
 	/**
 	 * Retrieves the number of days of the current <code>Duration</code>.
-	 *
+	 * 
 	 * @return number of days of the current <code>Duration</code>
 	 */
 	public final double days()
@@ -416,7 +406,7 @@
 
 	/**
 	 * Retrieves the number of hours of the current <code>Duration</code>.
-	 *
+	 * 
 	 * @return number of hours of the current <code>Duration</code>
 	 */
 	public final double hours()
@@ -426,7 +416,7 @@
 
 	/**
 	 * Retrieves the number of minutes of the current <code>Duration</code>.
-	 *
+	 * 
 	 * @return number of minutes of the current <code>Duration</code>
 	 */
 	public final double minutes()
@@ -436,7 +426,7 @@
 
 	/**
 	 * Retrieves the number of seconds of the current <code>Duration</code>.
-	 *
+	 * 
 	 * @return number of seconds of the current <code>Duration</code>
 	 */
 	public final double seconds()
@@ -464,7 +454,7 @@
 
 	/**
 	 * Subtracts a given <code>Duration</code> from this <code>Duration</code>.
-	 *
+	 * 
 	 * @param that
 	 *            the <code>Duration</code> to subtract
 	 * @return this <code>Duration</code> minus that <code>Duration</code>
@@ -475,10 +465,9 @@
 	}
 
 	/**
-	 * Retrieves the <code>String</code> representation of this
-	 * <code>Duration</code> in days, hours, minutes, seconds or milliseconds,
-	 * as appropriate. Uses the default <code>Locale</code>.
-	 *
+	 * Retrieves the <code>String</code> representation of this <code>Duration</code> in days,
+	 * hours, minutes, seconds or milliseconds, as appropriate. Uses the default <code>Locale</code>.
+	 * 
 	 * @return a <code>String</code> representation
 	 */
 	public String toString()
@@ -487,10 +476,9 @@
 	}
 
 	/**
-	 * Retrieves the <code>String</code> representation of this
-	 * <code>Duration</code> in days, hours, minutes, seconds or milliseconds,
-	 * as appropriate.
-	 *
+	 * Retrieves the <code>String</code> representation of this <code>Duration</code> in days,
+	 * hours, minutes, seconds or milliseconds, as appropriate.
+	 * 
 	 * @param locale
 	 *            a <code>Locale</code>
 	 * @return a <code>String</code> representation
@@ -528,9 +516,8 @@
 	}
 
 	/**
-	 * Converts a value to a unit-suffixed value, taking care of English
-	 * singular/plural suffix.
-	 *
+	 * Converts a value to a unit-suffixed value, taking care of English singular/plural suffix.
+	 * 
 	 * @param value
 	 *            a <code>double</code> value to format
 	 * @param units

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/ITimeFrameSource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/ITimeFrameSource.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/ITimeFrameSource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/ITimeFrameSource.java Mon Oct 15 14:21:25 2007
@@ -17,9 +17,8 @@
 package org.apache.wicket.util.time;
 
 /**
- * An <code>ITimeFrameSource</code> produces <code>TimeFrame</code> values.
- * The value returned by an <code>ITimeFrameSource</code> source may vary over
- * time.
+ * An <code>ITimeFrameSource</code> produces <code>TimeFrame</code> values. The value returned
+ * by an <code>ITimeFrameSource</code> source may vary over time.
  * 
  * @see TimeFrame
  * 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Time.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Time.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Time.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Time.java Mon Oct 15 14:21:25 2007
@@ -22,12 +22,12 @@
 import java.util.Date;
 
 /**
- * An immutable <code>Time</code> class that represents a specific point in time. The
- * underlying representation is a <code>long</code> value which holds a number of
- * milliseconds since January 1, 1970, 0:00 GMT. To represent a duration of time,
- * such as "6 seconds", use the <code>Duration</code> class. To represent a time period with
- * a start and end time, use the <code>TimeFrame</code> class. To represent a time of day,
- * use the <code>TimeOfDay</code> class.
+ * An immutable <code>Time</code> class that represents a specific point in time. The underlying
+ * representation is a <code>long</code> value which holds a number of milliseconds since January
+ * 1, 1970, 0:00 GMT. To represent a duration of time, such as "6 seconds", use the
+ * <code>Duration</code> class. To represent a time period with a start and end time, use the
+ * <code>TimeFrame</code> class. To represent a time of day, use the <code>TimeOfDay</code>
+ * class.
  * 
  * @author Jonathan Locke
  * @since 1.2.6
@@ -71,8 +71,7 @@
 	 * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd' format.
 	 * 
 	 * @param calendar
-	 *            the <code>Calendar</code> to use when parsing date
-	 *            <code>String</code>
+	 *            the <code>Calendar</code> to use when parsing date <code>String</code>
 	 * @param string
 	 *            the <code>String</code> to parse
 	 * @return the time
@@ -93,8 +92,8 @@
 	}
 
 	/**
-	 * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd' format
-	 * using a local time <code>Calendar</code>.
+	 * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd' format using a local time
+	 * <code>Calendar</code>.
 	 * 
 	 * @param string
 	 *            the <code>String</code> to parse
@@ -107,12 +106,10 @@
 	}
 
 	/**
-	 * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma'
-	 * format.
+	 * Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma' format.
 	 * 
 	 * @param calendar
-	 *            the <code>Calendar</code> to use when parsing the
-	 *            <code>String</code>
+	 *            the <code>Calendar</code> to use when parsing the <code>String</code>
 	 * @param string
 	 *            the <code>String</code> to parse
 	 * @return an immutable UNIX <code>Time</code> value
@@ -132,8 +129,8 @@
 	}
 
 	/**
-	 * Retrieves a <code>Time</code> instance based on the given
-	 * <code>Calendar</code> and {@link TimeOfDay} objects.
+	 * Retrieves a <code>Time</code> instance based on the given <code>Calendar</code> and
+	 * {@link TimeOfDay} objects.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use
@@ -157,8 +154,7 @@
 	}
 
 	/**
-	 * Retrieves a <code>Time</code> instance based on the given
-	 * <code>Date</code> object.
+	 * Retrieves a <code>Time</code> instance based on the given <code>Date</code> object.
 	 * 
 	 * @param date
 	 *            a <code>java.util.Date</code> object
@@ -173,8 +169,7 @@
 	 * Retrieves a <code>Time</code> instance based on the given milliseconds.
 	 * 
 	 * @param time
-	 *            the <code>Time</code> value in milliseconds since
-	 *            START_OF_UNIX_TIME
+	 *            the <code>Time</code> value in milliseconds since START_OF_UNIX_TIME
 	 * @return a corresponding immutable <code>Time</code> object
 	 */
 	public static Time valueOf(final long time)
@@ -202,8 +197,8 @@
 	 *            input
 	 * @param pattern
 	 *            the pattern to parse
-	 * @return a <code>Time</code> instance that resulted from parsing the
-	 *         given <code>String</code>
+	 * @return a <code>Time</code> instance that resulted from parsing the given
+	 *         <code>String</code>
 	 * @throws ParseException
 	 */
 	public static Time valueOf(final String string, final String pattern) throws ParseException
@@ -214,8 +209,7 @@
 	}
 
 	/**
-	 * Retrieves a <code>Time</code> instance based on the given
-	 * {@link TimeOfDay} object.
+	 * Retrieves a <code>Time</code> instance based on the given {@link TimeOfDay} object.
 	 * 
 	 * @param timeOfDay
 	 *            the time of day in local time
@@ -230,8 +224,7 @@
 	 * Private constructor forces use of static factory methods.
 	 * 
 	 * @param time
-	 *            the <code>Time</code> value in milliseconds since
-	 *            START_OF_UNIX_TIME
+	 *            the <code>Time</code> value in milliseconds since START_OF_UNIX_TIME
 	 */
 	private Time(final long time)
 	{
@@ -239,8 +232,8 @@
 	}
 
 	/**
-	 * Adds the given <code>Duration</code> to this <code>Time</code>
-	 * object, moving the time into the future.
+	 * Adds the given <code>Duration</code> to this <code>Time</code> object, moving the time
+	 * into the future.
 	 * 
 	 * @param duration
 	 *            the <code>Duration</code> to add
@@ -252,11 +245,9 @@
 	}
 
 	/**
-	 * Calculates the amount of time that has elapsed since this
-	 * <code>Time</code> value.
+	 * Calculates the amount of time that has elapsed since this <code>Time</code> value.
 	 * 
-	 * @return the amount of time that has elapsed since this <code>Time</code>
-	 *         value
+	 * @return the amount of time that has elapsed since this <code>Time</code> value
 	 * @throws IllegalStateException
 	 *             thrown if this <code>Time</code> value is in the future
 	 */
@@ -271,13 +262,11 @@
 	}
 
 	/**
-	 * Retrieves the <code>Duration</code> from now to this <code>Time</code>
-	 * value. If this <code>Time</code> value is in the past, then the
-	 * <code>Duration</code> returned will be negative. Otherwise, it will be
-	 * the number of milliseconds from now to this <code>Time</code>.
+	 * Retrieves the <code>Duration</code> from now to this <code>Time</code> value. If this
+	 * <code>Time</code> value is in the past, then the <code>Duration</code> returned will be
+	 * negative. Otherwise, it will be the number of milliseconds from now to this <code>Time</code>.
 	 * 
-	 * @return the <code>Duration</code> from now to this <code>Time</code>
-	 *         value
+	 * @return the <code>Duration</code> from now to this <code>Time</code> value
 	 */
 	public Duration fromNow()
 	{
@@ -291,8 +280,7 @@
 	 *            the <code>Calendar</code> to use
 	 * @param field
 	 *            the <code>Calendar</code> field to get
-	 * @return the field's value for this point in time on the given
-	 *         <code>Calendar</code>
+	 * @return the field's value for this point in time on the given <code>Calendar</code>
 	 */
 	public int get(final Calendar calendar, final int field)
 	{
@@ -449,8 +437,8 @@
 	}
 
 	/**
-	 * Adds the given <code>Duration</code> to this <code>Time</code>
-	 * object, moving the time into the future.
+	 * Adds the given <code>Duration</code> to this <code>Time</code> object, moving the time
+	 * into the future.
 	 * 
 	 * @param duration
 	 *            the <code>Duration</code> to add
@@ -462,8 +450,7 @@
 	}
 
 	/**
-	 * Subtract time from this and returns the difference as a
-	 * <code>Duration</code> object.
+	 * Subtract time from this and returns the difference as a <code>Duration</code> object.
 	 * 
 	 * @param that
 	 *            the time to subtract
@@ -475,12 +462,12 @@
 	}
 
 	/**
-	 * Retrieves a <code>Date</code> object for this <code>Time</code>
-	 * object. A new <code>Date</code> object is always returned rather than
-	 * attempting to cache a date since <code>Date</code> is mutable.
+	 * Retrieves a <code>Date</code> object for this <code>Time</code> object. A new
+	 * <code>Date</code> object is always returned rather than attempting to cache a date since
+	 * <code>Date</code> is mutable.
 	 * 
-	 * @return this immutable <code>Time</code> object as a mutable
-	 *         <code>java.util.Date</code> object
+	 * @return this immutable <code>Time</code> object as a mutable <code>java.util.Date</code>
+	 *         object
 	 */
 	public Date toDate()
 	{
@@ -488,8 +475,8 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> value to a date <code>String</code>
-	 * using the date formatter 'yyyy.MM.dd'.
+	 * Converts this <code>Time</code> value to a date <code>String</code> using the date
+	 * formatter 'yyyy.MM.dd'.
 	 * 
 	 * @return the date string
 	 */
@@ -499,8 +486,8 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> value to a date <code>String</code>
-	 * using the formatter 'yyyy.MM.dd'.
+	 * Converts this <code>Time</code> value to a date <code>String</code> using the formatter
+	 * 'yyyy.MM.dd'.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use in the conversion
@@ -520,8 +507,8 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> value to a <code>String</code>
-	 * suitable for use in a file system name.
+	 * Converts this <code>Time</code> value to a <code>String</code> suitable for use in a file
+	 * system name.
 	 * 
 	 * @return this <code>Time</code> value as a formatted <code>String</code>
 	 */
@@ -531,8 +518,8 @@
 	}
 
 	/**
-	 * Converts this <code>Time</code> object to a <code>String</code> using
-	 * the given <code>Calendar</code> and format.
+	 * Converts this <code>Time</code> object to a <code>String</code> using the given
+	 * <code>Calendar</code> and format.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use in the conversion

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeFrame.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeFrame.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeFrame.java Mon Oct 15 14:21:25 2007
@@ -17,32 +17,26 @@
 package org.apache.wicket.util.time;
 
 /**
- * Immutable class which represents an interval of time with a beginning and an
- * end. The beginning value is inclusive and the end value is exclusive. In
- * other words, the time frame of 1pm to 2pm includes 1pm, but not 2pm. 1:59:59
- * is the last value in the <code>TimeFrame</code>.
+ * Immutable class which represents an interval of time with a beginning and an end. The beginning
+ * value is inclusive and the end value is exclusive. In other words, the time frame of 1pm to 2pm
+ * includes 1pm, but not 2pm. 1:59:59 is the last value in the <code>TimeFrame</code>.
  * <p>
- * <code>TimeFrame</code>s can be constructed by calling the
- * <code>valueOf</code> static factory methods
- * <code>valueOf(Time, Time)</code> (yielding a <code>TimeFrame</code>
- * between two absolute times) and <code>valueOf(Time, Duration)</code>
- * yielding a <code>TimeFrame</code> starting at an absolute time and having a
- * given length.
+ * <code>TimeFrame</code>s can be constructed by calling the <code>valueOf</code> static
+ * factory methods <code>valueOf(Time, Time)</code> (yielding a <code>TimeFrame</code> between
+ * two absolute times) and <code>valueOf(Time, Duration)</code> yielding a <code>TimeFrame</code>
+ * starting at an absolute time and having a given length.
  * <p>
- * The start and end of a <code>TimeFrame</code> can be retrieved by calling
- * <code>getStart</code> and <code>getEnd</code>. Its duration can be
- * retrieved by calling <code>getDuration</code>.
+ * The start and end of a <code>TimeFrame</code> can be retrieved by calling <code>getStart</code>
+ * and <code>getEnd</code>. Its duration can be retrieved by calling <code>getDuration</code>.
  * <p>
- * The <code>contains(Time)</code> method can be called to determine if a
- * <code>TimeFrame</code> contains a given point in time. The
- * <code>overlaps(TimeFrame)</code> method can be called to determine if two
- * <code>TimeFrames</code> overlap.
+ * The <code>contains(Time)</code> method can be called to determine if a <code>TimeFrame</code>
+ * contains a given point in time. The <code>overlaps(TimeFrame)</code> method can be called to
+ * determine if two <code>TimeFrames</code> overlap.
  * <p>
- * The <code>eachDay(TimeOfDay, TimeOfDay)</code> will return a
- * <code>TimeFrameSource</code> which generates a <code>TimeFrame</code>
- * using the two times of day. In other words, if the start is 3pm and the end
- * is 4pm, the <code>TimeFrameSource</code> returned will yield 3-4pm on the
- * day it is called (each day).
+ * The <code>eachDay(TimeOfDay, TimeOfDay)</code> will return a <code>TimeFrameSource</code>
+ * which generates a <code>TimeFrame</code> using the two times of day. In other words, if the
+ * start is 3pm and the end is 4pm, the <code>TimeFrameSource</code> returned will yield 3-4pm on
+ * the day it is called (each day).
  * 
  * @author Jonathan Locke
  * @since 1.2.6
@@ -51,23 +45,20 @@
 {
 	/** end of this <code>TimeFrame</code> */
 	private final Time end;
-	
+
 	/** beginning of this <code>TimeFrame</code> */
 	private final Time start;
 
 	/**
-	 * Creates an <code>ITimeFrameSource</code> source for start and end
-	 * <code>TimeOfDay</code>s. For example, called with 3pm and 5pm as
-	 * parameters, the <code>TimeFrame</code> source returned would produce
-	 * <code>TimeFrame</code> objects representing 3pm-5pm on whatever day it
-	 * is when the caller calls the <code>TimeFrameSource</code> interface.
+	 * Creates an <code>ITimeFrameSource</code> source for start and end <code>TimeOfDay</code>s.
+	 * For example, called with 3pm and 5pm as parameters, the <code>TimeFrame</code> source
+	 * returned would produce <code>TimeFrame</code> objects representing 3pm-5pm on whatever day
+	 * it is when the caller calls the <code>TimeFrameSource</code> interface.
 	 * 
 	 * @param startTimeOfDay
-	 *            the start <code>TimeOfDay</code> for this
-	 *            <code>TimeFrame</code> each day
+	 *            the start <code>TimeOfDay</code> for this <code>TimeFrame</code> each day
 	 * @param endTimeOfDay
-	 *            the end <code>TimeOfDay</code> for this
-	 *            <code>TimeFrame</code> each day
+	 *            the end <code>TimeOfDay</code> for this <code>TimeFrame</code> each day
 	 * @return a <code>TimeFrameSource</code> which will return the specified
 	 *         <code>TimeFrame</code> each day
 	 */
@@ -86,8 +77,7 @@
 	}
 
 	/**
-	 * Creates a <code>TimeFrame</code> for a start <code>Time</code> and
-	 * <code>Duration</code>.
+	 * Creates a <code>TimeFrame</code> for a start <code>Time</code> and <code>Duration</code>.
 	 * 
 	 * @param start
 	 *            the start <code>Time</code>
@@ -95,8 +85,7 @@
 	 *            the <code>Duration</code>
 	 * @return the <code>TimeFrame</code>
 	 * @throws IllegalArgumentException
-	 *             thrown if start <code>Time</code> value is before end
-	 *             <code>Time</code> value
+	 *             thrown if start <code>Time</code> value is before end <code>Time</code> value
 	 */
 	public static TimeFrame valueOf(final Time start, final Duration duration)
 	{
@@ -104,8 +93,7 @@
 	}
 
 	/**
-	 * Creates a <code>TimeFrame</code> for given start and end
-	 * <code>Time</code>s.
+	 * Creates a <code>TimeFrame</code> for given start and end <code>Time</code>s.
 	 * 
 	 * @param start
 	 *            the start <code>Time</code>
@@ -113,8 +101,7 @@
 	 *            the end <code>Time</code>
 	 * @return the <code>TimeFrame</code>
 	 * @throws IllegalArgumentException
-	 *             thrown if start <code>Time</code> value is before end
-	 *             <code>Time</code> value
+	 *             thrown if start <code>Time</code> value is before end <code>Time</code> value
 	 */
 	public static TimeFrame valueOf(final Time start, final Time end)
 	{
@@ -122,8 +109,8 @@
 	}
 
 	/**
-	 * Checks consistency of start and end <code>AbstractTimeValue</code>
-	 * values, ensuring that the end value is less than the start value.
+	 * Checks consistency of start and end <code>AbstractTimeValue</code> values, ensuring that
+	 * the end value is less than the start value.
 	 * 
 	 * @param start
 	 *            start <code>AbstractTimeValue</code> value
@@ -137,8 +124,8 @@
 		// Throw illegal argument exception if end is less than start
 		if (end.lessThan(start))
 		{
-			throw new IllegalArgumentException("Start time of time frame " + start
-					+ " was after end time " + end);
+			throw new IllegalArgumentException("Start time of time frame " + start +
+					" was after end time " + end);
 		}
 	}
 
@@ -150,8 +137,7 @@
 	 * @param end
 	 *            the end <code>Time</code>
 	 * @throws IllegalArgumentException
-	 *             thrown if start <code>Time</code> value is before end
-	 *             <code>Time</code> value
+	 *             thrown if start <code>Time</code> value is before end <code>Time</code> value
 	 */
 	private TimeFrame(final Time start, final Time end)
 	{
@@ -161,13 +147,11 @@
 	}
 
 	/**
-	 * Determines if this <code>TimeFrame</code> contains a given point in
-	 * time.
+	 * Determines if this <code>TimeFrame</code> contains a given point in time.
 	 * 
 	 * @param time
 	 *            the <code>Time</code> to check
-	 * @return <code>true</code> if this <code>TimeFrame</code> contains the
-	 *         given time
+	 * @return <code>true</code> if this <code>TimeFrame</code> contains the given time
 	 */
 	public boolean contains(final Time time)
 	{
@@ -205,8 +189,8 @@
 	}
 
 	/**
-	 * Implementation of <code>ITimeFrameSource</code> that simply returns
-	 * this <code>TimeFrame</code>.
+	 * Implementation of <code>ITimeFrameSource</code> that simply returns this
+	 * <code>TimeFrame</code>.
 	 * 
 	 * @return this <code>TimeFrame</code>
 	 */
@@ -220,13 +204,12 @@
 	 * 
 	 * @param timeframe
 	 *            the <code>TimeFrame</code> to test
-	 * @return <code>true</code> if the given <code>TimeFrame</code>
-	 *         overlaps this one
+	 * @return <code>true</code> if the given <code>TimeFrame</code> overlaps this one
 	 */
 	public boolean overlaps(final TimeFrame timeframe)
 	{
-		return contains(timeframe.start) || contains(timeframe.end) || timeframe.contains(start)
-				|| timeframe.contains(end);
+		return contains(timeframe.start) || contains(timeframe.end) || timeframe.contains(start) ||
+				timeframe.contains(end);
 	}
 
 	/**

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeMap.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeMap.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeMap.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,15 @@
 import java.util.Map;
 
 /**
- * This class maps <code>ITimeFrame</code>s to <code>Object</code>s. Since
- * values are stored using <code>ITimeFrameSource</code> implementing objects,
- * the value returned by the source may vary over time. For example, one
- * implementation of <code>ITimeFrameSource</code> might return the start and
- * end time of lunch on any given day.
+ * This class maps <code>ITimeFrame</code>s to <code>Object</code>s. Since values are stored
+ * using <code>ITimeFrameSource</code> implementing objects, the value returned by the source may
+ * vary over time. For example, one implementation of <code>ITimeFrameSource</code> might return
+ * the start and end time of lunch on any given day.
  * <p>
- * To associate an object with a dynamic <code>TimeFrame</code> (via
- * <code>ITimeFrameSource</code>), call
- * <code>put(ITimeFrameSource, Object)</code>. You can later retrieve the
- * first object for a point in time with <code>get(Time)</code>. The
- * <code>get</code> method is provided for convenience and is equivalent to
- * <code>get(Time.now())</code>.
+ * To associate an object with a dynamic <code>TimeFrame</code> (via <code>ITimeFrameSource</code>),
+ * call <code>put(ITimeFrameSource, Object)</code>. You can later retrieve the first object for a
+ * point in time with <code>get(Time)</code>. The <code>get</code> method is provided for
+ * convenience and is equivalent to <code>get(Time.now())</code>.
  * <p>
  * This class is not thread-safe.
  * 
@@ -42,14 +39,13 @@
 public final class TimeMap
 {
 	/**
-	 * <code>Map</code> from <code>ITimeFrameSource</code> implementing
-	 * objects to <code>Object</code> values.
+	 * <code>Map</code> from <code>ITimeFrameSource</code> implementing objects to
+	 * <code>Object</code> values.
 	 */
 	private final Map sources = new HashMap();
 
 	/**
-	 * Retrieves an <code>Object</code> for the current <code>Time</code>
-	 * value.
+	 * Retrieves an <code>Object</code> for the current <code>Time</code> value.
 	 * 
 	 * @return <code>Object</code> for the current <code>Time</code> value
 	 */
@@ -59,13 +55,12 @@
 	}
 
 	/**
-	 * Retrieves an <code>Object</code> for the given <code>Time</code>
-	 * value.
+	 * Retrieves an <code>Object</code> for the given <code>Time</code> value.
 	 * 
 	 * @param time
 	 *            the <code>Time</code> value
-	 * @return gets an <code>Object</code> for the given <code>Time</code>
-	 *         value or <code>null</code> if none exists
+	 * @return gets an <code>Object</code> for the given <code>Time</code> value or
+	 *         <code>null</code> if none exists
 	 */
 	public Object get(final Time time)
 	{
@@ -85,8 +80,8 @@
 	 * Associates an <code>Object</code> with a dynamic <code>TimeFrame</code>.
 	 * 
 	 * @param source
-	 *            a source that can produce a <code>TimeFrame</code> with
-	 *            which to compare a <code>Time</code> value
+	 *            a source that can produce a <code>TimeFrame</code> with which to compare a
+	 *            <code>Time</code> value
 	 * @param o
 	 *            the <code>Object</code> to be returned for the given dynamic
 	 *            <code>TimeFrame</code>
@@ -101,8 +96,8 @@
 
 			if (timeframe.overlaps(current))
 			{
-				throw new IllegalArgumentException("Timeframe " + timeframe
-						+ " overlaps timeframe " + current);
+				throw new IllegalArgumentException("Timeframe " + timeframe +
+						" overlaps timeframe " + current);
 			}
 		}
 

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeOfDay.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeOfDay.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeOfDay.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/TimeOfDay.java Mon Oct 15 14:21:25 2007
@@ -23,44 +23,35 @@
 
 
 /**
- * An immutable time of day value represented as milliseconds since the most
- * recent midnight.
+ * An immutable time of day value represented as milliseconds since the most recent midnight.
  * <p>
  * Values can be constructed using various factory methods:
  * <ul>
- * <li><code>valueOf(long)</code> where <code>long</code> is milliseconds
- * since midnight
- * <li><code>valueOf(String)</code> where the <code>String</code> is in
- * 'h.mma' format
- * <li><code>valueOf(Calendar, String)</code> where the <code>String</code>
- * is in 'h.mma' format
- * <li><code>valueOf(Duration)</code> where <code>Duration</code> is time
- * since midnight
- * <li><code>valueOf(Time)</code> where <code>Time</code> is some point in
- * time today
- * <li><code>valueOf(Calendar, Time)</code> where <code>Time</code> is some
- * point in time today
- * <li><code>militaryTime(int hour, int minute, int second)</code> for
- * 24-hour time
- * <li><code>time(int hour, int minute, Meridian)</code> where
- * <code>Meridian</code> is AM or PM
- * <li><code>time(int hour, int minute, int second, Meridian)</code> where
- * <code>Meridian</code> is AM or PM
+ * <li><code>valueOf(long)</code> where <code>long</code> is milliseconds since midnight
+ * <li><code>valueOf(String)</code> where the <code>String</code> is in 'h.mma' format
+ * <li><code>valueOf(Calendar, String)</code> where the <code>String</code> is in 'h.mma'
+ * format
+ * <li><code>valueOf(Duration)</code> where <code>Duration</code> is time since midnight
+ * <li><code>valueOf(Time)</code> where <code>Time</code> is some point in time today
+ * <li><code>valueOf(Calendar, Time)</code> where <code>Time</code> is some point in time today
+ * <li><code>militaryTime(int hour, int minute, int second)</code> for 24-hour time
+ * <li><code>time(int hour, int minute, Meridian)</code> where <code>Meridian</code> is AM or
+ * PM
+ * <li><code>time(int hour, int minute, int second, Meridian)</code> where <code>Meridian</code>
+ * is AM or PM
  * <li><code>now()</code> to construct the current time of day
- * <li><code>now(Calendar)</code> to construct the current time of day using
- * a given <code>Calendar</code>
+ * <li><code>now(Calendar)</code> to construct the current time of day using a given
+ * <code>Calendar</code>
  * </ul>
  * <p>
- * If an attempt is made to construct an illegal time of day value (one that is
- * greater than 24 hours worth of milliseconds), an
- * <code>IllegalArgumentException</code> will be thrown.
+ * If an attempt is made to construct an illegal time of day value (one that is greater than 24
+ * hours worth of milliseconds), an <code>IllegalArgumentException</code> will be thrown.
  * <p>
- * Military hours, minutes and seconds of the time of day can be retrieved by
- * calling the <code>hour</code>, <code>minute</code>, and
- * <code>second</code> methods.
+ * Military hours, minutes and seconds of the time of day can be retrieved by calling the
+ * <code>hour</code>, <code>minute</code>, and <code>second</code> methods.
  * <p>
- * The next occurrence of a given <code>TimeOfDay</code> can 
- * be retrieved by calling <code>next()</code> or <code>next(Calendar)</code>.
+ * The next occurrence of a given <code>TimeOfDay</code> can be retrieved by calling
+ * <code>next()</code> or <code>next(Calendar)</code>.
  * 
  * @author Jonathan Locke
  * @since 1.2.6
@@ -80,7 +71,7 @@
 
 	/** Constant for noon. */
 	public static final TimeOfDay NOON = time(12, 0, PM);
-	
+
 	/** Typesafe AM/PM enumeration. */
 	public static final class Meridian extends EnumeratedType
 	{
@@ -141,8 +132,7 @@
 	}
 
 	/**
-	 * Retrieves the <code>TimeOfDay</code> representing 'now' on the given
-	 * <code>Calendar</code>.
+	 * Retrieves the <code>TimeOfDay</code> representing 'now' on the given <code>Calendar</code>.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use
@@ -210,12 +200,11 @@
 	}
 
 	/**
-	 * Converts a time <code>String</code> and <code>Calendar</code> to a
-	 * <code>TimeOfDay</code> instance.
+	 * Converts a time <code>String</code> and <code>Calendar</code> to a <code>TimeOfDay</code>
+	 * instance.
 	 * 
 	 * @param calendar
-	 *            the <code>Calendar</code> to use when parsing time
-	 *            <code>String</code>
+	 *            the <code>Calendar</code> to use when parsing time <code>String</code>
 	 * @param time
 	 *            a <code>String</code> in 'h.mma' format
 	 * @return the <code>TimeOfDay</code> on the given <code>Calendar</code>
@@ -251,8 +240,7 @@
 	}
 
 	/**
-	 * Converts a <code>Duration</code> instance to a <code>TimeOfDay</code>
-	 * instance.
+	 * Converts a <code>Duration</code> instance to a <code>TimeOfDay</code> instance.
 	 * 
 	 * @param duration
 	 *            the <code>Duration</code> to use
@@ -264,12 +252,11 @@
 	}
 
 	/**
-	 * Converts a <code>long</code> value to a <code>TimeOfDay</code>
-	 * instance.
+	 * Converts a <code>long</code> value to a <code>TimeOfDay</code> instance.
 	 * 
 	 * @param time
 	 *            the time in milliseconds today
-	 * @return the <code>TimeOfDay</code> 
+	 * @return the <code>TimeOfDay</code>
 	 */
 	public static TimeOfDay valueOf(final long time)
 	{
@@ -277,8 +264,7 @@
 	}
 
 	/**
-	 * Converts a <code>String</code> value to a <code>TimeOfDay</code>
-	 * instance.
+	 * Converts a <code>String</code> value to a <code>TimeOfDay</code> instance.
 	 * 
 	 * @param time
 	 *            a <code>String</code> in 'h.mma' format
@@ -291,8 +277,7 @@
 	}
 
 	/**
-	 * Converts a <code>String</code> value to a <code>TimeOfDay</code>
-	 * instance.
+	 * Converts a <code>String</code> value to a <code>TimeOfDay</code> instance.
 	 * 
 	 * @param time
 	 *            a <code>Time</code> to convert to <code>TimeOfDay</code>
@@ -323,7 +308,7 @@
 	/**
 	 * Retrieves the hour of the day.
 	 * 
-	 * @return the hour (0-23) of this <code>TimeOfDay</code> 
+	 * @return the hour (0-23) of this <code>TimeOfDay</code>
 	 */
 	public int hour()
 	{
@@ -341,11 +326,9 @@
 	}
 
 	/**
-	 * Retrieves the next occurrence of this <code>TimeOfDay</code> in local
-	 * time.
+	 * Retrieves the next occurrence of this <code>TimeOfDay</code> in local time.
 	 * 
-	 * @return the next occurrence of this <code>TimeOfDay</code> in local
-	 *         time
+	 * @return the next occurrence of this <code>TimeOfDay</code> in local time
 	 */
 	public Time next()
 	{
@@ -353,8 +336,8 @@
 	}
 
 	/**
-	 * Retrieves the next occurrence of this <code>TimeOfDay</code> on the
-	 * given <code>Calendar</code>.
+	 * Retrieves the next occurrence of this <code>TimeOfDay</code> on the given
+	 * <code>Calendar</code>.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to use

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java Mon Oct 15 14:21:25 2007
@@ -35,15 +35,14 @@
 
 /**
  * <p>
- * The default implementation of the
- * {@link org.apache.wicket.util.upload.FileItem FileItem} interface.
+ * The default implementation of the {@link org.apache.wicket.util.upload.FileItem FileItem}
+ * interface.
  * 
  * <p>
- * After retrieving an instance of this class, you may either request all
- * contents of file at once using {@link #get()} or request an
- * {@link java.io.InputStream InputStream} with {@link #getInputStream()} and
- * process the file without attempting to load it into memory, which may come
- * handy with large files.
+ * After retrieving an instance of this class, you may either request all contents of file at once
+ * using {@link #get()} or request an {@link java.io.InputStream InputStream} with
+ * {@link #getInputStream()} and process the file without attempting to load it into memory, which
+ * may come handy with large files.
  * 
  * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
  * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
@@ -61,9 +60,9 @@
 
 
 	/**
-	 * Default content charset to be used when no explicit charset parameter is
-	 * provided by the sender. Media subtypes of the "text" type are defined to
-	 * have a default charset value of "ISO-8859-1" when received via HTTP.
+	 * Default content charset to be used when no explicit charset parameter is provided by the
+	 * sender. Media subtypes of the "text" type are defined to have a default charset value of
+	 * "ISO-8859-1" when received via HTTP.
 	 */
 	public static final String DEFAULT_CHARSET = "ISO-8859-1";
 
@@ -90,8 +89,7 @@
 
 
 	/**
-	 * The content type passed by the browser, or <code>null</code> if not
-	 * defined.
+	 * The content type passed by the browser, or <code>null</code> if not defined.
 	 */
 	private final String contentType;
 
@@ -141,20 +139,18 @@
 	 * @param fieldName
 	 *            The name of the form field.
 	 * @param contentType
-	 *            The content type passed by the browser or <code>null</code>
-	 *            if not specified.
+	 *            The content type passed by the browser or <code>null</code> if not specified.
 	 * @param isFormField
-	 *            Whether or not this item is a plain form field, as opposed to
-	 *            a file upload.
+	 *            Whether or not this item is a plain form field, as opposed to a file upload.
 	 * @param fileName
-	 *            The original filename in the user's filesystem, or
-	 *            <code>null</code> if not specified.
+	 *            The original filename in the user's filesystem, or <code>null</code> if not
+	 *            specified.
 	 * @param sizeThreshold
-	 *            The threshold, in bytes, below which items will be retained in
-	 *            memory and above which they will be stored as a file.
+	 *            The threshold, in bytes, below which items will be retained in memory and above
+	 *            which they will be stored as a file.
 	 * @param repository
-	 *            The data repository, which is the directory in which files
-	 *            will be created, should the item size exceed the threshold.
+	 *            The data repository, which is the directory in which files will be created, should
+	 *            the item size exceed the threshold.
 	 */
 	public DiskFileItem(String fieldName, String contentType, boolean isFormField, String fileName,
 			int sizeThreshold, File repository)
@@ -172,11 +168,11 @@
 
 
 	/**
-	 * Returns an {@link java.io.InputStream InputStream} that can be used to
-	 * retrieve the contents of the file.
+	 * Returns an {@link java.io.InputStream InputStream} that can be used to retrieve the contents
+	 * of the file.
 	 * 
-	 * @return An {@link java.io.InputStream InputStream} that can be used to
-	 *         retrieve the contents of the file.
+	 * @return An {@link java.io.InputStream InputStream} that can be used to retrieve the contents
+	 *         of the file.
 	 * 
 	 * @exception IOException
 	 *                if an error occurs.
@@ -197,11 +193,9 @@
 
 
 	/**
-	 * Returns the content type passed by the agent or <code>null</code> if
-	 * not defined.
+	 * Returns the content type passed by the agent or <code>null</code> if not defined.
 	 * 
-	 * @return The content type passed by the agent or <code>null</code> if
-	 *         not defined.
+	 * @return The content type passed by the agent or <code>null</code> if not defined.
 	 */
 	public String getContentType()
 	{
@@ -210,11 +204,9 @@
 
 
 	/**
-	 * Returns the content charset passed by the agent or <code>null</code> if
-	 * not defined.
+	 * Returns the content charset passed by the agent or <code>null</code> if not defined.
 	 * 
-	 * @return The content charset passed by the agent or <code>null</code> if
-	 *         not defined.
+	 * @return The content charset passed by the agent or <code>null</code> if not defined.
 	 */
 	public String getCharSet()
 	{
@@ -241,11 +233,10 @@
 
 
 	/**
-	 * Provides a hint as to whether or not the file contents will be read from
-	 * memory.
+	 * Provides a hint as to whether or not the file contents will be read from memory.
 	 * 
-	 * @return <code>true</code> if the file contents will be read from
-	 *         memory; <code>false</code> otherwise.
+	 * @return <code>true</code> if the file contents will be read from memory; <code>false</code>
+	 *         otherwise.
 	 */
 	public boolean isInMemory()
 	{
@@ -276,9 +267,8 @@
 
 
 	/**
-	 * Returns the contents of the file as an array of bytes. If the contents of
-	 * the file were not yet cached in memory, they will be loaded from the disk
-	 * storage and cached.
+	 * Returns the contents of the file as an array of bytes. If the contents of the file were not
+	 * yet cached in memory, they will be loaded from the disk storage and cached.
 	 * 
 	 * @return The contents of the file as an array of bytes.
 	 */
@@ -325,9 +315,8 @@
 
 
 	/**
-	 * Returns the contents of the file as a String, using the specified
-	 * encoding. This method uses {@link #get()} to retrieve the contents of the
-	 * file.
+	 * Returns the contents of the file as a String, using the specified encoding. This method uses
+	 * {@link #get()} to retrieve the contents of the file.
 	 * 
 	 * @param charset
 	 *            The charset to use.
@@ -344,9 +333,8 @@
 
 
 	/**
-	 * Returns the contents of the file as a String, using the default character
-	 * encoding. This method uses {@link #get()} to retrieve the contents of the
-	 * file.
+	 * Returns the contents of the file as a String, using the default character encoding. This
+	 * method uses {@link #get()} to retrieve the contents of the file.
 	 * 
 	 * @return The contents of the file, as a string.
 	 * 
@@ -372,23 +360,20 @@
 
 
 	/**
-	 * A convenience method to write an uploaded item to disk. The client code
-	 * is not concerned with whether or not the item is stored in memory, or on
-	 * disk in a temporary location. They just want to write the uploaded item
-	 * to a file.
+	 * A convenience method to write an uploaded item to disk. The client code is not concerned with
+	 * whether or not the item is stored in memory, or on disk in a temporary location. They just
+	 * want to write the uploaded item to a file.
 	 * <p>
-	 * This implementation first attempts to rename the uploaded item to the
-	 * specified destination file, if the item was originally written to disk.
-	 * Otherwise, the data will be copied to the specified file.
+	 * This implementation first attempts to rename the uploaded item to the specified destination
+	 * file, if the item was originally written to disk. Otherwise, the data will be copied to the
+	 * specified file.
 	 * <p>
-	 * This method is only guaranteed to work <em>once</em>, the first time
-	 * it is invoked for a particular item. This is because, in the event that
-	 * the method renames a temporary file, that file will no longer be
-	 * available to copy or rename again at a later time.
+	 * This method is only guaranteed to work <em>once</em>, the first time it is invoked for a
+	 * particular item. This is because, in the event that the method renames a temporary file, that
+	 * file will no longer be available to copy or rename again at a later time.
 	 * 
 	 * @param file
-	 *            The <code>File</code> into which the uploaded item should be
-	 *            stored.
+	 *            The <code>File</code> into which the uploaded item should be stored.
 	 * 
 	 * @exception Exception
 	 *                if an error occurs.
@@ -417,8 +402,8 @@
 			if (outputFile != null)
 			{
 				/*
-				 * The uploaded file is being stored on disk in a temporary
-				 * location so move it to the desired file.
+				 * The uploaded file is being stored on disk in a temporary location so move it to
+				 * the desired file.
 				 */
 				if (!outputFile.renameTo(file))
 				{
@@ -474,10 +459,9 @@
 
 
 	/**
-	 * Deletes the underlying storage for a file item, including deleting any
-	 * associated temporary disk file. Although this storage will be deleted
-	 * automatically when the <code>FileItem</code> instance is garbage
-	 * collected, this method can be used to ensure that this is done at an
+	 * Deletes the underlying storage for a file item, including deleting any associated temporary
+	 * disk file. Although this storage will be deleted automatically when the <code>FileItem</code>
+	 * instance is garbage collected, this method can be used to ensure that this is done at an
 	 * earlier time, thus preserving system resources.
 	 */
 	public void delete()
@@ -492,8 +476,7 @@
 
 
 	/**
-	 * Returns the name of the field in the multipart form corresponding to this
-	 * file item.
+	 * Returns the name of the field in the multipart form corresponding to this file item.
 	 * 
 	 * @return The name of the form field.
 	 * 
@@ -522,11 +505,10 @@
 
 
 	/**
-	 * Determines whether or not a <code>FileItem</code> instance represents a
-	 * simple form field.
+	 * Determines whether or not a <code>FileItem</code> instance represents a simple form field.
 	 * 
-	 * @return <code>true</code> if the instance represents a simple form
-	 *         field; <code>false</code> if it represents an uploaded file.
+	 * @return <code>true</code> if the instance represents a simple form field;
+	 *         <code>false</code> if it represents an uploaded file.
 	 * 
 	 * @see #setFormField(boolean)
 	 * 
@@ -538,12 +520,11 @@
 
 
 	/**
-	 * Specifies whether or not a <code>FileItem</code> instance represents a
-	 * simple form field.
+	 * Specifies whether or not a <code>FileItem</code> instance represents a simple form field.
 	 * 
 	 * @param state
-	 *            <code>true</code> if the instance represents a simple form
-	 *            field; <code>false</code> if it represents an uploaded file.
+	 *            <code>true</code> if the instance represents a simple form field;
+	 *            <code>false</code> if it represents an uploaded file.
 	 * 
 	 * @see #isFormField()
 	 * 
@@ -555,11 +536,11 @@
 
 
 	/**
-	 * Returns an {@link java.io.OutputStream OutputStream} that can be used for
-	 * storing the contents of the file.
+	 * Returns an {@link java.io.OutputStream OutputStream} that can be used for storing the
+	 * contents of the file.
 	 * 
-	 * @return An {@link java.io.OutputStream OutputStream} that can be used for
-	 *         storing the contensts of the file.
+	 * @return An {@link java.io.OutputStream OutputStream} that can be used for storing the
+	 *         contensts of the file.
 	 * 
 	 * @exception IOException
 	 *                if an error occurs.
@@ -579,16 +560,13 @@
 
 
 	/**
-	 * Returns the {@link java.io.File} object for the <code>FileItem</code>'s
-	 * data's temporary location on the disk. Note that for
-	 * <code>FileItem</code>s that have their data stored in memory, this
-	 * method will return <code>null</code>. When handling large files, you
-	 * can use {@link java.io.File#renameTo(java.io.File)} to move the file to
-	 * new location without copying the data, if the source and destination
-	 * locations reside within the same logical volume.
+	 * Returns the {@link java.io.File} object for the <code>FileItem</code>'s data's temporary
+	 * location on the disk. Note that for <code>FileItem</code>s that have their data stored in
+	 * memory, this method will return <code>null</code>. When handling large files, you can use
+	 * {@link java.io.File#renameTo(java.io.File)} to move the file to new location without copying
+	 * the data, if the source and destination locations reside within the same logical volume.
 	 * 
-	 * @return The data file, or <code>null</code> if the data is stored in
-	 *         memory.
+	 * @return The data file, or <code>null</code> if the data is stored in memory.
 	 */
 	public File getStoreLocation()
 	{
@@ -614,10 +592,10 @@
 
 
 	/**
-	 * Creates and returns a {@link java.io.File File} representing a uniquely
-	 * named temporary file in the configured repository path. The lifetime of
-	 * the file is tied to the lifetime of the <code>FileItem</code> instance;
-	 * the file will be deleted when the instance is garbage collected.
+	 * Creates and returns a {@link java.io.File File} representing a uniquely named temporary file
+	 * in the configured repository path. The lifetime of the file is tied to the lifetime of the
+	 * <code>FileItem</code> instance; the file will be deleted when the instance is garbage
+	 * collected.
 	 * 
 	 * @return The {@link java.io.File File} to be used for temporary storage.
 	 */
@@ -653,8 +631,8 @@
 
 
 	/**
-	 * Returns an identifier that is unique within the class loader used to load
-	 * this class, but does not have random-like apearance.
+	 * Returns an identifier that is unique within the class loader used to load this class, but
+	 * does not have random-like apearance.
 	 * 
 	 * @return A String with the non-random looking instance identifier.
 	 */
@@ -681,8 +659,8 @@
 	 */
 	public String toString()
 	{
-		return "name=" + this.getName() + ", StoreLocation="
-				+ String.valueOf(this.getStoreLocation()) + ", size=" + this.getSize() + "bytes, "
-				+ "isFormField=" + isFormField() + ", FieldName=" + this.getFieldName();
+		return "name=" + this.getName() + ", StoreLocation=" +
+				String.valueOf(this.getStoreLocation()) + ", size=" + this.getSize() + "bytes, " +
+				"isFormField=" + isFormField() + ", FieldName=" + this.getFieldName();
 	}
 }

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java Mon Oct 15 14:21:25 2007
@@ -21,11 +21,10 @@
 /**
  * <p>
  * The default {@link org.apache.wicket.util.upload.FileItemFactory} implementation. This
- * implementation creates {@link org.apache.wicket.util.upload.FileItem} instances which
- * keep their content either in memory, for smaller items, or in a temporary
- * file on disk, for larger items. The size threshold, above which content will
- * be stored on disk, is configurable, as is the directory in which temporary
- * files will be created.
+ * implementation creates {@link org.apache.wicket.util.upload.FileItem} instances which keep their
+ * content either in memory, for smaller items, or in a temporary file on disk, for larger items.
+ * The size threshold, above which content will be stored on disk, is configurable, as is the
+ * directory in which temporary files will be created.
  * </p>
  * 
  * <p>
@@ -70,8 +69,8 @@
 
 
 	/**
-	 * Constructs an unconfigured instance of this class. The resulting factory
-	 * may be configured by calling the appropriate setter methods.
+	 * Constructs an unconfigured instance of this class. The resulting factory may be configured by
+	 * calling the appropriate setter methods.
 	 */
 	public DiskFileItemFactory()
 	{
@@ -82,11 +81,11 @@
 	 * Constructs a preconfigured instance of this class.
 	 * 
 	 * @param sizeThreshold
-	 *            The threshold, in bytes, below which items will be retained in
-	 *            memory and above which they will be stored as a file.
+	 *            The threshold, in bytes, below which items will be retained in memory and above
+	 *            which they will be stored as a file.
 	 * @param repository
-	 *            The data repository, which is the directory in which files
-	 *            will be created, should the item size exceed the threshold.
+	 *            The data repository, which is the directory in which files will be created, should
+	 *            the item size exceed the threshold.
 	 */
 	public DiskFileItemFactory(int sizeThreshold, File repository)
 	{
@@ -99,8 +98,8 @@
 
 
 	/**
-	 * Returns the directory used to temporarily store files that are larger
-	 * than the configured size threshold.
+	 * Returns the directory used to temporarily store files that are larger than the configured
+	 * size threshold.
 	 * 
 	 * @return The directory in which temporary files will be located.
 	 * 
@@ -114,8 +113,8 @@
 
 
 	/**
-	 * Sets the directory used to temporarily store files that are larger than
-	 * the configured size threshold.
+	 * Sets the directory used to temporarily store files that are larger than the configured size
+	 * threshold.
 	 * 
 	 * @param repository
 	 *            The directory in which temporary files will be located.
@@ -130,8 +129,8 @@
 
 
 	/**
-	 * Returns the size threshold beyond which files are written directly to
-	 * disk. The default value is 1024 bytes.
+	 * Returns the size threshold beyond which files are written directly to disk. The default value
+	 * is 1024 bytes.
 	 * 
 	 * @return The size threshold, in bytes.
 	 * 
@@ -161,19 +160,17 @@
 	// --------------------------------------------------------- Public Methods
 
 	/**
-	 * Create a new {@link org.apache.wicket.util.upload.DiskFileItem} instance from the
-	 * supplied parameters and the local factory configuration.
+	 * Create a new {@link org.apache.wicket.util.upload.DiskFileItem} instance from the supplied
+	 * parameters and the local factory configuration.
 	 * 
 	 * @param fieldName
 	 *            The name of the form field.
 	 * @param contentType
 	 *            The content type of the form field.
 	 * @param isFormField
-	 *            <code>true</code> if this is a plain form field;
-	 *            <code>false</code> otherwise.
+	 *            <code>true</code> if this is a plain form field; <code>false</code> otherwise.
 	 * @param fileName
-	 *            The name of the uploaded file, if any, as supplied by the
-	 *            browser or other client.
+	 *            The name of the uploaded file, if any, as supplied by the browser or other client.
 	 * 
 	 * @return The newly created file item.
 	 */

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java Mon Oct 15 14:21:25 2007
@@ -29,22 +29,20 @@
  * <p>
  * This class represents a file or form item that was received within a
  * <code>multipart/form-data</code> POST request.
- *
+ * 
  * <p>
- * After retrieving an instance of this class from a {@link
- * org.apache.wicket.util.upload.FileUpload FileUpload} instance, you may either request
- * all contents of the file at once using {@link #get()} or request an
- * {@link java.io.InputStream InputStream} with {@link #getInputStream()} and
- * process the file without attempting to load it into memory, which may come
- * handy with large files.
- *
+ * After retrieving an instance of this class from a {@link org.apache.wicket.util.upload.FileUpload
+ * FileUpload} instance, you may either request all contents of the file at once using
+ * {@link #get()} or request an {@link java.io.InputStream InputStream} with
+ * {@link #getInputStream()} and process the file without attempting to load it into memory, which
+ * may come handy with large files.
+ * 
  * <p>
- * While this interface does not extend <code>javax.activation.DataSource</code>
- * per se (to avoid a seldom used dependency), several of the defined methods
- * are specifically defined with the same signatures as methods in that
- * interface. This allows an implementation of this interface to also implement
- * <code>javax.activation.DataSource</code> with minimal additional work.
- *
+ * While this interface does not extend <code>javax.activation.DataSource</code> per se (to avoid
+ * a seldom used dependency), several of the defined methods are specifically defined with the same
+ * signatures as methods in that interface. This allows an implementation of this interface to also
+ * implement <code>javax.activation.DataSource</code> with minimal additional work.
+ * 
  * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
  * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -58,12 +56,12 @@
 
 
 	/**
-	 * Returns an {@link java.io.InputStream InputStream} that can be used to
-	 * retrieve the contents of the file.
-	 *
-	 * @return An {@link java.io.InputStream InputStream} that can be used to
-	 *         retrieve the contents of the file.
-	 *
+	 * Returns an {@link java.io.InputStream InputStream} that can be used to retrieve the contents
+	 * of the file.
+	 * 
+	 * @return An {@link java.io.InputStream InputStream} that can be used to retrieve the contents
+	 *         of the file.
+	 * 
 	 * @exception IOException
 	 *                if an error occurs.
 	 */
@@ -71,21 +69,18 @@
 
 
 	/**
-	 * Returns the content type passed by the browser or <code>null</code> if
-	 * not defined.
-	 *
-	 * @return The content type passed by the browser or <code>null</code> if
-	 *         not defined.
+	 * Returns the content type passed by the browser or <code>null</code> if not defined.
+	 * 
+	 * @return The content type passed by the browser or <code>null</code> if not defined.
 	 */
 	String getContentType();
 
 
 	/**
-	 * Returns the original filename in the client's filesystem, as provided by
-	 * the browser (or other client software). In most cases, this will be the
-	 * base file name, without path information. However, some clients, such as
-	 * the Opera browser, do include path information.
-	 *
+	 * Returns the original filename in the client's filesystem, as provided by the browser (or
+	 * other client software). In most cases, this will be the base file name, without path
+	 * information. However, some clients, such as the Opera browser, do include path information.
+	 * 
 	 * @return The original filename in the client's filesystem.
 	 */
 	String getName();
@@ -95,18 +90,17 @@
 
 
 	/**
-	 * Provides a hint as to whether or not the file contents will be read from
-	 * memory.
-	 *
-	 * @return <code>true</code> if the file contents will be read from
-	 *         memory; <code>false</code> otherwise.
+	 * Provides a hint as to whether or not the file contents will be read from memory.
+	 * 
+	 * @return <code>true</code> if the file contents will be read from memory; <code>false</code>
+	 *         otherwise.
 	 */
 	boolean isInMemory();
 
 
 	/**
 	 * Returns the size of the file item.
-	 *
+	 * 
 	 * @return The size of the file item, in bytes.
 	 */
 	long getSize();
@@ -114,22 +108,21 @@
 
 	/**
 	 * Returns the contents of the file item as an array of bytes.
-	 *
+	 * 
 	 * @return The contents of the file item as an array of bytes.
 	 */
 	byte[] get();
 
 
 	/**
-	 * Returns the contents of the file item as a String, using the specified
-	 * encoding. This method uses {@link #get()} to retrieve the contents of the
-	 * item.
-	 *
+	 * Returns the contents of the file item as a String, using the specified encoding. This method
+	 * uses {@link #get()} to retrieve the contents of the item.
+	 * 
 	 * @param encoding
 	 *            The character encoding to use.
-	 *
+	 * 
 	 * @return The contents of the item, as a string.
-	 *
+	 * 
 	 * @exception UnsupportedEncodingException
 	 *                if the requested character encoding is not available.
 	 */
@@ -137,30 +130,26 @@
 
 
 	/**
-	 * Returns the contents of the file item as a String, using the default
-	 * character encoding. This method uses {@link #get()} to retrieve the
-	 * contents of the item.
-	 *
+	 * Returns the contents of the file item as a String, using the default character encoding. This
+	 * method uses {@link #get()} to retrieve the contents of the item.
+	 * 
 	 * @return The contents of the item, as a string.
 	 */
 	String getString();
 
 
 	/**
-	 * A convenience method to write an uploaded item to disk. The client code
-	 * is not concerned with whether or not the item is stored in memory, or on
-	 * disk in a temporary location. They just want to write the uploaded item
-	 * to a file.
+	 * A convenience method to write an uploaded item to disk. The client code is not concerned with
+	 * whether or not the item is stored in memory, or on disk in a temporary location. They just
+	 * want to write the uploaded item to a file.
 	 * <p>
-	 * This method is not guaranteed to succeed if called more than once for the
-	 * same item. This allows a particular implementation to use, for example,
-	 * file renaming, where possible, rather than copying all of the underlying
-	 * data, thus gaining a significant performance benefit.
-	 *
+	 * This method is not guaranteed to succeed if called more than once for the same item. This
+	 * allows a particular implementation to use, for example, file renaming, where possible, rather
+	 * than copying all of the underlying data, thus gaining a significant performance benefit.
+	 * 
 	 * @param file
-	 *            The <code>File</code> into which the uploaded item should be
-	 *            stored.
-	 *
+	 *            The <code>File</code> into which the uploaded item should be stored.
+	 * 
 	 * @exception Exception
 	 *                if an error occurs.
 	 */
@@ -168,19 +157,17 @@
 
 
 	/**
-	 * Deletes the underlying storage for a file item, including deleting any
-	 * associated temporary disk file. Although this storage will be deleted
-	 * automatically when the <code>FileItem</code> instance is garbage
-	 * collected, this method can be used to ensure that this is done at an
+	 * Deletes the underlying storage for a file item, including deleting any associated temporary
+	 * disk file. Although this storage will be deleted automatically when the <code>FileItem</code>
+	 * instance is garbage collected, this method can be used to ensure that this is done at an
 	 * earlier time, thus preserving system resources.
 	 */
 	void delete();
 
 
 	/**
-	 * Returns the name of the field in the multipart form corresponding to this
-	 * file item.
-	 *
+	 * Returns the name of the field in the multipart form corresponding to this file item.
+	 * 
 	 * @return The name of the form field.
 	 */
 	String getFieldName();
@@ -188,7 +175,7 @@
 
 	/**
 	 * Sets the field name used to reference this file item.
-	 *
+	 * 
 	 * @param name
 	 *            The name of the form field.
 	 */
@@ -196,33 +183,31 @@
 
 
 	/**
-	 * Determines whether or not a <code>FileItem</code> instance represents a
-	 * simple form field.
-	 *
-	 * @return <code>true</code> if the instance represents a simple form
-	 *         field; <code>false</code> if it represents an uploaded file.
+	 * Determines whether or not a <code>FileItem</code> instance represents a simple form field.
+	 * 
+	 * @return <code>true</code> if the instance represents a simple form field;
+	 *         <code>false</code> if it represents an uploaded file.
 	 */
 	boolean isFormField();
 
 
 	/**
-	 * Specifies whether or not a <code>FileItem</code> instance represents a
-	 * simple form field.
-	 *
+	 * Specifies whether or not a <code>FileItem</code> instance represents a simple form field.
+	 * 
 	 * @param state
-	 *            <code>true</code> if the instance represents a simple form
-	 *            field; <code>false</code> if it represents an uploaded file.
+	 *            <code>true</code> if the instance represents a simple form field;
+	 *            <code>false</code> if it represents an uploaded file.
 	 */
 	void setFormField(boolean state);
 
 
 	/**
-	 * Returns an {@link java.io.OutputStream OutputStream} that can be used for
-	 * storing the contents of the file.
-	 *
-	 * @return An {@link java.io.OutputStream OutputStream} that can be used for
-	 *         storing the contents of the file.
-	 *
+	 * Returns an {@link java.io.OutputStream OutputStream} that can be used for storing the
+	 * contents of the file.
+	 * 
+	 * @return An {@link java.io.OutputStream OutputStream} that can be used for storing the
+	 *         contents of the file.
+	 * 
 	 * @exception IOException
 	 *                if an error occurs.
 	 */

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItemFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItemFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItemFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItemFactory.java Mon Oct 15 14:21:25 2007
@@ -19,9 +19,8 @@
 
 /**
  * <p>
- * A factory interface for creating {@link FileItem} instances. Factories can
- * provide their own custom configuration, over and above that provided by the
- * default file upload implementation.
+ * A factory interface for creating {@link FileItem} instances. Factories can provide their own
+ * custom configuration, over and above that provided by the default file upload implementation.
  * </p>
  * 
  * @author <a href="mailto:martinc@apache.org">Martin Cooper</a>
@@ -30,19 +29,17 @@
 {
 
 	/**
-	 * Create a new {@link FileItem} instance from the supplied parameters and
-	 * any local factory configuration.
+	 * Create a new {@link FileItem} instance from the supplied parameters and any local factory
+	 * configuration.
 	 * 
 	 * @param fieldName
 	 *            The name of the form field.
 	 * @param contentType
 	 *            The content type of the form field.
 	 * @param isFormField
-	 *            <code>true</code> if this is a plain form field;
-	 *            <code>false</code> otherwise.
+	 *            <code>true</code> if this is a plain form field; <code>false</code> otherwise.
 	 * @param fileName
-	 *            The name of the uploaded file, if any, as supplied by the
-	 *            browser or other client.
+	 *            The name of the uploaded file, if any, as supplied by the browser or other client.
 	 * 
 	 * @return The newly created file item.
 	 */

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,17 @@
  * <p>
  * High level API for processing file uploads.
  * </p>
- *
+ * 
  * <p>
- * This class handles multiple files per single HTML widget, sent using
- * <code>multipart/mixed</code> encoding type, as specified by <a
- * href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.
+ * This class handles multiple files per single HTML widget, sent using <code>multipart/mixed</code>
+ * encoding type, as specified by <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.
  * </p>
- *
+ * 
  * <p>
- * How the data for individual parts is stored is determined by the factory used
- * to create them; a given part may be in memory, on disk, or somewhere else.
+ * How the data for individual parts is stored is determined by the factory used to create them; a
+ * given part may be in memory, on disk, or somewhere else.
  * </p>
- *
+ * 
  * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
  * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -49,10 +48,9 @@
 	private FileItemFactory fileItemFactory;
 
 	/**
-	 * Constructs an uninitialized instance of this class. A factory must be
-	 * configured, using <code>setFileItemFactory()</code>, before attempting
-	 * to parse requests.
-	 *
+	 * Constructs an uninitialized instance of this class. A factory must be configured, using
+	 * <code>setFileItemFactory()</code>, before attempting to parse requests.
+	 * 
 	 * @see #FileUpload(FileItemFactory)
 	 */
 	public FileUpload()
@@ -62,11 +60,11 @@
 
 
 	/**
-	 * Constructs an instance of this class which uses the supplied factory to
-	 * create <code>FileItem</code> instances.
-	 *
+	 * Constructs an instance of this class which uses the supplied factory to create
+	 * <code>FileItem</code> instances.
+	 * 
 	 * @param fileItemFactory
-	 *
+	 * 
 	 * @see #FileUpload()
 	 */
 	public FileUpload(FileItemFactory fileItemFactory)
@@ -77,7 +75,7 @@
 
 	/**
 	 * Returns the factory class used when creating file items.
-	 *
+	 * 
 	 * @return The factory class for new file items.
 	 */
 	public FileItemFactory getFileItemFactory()
@@ -88,7 +86,7 @@
 
 	/**
 	 * Sets the factory class to use when creating file items.
-	 *
+	 * 
 	 * @param factory
 	 *            The factory class for new file items.
 	 */