summaryrefslogtreecommitdiffstats
path: root/libjava/java/text/SimpleDateFormat.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/text/SimpleDateFormat.java')
-rw-r--r--libjava/java/text/SimpleDateFormat.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java
index e2f70cddcc6..c0332bf71d8 100644
--- a/libjava/java/text/SimpleDateFormat.java
+++ b/libjava/java/text/SimpleDateFormat.java
@@ -454,7 +454,11 @@ public class SimpleDateFormat extends DateFormat
withLeadingZeros(theCalendar.get(Calendar.HOUR)-1,p.size,buffer);
break;
case TIMEZONE_FIELD:
- // TODO
+ TimeZone zone = theCalendar.getTimeZone();
+ boolean isDST = theCalendar.get(Calendar.DST_OFFSET) != 0;
+ // FIXME: XXX: This should be a localized time zone.
+ String zoneID = zone.getDisplayName(isDST, p.size > 3 ? TimeZone.LONG : TimeZone.SHORT);
+ buffer.append(zoneID);
break;
default:
throw new IllegalArgumentException("Illegal pattern character");
@@ -1088,7 +1092,7 @@ public class SimpleDateFormat extends DateFormat
/*
case TIMEZONE_FIELD:
- // TODO
+ // TODO: FIXME: XXX
break;
*/
OpenPOWER on IntegriCloud