diff options
| -rw-r--r-- | libjava/ChangeLog | 15 | ||||
| -rw-r--r-- | libjava/javax/swing/Timer.java | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c9bd0ca..ff6451e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2005-04-28 Tom Tromey <tromey@redhat.com> + + * javax/swing/Timer.java + (drainEvents, queueEvent): Now package-private. + +2005-04-28 Audrius Meskauskas <audriusa@bluewin.ch> + + * javax/swing/Timer.java + (constructor): Assigning initialDelay. + +2005-04-28 Audrius Meskauskas <audriusa@bluewin.ch> + + * javax/swing/Timer.java + (Waker.run): firing the first action event. + 2005-04-28 Michael Koch <konqueror@gmx.de> * javax/swing/Timer.java: Reordered all fields and methods, diff --git a/libjava/javax/swing/Timer.java b/libjava/javax/swing/Timer.java index eac5832..5b5380f 100644 --- a/libjava/javax/swing/Timer.java +++ b/libjava/javax/swing/Timer.java @@ -70,6 +70,8 @@ public class Timer { sleep(initialDelay); + queueEvent(); + while (running) { try @@ -92,6 +94,8 @@ public class Timer } catch (Exception e) { + // The timer is no longer running. + running = false; } } } @@ -189,6 +193,7 @@ public class Timer public Timer(int d, ActionListener listener) { delay = d; + initialDelay = d; if (listener != null) addActionListener(listener); @@ -468,7 +473,7 @@ public class Timer * Post a scheduled event to the event queue. * Package-private to avoid an accessor method. */ - private void queueEvent() + void queueEvent() { synchronized (queueLock) { |