diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-26 11:01:55 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-26 11:01:55 +0000 |
| commit | 7c31d46d39dd8cc84cfefd9e87b38bf206d179c4 (patch) | |
| tree | 2ec85f2a4cb8da7d3e7a8ae7bf9ec497b6ebf6dc /libjava | |
| parent | 4018023280bb9d9c0a8c5a65294ebdd5bea9a0b4 (diff) | |
| download | gcc-7c31d46d39dd8cc84cfefd9e87b38bf206d179c4.tar.gz | |
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rw-r--r-- | libjava/classpath/java/util/TimeZone.java | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index b76844ae590..0c980f852a2 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 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"); |