aboutsummaryrefslogtreecommitdiff
path: root/libjava/javax
diff options
context:
space:
mode:
authorMichael Koch <mkoch@gcc.gnu.org>2005-04-28 20:47:50 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2005-04-28 20:47:50 +0000
commitb4ad897d570a81c1c1e92470b66915244bcc7ec9 (patch)
tree06eb652b3609caca03d3e01b21e026495497dc38 /libjava/javax
parent67468e8eda640eb0cd6c64186533ad412137512f (diff)
downloadgcc-b4ad897d570a81c1c1e92470b66915244bcc7ec9.zip
gcc-b4ad897d570a81c1c1e92470b66915244bcc7ec9.tar.gz
gcc-b4ad897d570a81c1c1e92470b66915244bcc7ec9.tar.bz2
[multiple changes]
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. From-SVN: r98939
Diffstat (limited to 'libjava/javax')
-rw-r--r--libjava/javax/swing/Timer.java7
1 files changed, 6 insertions, 1 deletions
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)
{