From 7c31d46d39dd8cc84cfefd9e87b38bf206d179c4 Mon Sep 17 00:00:00 2001 From: jakub Date: Mon, 26 Feb 2007 11:01:55 +0000 Subject: * java/util/TimeZone.java (getDefaultDisplayName): Don't check if TimeZone is instanceof SimpleTimeZone. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122330 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/java/util/TimeZone.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libjava/classpath/java') diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java index cede9fc789f..5329e06c11f 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"); -- cgit v1.2.3