From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 26 Feb 2007 11:01:55 +0000 (+0100)
Subject: TimeZone.java (getDefaultDisplayName): Don't check if TimeZone is instanceof SimpleTi... 
X-Git-Tag: releases/gcc-4.3.0~6599
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07008ce4eefaff81554a120838c3f7d9adb74906;p=thirdparty%2Fgcc.git

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

	* 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 b76844ae590a..0c980f852a2b 100644
--- 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 cede9fc789ff..5329e06c11fe 100644
--- 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");