aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/java
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-02-26 12:01:55 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2007-02-26 12:01:55 +0100
commit07008ce4eefaff81554a120838c3f7d9adb74906 (patch)
tree2ec85f2a4cb8da7d3e7a8ae7bf9ec497b6ebf6dc /libjava/classpath/java
parent681a691966414d9633b76c710424eff77b5620bf (diff)
downloadgcc-07008ce4eefaff81554a120838c3f7d9adb74906.zip
gcc-07008ce4eefaff81554a120838c3f7d9adb74906.tar.gz
gcc-07008ce4eefaff81554a120838c3f7d9adb74906.tar.bz2
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
Diffstat (limited to 'libjava/classpath/java')
-rw-r--r--libjava/classpath/java/util/TimeZone.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java
index cede9fc..5329e06 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");