[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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c9bd0ca3a42b19488f5eb50b80bd2df6c1e29bfe..ff6451e7c391e3f8176f024ac41699ae21eac035 100644 (file)
--- 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 eac5832a381be05ba24661b9485811392d48fcf0..5b5380f87e452bc01a5b1aa01b90824735ec67e2 100644 (file)
--- 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)
       {