Author: pete
Date: Thu May 5 15:23:59 2011
New Revision: 1099840
URL: http://svn.apache.org/viewvc?rev=1099840&view=rev
Log:
deprecate Time.valueOf(long) and rename Time.milliseconds -> Time.millis
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Thu May 5 15:23:59 2011
@@ -218,7 +218,7 @@ public class ServletWebRequest extends W
return null;
}
- return Time.valueOf(value);
+ return Time.millis(value);
}
@Override
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Thu May 5 15:23:59 2011
@@ -283,7 +283,7 @@ public abstract class AbstractResource i
// that's stupid, since changes within one
second will not be reliably
// detected by the client ... any hint or
clarification to improve this
// situation will be appreciated...
- Time roundedLastModified =
Time.valueOf(this.lastModified.getMilliseconds() / 1000 * 1000);
+ Time roundedLastModified =
Time.millis(this.lastModified.getMilliseconds() / 1000 * 1000);
return
ifModifiedSince.before(roundedLastModified);
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
Thu May 5 15:23:59 2011
@@ -365,6 +365,6 @@ public class CookieUtils
{
return "[Cookie " + " name = " + cookie.getName() + ", value =
" + cookie.getValue() +
", domain = " + cookie.getDomain() + ", path = " +
cookie.getPath() + ", maxAge = " +
- Time.valueOf(cookie.getMaxAge()).toDateString() + "(" +
cookie.getMaxAge() + ")" + "]";
+ Time.millis(cookie.getMaxAge()).toDateString() + "(" +
cookie.getMaxAge() + ")" + "]";
}
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
Thu May 5 15:23:59 2011
@@ -448,7 +448,7 @@ public class BasicResourceReferenceMappe
{
long millis = 12345678L;
final ResourceReferenceWithTimestamp reference = new
ResourceReferenceWithTimestamp(
- Time.valueOf(millis));
+ Time.millis(millis));
final IRequestHandler handler = new
ResourceReferenceRequestHandler(reference, null);
// request url with timestamp
@@ -468,7 +468,7 @@ public class BasicResourceReferenceMappe
{
long millis = 87654321L;
final ResourceReferenceWithTimestamp reference = new
ResourceReferenceWithTimestamp(
- Time.valueOf(millis));
+ Time.millis(millis));
final IRequestHandler handler = new
ResourceReferenceRequestHandler(reference, null);
// setup mock request cycle
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
Thu May 5 15:23:59 2011
@@ -167,7 +167,7 @@ public class File extends java.io.File i
*/
public Time lastModifiedTime()
{
- return Time.valueOf(lastModified());
+ return Time.millis(lastModified());
}
/**
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
Thu May 5 15:23:59 2011
@@ -79,7 +79,7 @@ public class Connections
}
// return UNIX timestamp
- return Time.valueOf(milliseconds);
+ return Time.millis(milliseconds);
}
finally
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
Thu May 5 15:23:59 2011
@@ -975,6 +975,6 @@ public final class IOUtils
}
// last file modification timestamp
- return Time.valueOf(millis);
+ return Time.millis(millis);
}
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java?rev=1099840&r1=1099839&r2=1099840&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
Thu May 5 15:23:59 2011
@@ -37,7 +37,7 @@ public final class Time extends Abstract
private static final long serialVersionUID = 1L;
/** the beginning of UNIX time: January 1, 1970, 0:00 GMT. */
- public static final Time START_OF_UNIX_TIME = valueOf(0);
+ public static final Time START_OF_UNIX_TIME = millis(0);
/** parser in 'yyyy.MM.dd' format. */
private static final SimpleDateFormat dateFormat = new
SimpleDateFormat("yyyy.MM.dd",
@@ -54,7 +54,19 @@ public final class Time extends Abstract
*/
public static Time now()
{
- return valueOf(System.currentTimeMillis());
+ return millis(System.currentTimeMillis());
+ }
+
+ /**
+ * 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
+ */
+ public static Time millis(final long time)
+ {
+ return new Time(time);
}
/**
@@ -95,6 +107,21 @@ public final class Time extends Abstract
return parseDate(localtime, string);
}
+
+ /**
+ * 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
+ *
+ * @deprecated use {@link Time#millis(long)} instead
+ */
+ public static Time valueOf(final long time)
+ {
+ return millis(time);
+ }
+
/**
* Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma'
format.
*
@@ -140,7 +167,7 @@ public final class Time extends Abstract
calendar.set(Calendar.MILLISECOND, 0); // WICKET-1670
// Add time of day milliseconds to midnight
- return valueOf(calendar.getTimeInMillis() +
timeOfDay.getMilliseconds());
+ return millis(calendar.getTimeInMillis() +
timeOfDay.getMilliseconds());
}
}
@@ -157,18 +184,6 @@ public final class Time extends Abstract
}
/**
- * 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
- */
- public static Time valueOf(final long time)
- {
- return new Time(time);
- }
-
- /**
* Retrieves a <code>Time</code> instance by parsing 'yyyy.MM.dd-h.mma'
format.
*
* @param string
@@ -231,7 +246,7 @@ public final class Time extends Abstract
*/
public Time add(final Duration duration)
{
- return valueOf(getMilliseconds() + duration.getMilliseconds());
+ return millis(getMilliseconds() + duration.getMilliseconds());
}
/**
@@ -437,7 +452,7 @@ public final class Time extends Abstract
*/
public Time subtract(final Duration duration)
{
- return valueOf(getMilliseconds() - duration.getMilliseconds());
+ return millis(getMilliseconds() - duration.getMilliseconds());
}
/**
