Author: bback
Date: 2006-03-15 19:16:28 +0000 (Wed, 15 Mar 2006)
New Revision: 8255
Modified:
trunk/apps/frost-0.7/source/frost/DateFun.java
Log:
fix for date functions
Modified: trunk/apps/frost-0.7/source/frost/DateFun.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/DateFun.java 2006-03-15 15:29:33 UTC
(rev 8254)
+++ trunk/apps/frost-0.7/source/frost/DateFun.java 2006-03-15 19:16:28 UTC
(rev 8255)
@@ -21,119 +21,89 @@
import java.util.logging.Logger;
-public class DateFun
-{
- private static Logger logger = Logger.getLogger(DateFun.class.getName());
-
+public class DateFun {
+
+ private static Logger logger =
Logger.getLogger(DateFun.class.getName());
+
/**
* Returns date
* @return Date as String yyyy.m.d in GMT without leading zeros
*/
- public static String getDate()
- {
+ public static String getDate() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
- return new StringBuffer(11).append(cal.get(Calendar.YEAR)).append('.')
- .append(cal.get(Calendar.MONTH) +
1).append('.').append(cal.get(Calendar.DATE)).toString();
+ return getDateOfCalendar(cal);
}
-
+
/**
- * Returns date -n days.
- * @return Date as String yyyy.m.d in GMT without leading zeros
+ * Returns date with leading zeroes
+ * @return Date as String yyyy.MM.dd in GMT with leading zeros
*/
- public static String getDate(int daysAgo) {
+ public static String getExtendedDate() {
GregorianCalendar cal = new GregorianCalendar();
- if( daysAgo != 0 ) {
- cal.add(Calendar.DATE,-daysAgo);
- }
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
- return new StringBuffer(11).append(cal.get(Calendar.YEAR)).append('.')
- .append(cal.get(Calendar.MONTH) +
1).append('.').append(cal.get(Calendar.DATE)).toString();
+ return getExtendedDateOfCalendar(cal);
}
/**
* Returns date -n days.
- * @return Date as String yyyy.mm.dd in GMT WITH leading zeros
+ * @return Date as String yyyy.m.d in GMT without leading zeros
*/
- public static String getExtendedDate(int daysAgo) {
- GregorianCalendar cal = new GregorianCalendar();
+ public static String getDate(int daysAgo) {
+ GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
cal.add(Calendar.DATE,-daysAgo);
- int year = cal.get(Calendar.YEAR);
- int month = cal.get(Calendar.MONTH) + 1;
- int day = cal.get(Calendar.DATE);
- StringBuffer sb = new StringBuffer(11);
- sb.append(year).append('.');
- if( month < 10 )
- sb.append('0');
- sb.append(month).append('.');
- if( day < 10 )
- sb.append('0');
- sb.append(day);
- return sb.toString();
+ return getDateOfCalendar(cal);
}
/**
- * Returns time
- * @return Time as String h:m:s in GMT without leading zeros
+ * Returns date -n days.
+ * @return Date as String yyyy.mm.dd in GMT WITH leading zeros
*/
- public static String getTime()
- {
+ public static String getExtendedDate(int daysAgo) {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
- return new
StringBuffer(9).append(cal.get(Calendar.HOUR_OF_DAY)).append(':')
-
.append(cal.get(Calendar.MINUTE)).append(':').append(cal.get(Calendar.SECOND)).toString();
+ cal.add(Calendar.DATE,-daysAgo);
+ return getExtendedDateOfCalendar(cal);
}
/**
* Returns date with leading zeroes
- * @return Date as String yyyy.MM.dd in GMT with leading zeros
+ * @return Date as String dd.mm.yyyy in GMT with leading zeros
*/
- public static String getExtendedDate()
- {
+ public static String getVisibleExtendedDate() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
int year = cal.get(Calendar.YEAR);
int month = cal.get(Calendar.MONTH) + 1;
int day = cal.get(Calendar.DATE);
StringBuffer sb = new StringBuffer(11);
- sb.append(year).append('.');
+ if( day < 10 )
+ sb.append('0');
+ sb.append(day).append('.');
if( month < 10 )
sb.append('0');
sb.append(month).append('.');
- if( day < 10 )
- sb.append('0');
- sb.append(day);
+ sb.append(year);
return sb.toString();
}
+
/**
- * Returns date with leading zeroes
- * @return Date as String yyyy.MM.dd in GMT with leading zeros
+ * Returns time
+ * @return Time as String h:m:s in GMT without leading zeros
*/
- public static String getVisibleExtendedDate()
- {
+ public static String getTime() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
- int year = cal.get(Calendar.YEAR);
- int month = cal.get(Calendar.MONTH) + 1;
- int day = cal.get(Calendar.DATE);
- StringBuffer sb = new StringBuffer(11);
- if( day < 10 )
- sb.append('0');
- sb.append(day).append('.');
- if( month < 10 )
- sb.append('0');
- sb.append(month).append('.');
- sb.append(year);
- return sb.toString();
+ return new
StringBuffer(9).append(cal.get(Calendar.HOUR_OF_DAY)).append(':')
+
.append(cal.get(Calendar.MINUTE)).append(':').append(cal.get(Calendar.SECOND)).toString();
}
/**
* Returns time with leading zeroes
* @return Time as String h:mm:ss in GMT with leading zeros
*/
- public static String getExtendedTime()
- {
+ public static String getExtendedTime() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
int hour = cal.get(Calendar.HOUR_OF_DAY);
@@ -170,8 +140,7 @@
* **** getExtendedDate() returns h:mm:ss, this returns the correct
hh:mm:ss
*
*/
- public static String getFullExtendedTime()
- {
+ public static String getFullExtendedTime() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeZone(TimeZone.getTimeZone("GMT"));
int hour = cal.get(Calendar.HOUR_OF_DAY);
@@ -211,7 +180,7 @@
int day = Integer.parseInt(date.substring(secondPoint + 1,
date.length()));
cal.set(Calendar.YEAR, year);
cal.set(Calendar.MONTH, month - 1);
- cal.set(Calendar.DATE, day - 1);
+ cal.set(Calendar.DATE, day);
logger.fine("TOF Date: " + year + "." + month + "." + day);
}
}
@@ -236,20 +205,40 @@
int day = Integer.parseInt(date.substring(secondPoint + 1,
date.length()));
cal.set(Calendar.YEAR, year);
cal.set(Calendar.MONTH, month - 1);
- cal.set(Calendar.DATE, day - 1);
+ cal.set(Calendar.DATE, day);
}
return cal;
}
- public static String getDateOfCalendar(GregorianCalendar calDL)
- {
+ /**
+ * Returns the date from Calendar as String with format yyyy.m.d
+ */
+ public static String getDateOfCalendar(GregorianCalendar calDL) {
String date = new
StringBuffer(11).append(calDL.get(Calendar.YEAR)).append('.')
.append(calDL.get(Calendar.MONTH) + 1).append('.')
.append(calDL.get(Calendar.DATE)).toString();
return date;
}
-
+
/**
+ * Returns the date from Calendar as String with format yyyy.mm.dd
+ */
+ public static String getExtendedDateOfCalendar(GregorianCalendar cal) {
+ int year = cal.get(Calendar.YEAR);
+ int month = cal.get(Calendar.MONTH) + 1;
+ int day = cal.get(Calendar.DATE);
+ StringBuffer sb = new StringBuffer(11);
+ sb.append(year).append('.');
+ if( month < 10 )
+ sb.append('0');
+ sb.append(month).append('.');
+ if( day < 10 )
+ sb.append('0');
+ sb.append(day);
+ return sb.toString();
+ }
+
+ /**
* 2005.9.3 -> 2005.09.03 (for comparisions)
*/
public static String buildExtendedDate(String date) {
