From 14321893db58a975cf737cf18631ce7d0ab28cdf Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 28 Apr 2005 20:47:50 +0000 Subject: [PATCH] 2005-04-28 Tom Tromey * javax/swing/Timer.java (drainEvents, queueEvent): Now package-private. 2005-04-28 Audrius Meskauskas * javax/swing/Timer.java (constructor): Assigning initialDelay. 2005-04-28 Audrius Meskauskas * javax/swing/Timer.java (Waker.run): firing the first action event. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98939 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 15 +++++++++++++++ libjava/javax/swing/Timer.java | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c9bd0ca3a42..ff6451e7c39 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2005-04-28 Tom Tromey + + * javax/swing/Timer.java + (drainEvents, queueEvent): Now package-private. + +2005-04-28 Audrius Meskauskas + + * javax/swing/Timer.java + (constructor): Assigning initialDelay. + +2005-04-28 Audrius Meskauskas + + * javax/swing/Timer.java + (Waker.run): firing the first action event. + 2005-04-28 Michael Koch * javax/swing/Timer.java: Reordered all fields and methods, diff --git a/libjava/javax/swing/Timer.java b/libjava/javax/swing/Timer.java index eac5832a381..5b5380f87e4 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) { -- 2.11.0