Don't check if TimeZone is an instance of SimpleTimeZone.

2007-02-26  Jakub Jelinek  <jakub@redhat.com>

	* java/util/TimeZone.java (getDefaultDisplayName): Don't
	check if TimeZone is instanceof SimpleTimeZone.

Signed-off-by: Andrew John Hughes <ahughes@redhat.com>

2 files changed, 6 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index f935a450a..ecec2e97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* java/util/TimeZone.java (getDefaultDisplayName): Don't
+	check if TimeZone is instanceof SimpleTimeZone.
+
 2006-09-13  Andrew Haley  <aph@redhat.com>
 
 	* java/util/PriorityQueue.java: Throw IllegalArgumentException for
diff --git a/java/util/TimeZone.java b/java/util/TimeZone.java
index 276602e67..8436440f8 100644
--- a/java/util/TimeZone.java
+++ b/java/util/TimeZone.java
@@ -1404,14 +1404,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 
   private String getDefaultDisplayName(boolean dst)
   {
-    int offset = getRawOffset();
-    if (dst && this instanceof SimpleTimeZone)
-      {
-        // ugly, but this is a design failure of the API:
-        // getDisplayName takes a dst parameter even though
-        // TimeZone knows nothing about daylight saving offsets.
-        offset += ((SimpleTimeZone) this).getDSTSavings();
-      }
+    int offset = getRawOffset() + (dst ? getDSTSavings() : 0);
 
     CPStringBuilder sb = new CPStringBuilder(9);
     sb.append("GMT");