Author: cbrisson
Date: Fri Dec 9 23:21:33 2016
New Revision: 1773487
URL: http://svn.apache.org/viewvc?rev=1773487&view=rev
Log:
[tools] minor comments and javadoc fixes
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java?rev=1773487&r1=1773486&r2=1773487&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java
Fri Dec 9 23:21:33 2016
@@ -210,7 +210,6 @@ public class ConversionUtils
* or {@link Date}. If it can't do that, it will get the string value and
have
* {@link #toNumber(String,String,Locale)} try to parse it using the
* default Locale and format.
-
* @param obj - the object to convert
*/
public static Number toNumber(Object obj)
@@ -317,12 +316,12 @@ public class ConversionUtils
/* iso/intl date/time formats (locale-independant) */
private static DateFormat isoDateFormat = new
SimpleDateFormat("yyyy-MM-dd"); /* ISO 8601 date */
private static DateFormat isoTimeFormat = new
SimpleDateFormat("HH:mm:ss"); /* ISO 8601 time */
- private static DateFormat isoTimestampFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); /* ISO 88601 timestamp */
- private static DateFormat intlTimestampFormat = new
SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /* human-readable ISO-8601 timestamp
*/
+ private static DateFormat isoTimestampFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); /* ISO 8601 timestamp */
+ private static DateFormat intlTimestampFormat = new
SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /* human-readable ISO 8601 timestamp
*/
private static DateFormat isoTimeTzFormat = new
SimpleDateFormat("HH:mm:ssXXX"); /* ISO 8601 time with timezone offset */
- private static DateFormat isoTimestampTzFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); /* ISO 88601 timestamp with
timezone offset */
- private static DateFormat intlTimeTzFormat_base = new
SimpleDateFormat("HH:mm:ss"); /* human-readable ISO-8601 time with timezone
ID */
- private static DateFormat intlTimestampTzFormat_base = new
SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /* human-readable ISO-8601 timestamp
with timezone ID */
+ private static DateFormat isoTimestampTzFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); /* ISO 8601 timestamp with
timezone offset */
+ private static DateFormat intlTimeTzFormat_base = new
SimpleDateFormat("HH:mm:ss"); /* human-readable ISO 8601 time with timezone
ID */
+ private static DateFormat intlTimestampTzFormat_base = new
SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /* human-readable ISO 8601 timestamp
with timezone ID */
/* a DateFormat that appends a space and the time zone ID to the wrapped
DateFormat - needed because
* there is no letter format for time zone id in SimpleDateFormat. */
@@ -692,7 +691,7 @@ public class ConversionUtils
* String.valueOf(Object), especially with nulls, Arrays and Collections.
* Null returns null, Arrays and Collections return their first value,
* or null if they have no values.
- *
+ *
* @param value the object to be turned into a String
* @return the string value of the object or null if the value is null
* or it is an array whose first value is null
@@ -738,7 +737,7 @@ public class ConversionUtils
/**
* Converts any Object to a boolean using {@link #toString(Object)}
- * and {@link Boolean#valueOf(String)}.
+ * and {@link Boolean#valueOf(String)}.
*
* @param value the object to be converted
* @return a {@link Boolean} object for the specified value or
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java?rev=1773487&r1=1773486&r2=1773487&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
Fri Dec 9 23:21:33 2016
@@ -108,7 +108,7 @@ public class DateTool extends FormatConf
{
setTimeZone(TimeZone.getTimeZone(tzId));
}
- }
+ }
protected void setTimeZone(TimeZone timezone)
{
@@ -558,7 +558,7 @@ public class DateTool extends FormatConf
* @param locale the {@link Locale} to be used
* @param timezone the {@link TimeZone} to be used
* @return an instance of {@link DateFormat}
- * @see {@link ConversionUtils#getDateFormat(String, Locale, TimeZone)}
+ * @see {@link ConversionUtils#getDateFormat(int, int, Locale, TimeZone)}
* @since VelocityTools 1.1
*/
public DateFormat getDateFormat(String dateStyle, String timeStyle,
