Don't require intervention to work in applets, just fix ourselves.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2269 6335cc39-0255-0410-8fd6-9bcaacd3b74c

src/java/com/samskivert/util/Interval.java

@@ -46,16 +46,13 @@ public abstract class Interval
     }
 
     /**
-     * Clears out the {@link Timer} currently being used to schedule intervals. This method is
+     * This may be removed.
-     * normally not needed as a single timer thread can be used for the lifetime of the VM, but in
+     *
-     * certain situations (in applets) the timer thread will be forcibly killed when the applet is
+     * @deprecated
-     * destroyed but the classes will not be unloaded. In that case, the applet should call this
-     * method in its own destroy method. A new timer thread will then be created the next time an
-     * interval is scheduled.
      */
-    public static synchronized void resetTimer ()
+    @Deprecated
+    public static void resetTimer ()
     {
-        _timer = null;
     }
 
     /**
@@ -108,10 +105,29 @@ public abstract class Interval
         TimerTask task = new IntervalTask();
         _task = task;
 
-        if (repeatDelay == 0L) {
+        // try twice to schedule the task- see comment inside the catch
-            getTimer().schedule(task, initialDelay);
+        for (int tryCount = 0; tryCount < 2; tryCount++) {
-        } else {
+            try {
-            getTimer().scheduleAtFixedRate(task, initialDelay, repeatDelay);
+                if (repeatDelay == 0L) {
+                    _timer.schedule(task, initialDelay);
+                } else {
+                    _timer.scheduleAtFixedRate(task, initialDelay, repeatDelay);
+                }
+                return;
+
+            } catch (IllegalStateException ise) {
+                // Timer.schedule will only throw this if the TimerThead was shut down.
+                // This may happen automatically in Applets, so we need to create a new
+                // Timer now. Note that in a multithreaded environment it may be possible
+                // to have more than one Timer, but that shouldn't be an issue.
+                if (tryCount == 0) {
+                    _timer = createTimer();
+
+                } else {
+                    // the second time through? Throw it!
+                    throw ise;
+                }
+            }
         }
     }
 
@@ -156,12 +172,9 @@ public abstract class Interval
         }
     }
 
-    protected static synchronized Timer getTimer ()
+    protected static Timer createTimer ()
     {
-        if (_timer == null) {
+        return new Timer(/*JDK1.5 "samskivert Interval Timer",*/ true);
-            _timer = new Timer(/*JDK1.5 "samskivert Interval Timer",*/ true);
-        }
-        return _timer;
     }
 
     /**
@@ -205,5 +218,5 @@ public abstract class Interval
     protected volatile TimerTask _task;
 
     /** The daemon timer used to schedule all intervals. */
-    protected static Timer _timer;
+    protected static Timer _timer = createTimer();
 }