Author: jonl
Date: Wed Mar 5 16:08:13 2008
New Revision: 634089
URL: http://svn.apache.org/viewvc?rev=634089&view=rev
Log:
fixed javadoc cut and paste error
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Time.java
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=634089&r1=634088&r2=634089&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
Wed Mar 5 16:08:13 2008
@@ -28,7 +28,7 @@
* <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
*/
@@ -47,7 +47,7 @@
/**
* Retrieves a <code>Time</code> instance based on the given
milliseconds.
- *
+ *
* @param time
* the time value in milliseconds since START_OF_UNIX_TIME
* @return the given <code>Time</code>
@@ -59,7 +59,7 @@
/**
* Retrieves a <code>Time</code> instance based on the current time.
- *
+ *
* @return the current <code>Time</code>
*/
public static Time now()
@@ -69,7 +69,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>
* @param string
@@ -78,7 +78,7 @@
* @throws ParseException
*/
public static Time parseDate(final Calendar calendar, final String
string)
- throws ParseException
+ throws ParseException
{
synchronized (dateFormat)
{
@@ -94,7 +94,7 @@
/**
* 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
* @return the time
@@ -107,7 +107,7 @@
/**
* 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>
* @param string
@@ -131,7 +131,7 @@
/**
* Retrieves a <code>Time</code> instance based on the given
<code>Calendar</code> and
* [EMAIL PROTECTED] TimeOfDay} objects.
- *
+ *
* @param calendar
* the <code>Calendar</code> to use
* @param timeOfDay
@@ -155,7 +155,7 @@
/**
* Retrieves a <code>Time</code> instance based on the given
<code>Date</code> object.
- *
+ *
* @param date
* a <code>java.util.Date</code> object
* @return a corresponding immutable <code>Time</code> object
@@ -167,7 +167,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
* @return a corresponding immutable <code>Time</code> object
@@ -179,7 +179,7 @@
/**
* Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma'
format.
- *
+ *
* @param string
* the <code>String</code> to parse
* @return the <code>Time</code> instance
@@ -192,7 +192,7 @@
/**
* Retrieves a <code>Time</code> instance by parsing 'pattern' format.
- *
+ *
* @param string
* input
* @param pattern
@@ -210,7 +210,7 @@
/**
* Retrieves a <code>Time</code> instance based on the given [EMAIL
PROTECTED] TimeOfDay} object.
- *
+ *
* @param timeOfDay
* the time of day in local time
* @return a <code>Time</code> value for the time of day today
@@ -222,7 +222,7 @@
/**
* Private constructor forces use of static factory methods.
- *
+ *
* @param time
* the <code>Time</code> value in milliseconds since
START_OF_UNIX_TIME
*/
@@ -234,7 +234,7 @@
/**
* 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
* @return this <code>Time</code> + <code>Duration</code>
@@ -246,7 +246,7 @@
/**
* 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
* @throws IllegalStateException
* thrown if this <code>Time</code> value is in the future
@@ -265,7 +265,7 @@
* 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
*/
public Duration fromNow()
@@ -275,7 +275,7 @@
/**
* Retrieves the value of a field from the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> to use
* @param field
@@ -294,7 +294,7 @@
/**
* Retrieves the value of a field.
- *
+ *
* @param field
* the <code>Calendar</code> field to get
* @return the field's value (in local time)
@@ -306,7 +306,7 @@
/**
* Retrieves the day of month field of the current
<code>Calendar</code>.
- *
+ *
* @return the day of month field value
*/
public int getDayOfMonth()
@@ -316,7 +316,7 @@
/**
* Retrieves the day of month field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> to get the field value from
* @return the day of month field value
@@ -328,7 +328,7 @@
/**
* Retrieves the hour field of the current <code>Calendar</code>.
- *
+ *
* @return the hour field value
*/
public int getHour()
@@ -338,7 +338,7 @@
/**
* Retrieves the hour field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> to get the field value from
* @return the hour field value
@@ -350,7 +350,7 @@
/**
* Retrieves the minute field of the current <code>Calendar</code>.
- *
+ *
* @return the minute field value
*/
public int getMinute()
@@ -360,7 +360,7 @@
/**
* Retrieves the minute field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> from which to get the field
value
* @return the minute field value
@@ -372,7 +372,7 @@
/**
* Retrieves the month field of the current <code>Calendar</code>.
- *
+ *
* @return the month field value
*/
public int getMonth()
@@ -382,7 +382,7 @@
/**
* Retrieves the month field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> from which to get the field
value
* @return the month field value
@@ -394,7 +394,7 @@
/**
* Retrieves the seconds field of the current <code>Calendar</code>.
- *
+ *
* @return the seconds field value
*/
public int getSecond()
@@ -404,7 +404,7 @@
/**
* Retrieves the seconds field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> from which to get the field
value
* @return the seconds field value
@@ -416,7 +416,7 @@
/**
* Retrieves the year field of the current <code>Calendar</code>.
- *
+ *
* @return the year field value
*/
public int getYear()
@@ -426,7 +426,7 @@
/**
* Retrieves the year field of the given <code>Calendar</code>.
- *
+ *
* @param calendar
* the <code>Calendar</code> from which to get the field
value
* @return the year field value
@@ -437,11 +437,11 @@
}
/**
- * Adds the given <code>Duration</code> to this <code>Time</code>
object, moving the time
- * into the future.
- *
+ * Subtracts the given <code>Duration</code> from this
<code>Time</code> object, moving the
+ * time into the past.
+ *
* @param duration
- * the <code>Duration</code> to add
+ * the <code>Duration</code> to subtract
* @return this duration of time
*/
public Time subtract(final Duration duration)
@@ -451,21 +451,21 @@
/**
* Subtract time from this and returns the difference as a
<code>Duration</code> object.
- *
+ *
* @param that
* the time to subtract
* @return the <code>Duration</code> between this and that time
*/
public Duration subtract(final Time that)
{
- return Duration.milliseconds(this.getMilliseconds() -
that.getMilliseconds());
+ return Duration.milliseconds(getMilliseconds() -
that.getMilliseconds());
}
/**
* 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
*/
@@ -477,7 +477,7 @@
/**
* Converts this <code>Time</code> value to a date <code>String</code>
using the date
* formatter 'yyyy.MM.dd'.
- *
+ *
* @return the date string
*/
public String toDateString()
@@ -488,7 +488,7 @@
/**
* 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
* @return the date <code>String</code>
@@ -509,7 +509,7 @@
/**
* 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>
*/
public String toString()
@@ -520,7 +520,7 @@
/**
* 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
* @param format
@@ -536,7 +536,7 @@
/**
* Converts this <code>Time</code> value to a <code>String</code> using
the given format.
- *
+ *
* @param format
* the format to use
* @return this <code>Time</code> value as a formatted string
