summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/java
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-26 11:01:55 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-26 11:01:55 +0000
commit7c31d46d39dd8cc84cfefd9e87b38bf206d179c4 (patch)
tree2ec85f2a4cb8da7d3e7a8ae7bf9ec497b6ebf6dc /libjava/classpath/java
parent4018023280bb9d9c0a8c5a65294ebdd5bea9a0b4 (diff)
downloadppe42-gcc-7c31d46d39dd8cc84cfefd9e87b38bf206d179c4.tar.gz
ppe42-gcc-7c31d46d39dd8cc84cfefd9e87b38bf206d179c4.zip
* 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/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 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");
OpenPOWER on IntegriCloud