From 97f41b50c52bd40de12f7ceb8eabc3fc7669b727 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Tue, 15 Oct 2013 08:49:10 +0000 Subject: QPID-5138: Provide time zone name for dalight saving time only when daylight saving time is in effect git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1532248 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/management/plugin/servlet/rest/action/ListTimeZones.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker-plugins/management-http') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java index d46e90f2bd..56bc7b1bf7 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/ListTimeZones.java @@ -22,6 +22,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest.action; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.TimeZone; @@ -47,6 +48,7 @@ public class ListTimeZones implements Action List timeZoneDetails = new ArrayList(); String[] ids = TimeZone.getAvailableIDs(); long currentTime = System.currentTimeMillis(); + Date currentDate = new Date(currentTime); for (String id : ids) { int cityPos = id.indexOf("/"); @@ -60,7 +62,7 @@ public class ListTimeZones implements Action TimeZone tz = TimeZone.getTimeZone(id); int offset = tz.getOffset(currentTime)/60000; String city = id.substring(cityPos + 1).replace('_', ' '); - timeZoneDetails.add(new TimeZoneDetails(id, tz.getDisplayName(true, TimeZone.SHORT), offset, city, region)); + timeZoneDetails.add(new TimeZoneDetails(id, tz.getDisplayName(tz.inDaylightTime(currentDate), TimeZone.SHORT), offset, city, region)); break; } } -- cgit v1.2.1