From 3dca514255b97388b4deeffa0900fdd1107c35de Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 08 Mar 2007 17:34:05 +0000
Subject: [PATCH] Update the UTC Time attribute syntax so that it correctly uses two-digit years instead of four-digit years. Also, update other parts of the server that made reference to UTC times when they really meant "YYYYMMDDhhmmssZ" to the term "GMT" instead of "UTC" so there is no confusion about whether the year would be expressed in four digits or two.
---
opends/src/server/org/opends/server/util/TimeThread.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/TimeThread.java b/opends/src/server/org/opends/server/util/TimeThread.java
index a18891a..da9d2ea 100644
--- a/opends/src/server/org/opends/server/util/TimeThread.java
+++ b/opends/src/server/org/opends/server/util/TimeThread.java
@@ -90,8 +90,8 @@
// The date formatter that will be used to obtain the local timestamp.
private static SimpleDateFormat localTimestampFormatter;
- // The date formatter that will be used to obtain the UTC timestamp.
- private static SimpleDateFormat utcTimestampFormatter;
+ // The date formatter that will be used to obtain the GMT timestamp.
+ private static SimpleDateFormat gmtTimestampFormatter;
// The timestamp for this time thread in the generalized time format.
private static String generalizedTime;
@@ -99,8 +99,8 @@
// The timestamp for this time thread in the local time zone.
private static String localTimestamp;
- // The timestamp for this time thread in UTC.
- private static String utcTimestamp;
+ // The timestamp for this time thread in GMT.
+ private static String gmtTimestamp;
@@ -122,8 +122,8 @@
new SimpleDateFormat(DATE_FORMAT_GENERALIZED_TIME);
generalizedTimeFormatter.setTimeZone(utcTimeZone);
- utcTimestampFormatter = new SimpleDateFormat(DATE_FORMAT_UTC_TIME);
- utcTimestampFormatter.setTimeZone(utcTimeZone);
+ gmtTimestampFormatter = new SimpleDateFormat(DATE_FORMAT_GMT_TIME);
+ gmtTimestampFormatter.setTimeZone(utcTimeZone);
localTimestampFormatter = new SimpleDateFormat(DATE_FORMAT_LOCAL_TIME);
@@ -132,7 +132,7 @@
time = date.getTime();
generalizedTime = generalizedTimeFormatter.format(date);
localTimestamp = localTimestampFormatter.format(date);
- utcTimestamp = utcTimestampFormatter.format(date);
+ gmtTimestamp = gmtTimestampFormatter.format(date);
hourAndMinute = (calendar.get(Calendar.HOUR_OF_DAY) * 100) +
calendar.get(Calendar.MINUTE);
@@ -156,7 +156,7 @@
time = date.getTime();
generalizedTime = generalizedTimeFormatter.format(date);
localTimestamp = localTimestampFormatter.format(date);
- utcTimestamp = utcTimestampFormatter.format(date);
+ gmtTimestamp = gmtTimestampFormatter.format(date);
hourAndMinute = (calendar.get(Calendar.HOUR_OF_DAY) * 100) +
calendar.get(Calendar.MINUTE);
@@ -245,14 +245,14 @@
/**
- * Retrieves a string containing the current time in UTC. The timestamp will
+ * Retrieves a string containing the current time in GMT. The timestamp will
* look like "20050101000000Z".
*
- * @return A string containing the current time in UTC.
+ * @return A string containing the current time in GMT.
*/
- public static String getUTCTime()
+ public static String getGMTTime()
{
- return utcTimestamp;
+ return gmtTimestamp;
}
--
Gitblit v1.10.0