TimeZone.java (getDefaultDisplayName): Don't check if TimeZone is instanceof SimpleTi...

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

From-SVN: r122330

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index b76844ae590afeb24b4462bb06678b7dda129f3b..0c980f852a2ba1c0425db41d8af113edf05c8a6c 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -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.
+
 2007-02-21  Gary Benson  <gbenson@redhat.com>
 
        * java/util/GregorianCalendar.java,

diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java
index cede9fc789ff0ec65556823ed6eec400b982072b..5329e06c11fe4a75d58c5e831923ca2e5ef303ae 100644 (file)
--- a/libjava/classpath/java/util/TimeZone.java
+++ b/libjava/classpath/java/util/TimeZone.java
@@ -1402,14 +1402,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);
 
     StringBuffer sb = new StringBuffer(9);
     sb.append("GMT");