Author: pete
Date: Thu May 5 14:11:07 2011
New Revision: 1099813
URL: http://svn.apache.org/viewvc?rev=1099813&view=rev
Log:
remove duplicate method Time.milliseconds(long) which is identical to
Time.valueOf(long)
Modified:
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/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=1099813&r1=1099812&r2=1099813&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 14:11:07 2011
@@ -448,7 +448,7 @@ public class BasicResourceReferenceMappe
{
long millis = 12345678L;
final ResourceReferenceWithTimestamp reference = new
ResourceReferenceWithTimestamp(
- Time.milliseconds(millis));
+ Time.valueOf(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.milliseconds(millis));
+ Time.valueOf(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=1099813&r1=1099812&r2=1099813&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 14:11:07 2011
@@ -167,7 +167,7 @@ public class File extends java.io.File i
*/
public Time lastModifiedTime()
{
- return Time.milliseconds(lastModified());
+ return Time.valueOf(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=1099813&r1=1099812&r2=1099813&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 14:11:07 2011
@@ -79,7 +79,7 @@ public class Connections
}
// return UNIX timestamp
- return Time.milliseconds(milliseconds);
+ return Time.valueOf(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=1099813&r1=1099812&r2=1099813&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 14:11:07 2011
@@ -975,6 +975,6 @@ public final class IOUtils
}
// last file modification timestamp
- return Time.milliseconds(millis);
+ return Time.valueOf(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=1099813&r1=1099812&r2=1099813&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 14:11:07 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 = milliseconds(0);
+ public static final Time START_OF_UNIX_TIME = valueOf(0);
/** parser in 'yyyy.MM.dd' format. */
private static final SimpleDateFormat dateFormat = new
SimpleDateFormat("yyyy.MM.dd",
@@ -48,25 +48,13 @@ public final class Time extends Abstract
Locale.ENGLISH);
/**
- * 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>
- */
- public static Time milliseconds(final long time)
- {
- return new Time(time);
- }
-
- /**
* Retrieves a <code>Time</code> instance based on the current time.
*
* @return the current <code>Time</code>
*/
public static Time now()
{
- return new Time(System.currentTimeMillis());
+ return valueOf(System.currentTimeMillis());
}
/**
@@ -243,7 +231,7 @@ public final class Time extends Abstract
*/
public Time add(final Duration duration)
{
- return milliseconds(getMilliseconds() +
duration.getMilliseconds());
+ return valueOf(getMilliseconds() + duration.getMilliseconds());
}
/**
@@ -449,7 +437,7 @@ public final class Time extends Abstract
*/
public Time subtract(final Duration duration)
{
- return milliseconds(getMilliseconds() -
duration.getMilliseconds());
+ return valueOf(getMilliseconds() - duration.getMilliseconds());
}
/**
