summaryrefslogtreecommitdiff
path: root/javax/swing/Timer.java
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2004-09-04 21:14:05 +0000
committerMark Wielaard <mark@klomp.org>2004-09-04 21:14:05 +0000
commitd3b4922ac911978002581c2aefc8dd272e6e0de0 (patch)
treebc88ad8ed5d61850d377201b2c81af5d4111d685 /javax/swing/Timer.java
parentfa25dc3a60ff76d97595dbc4c6a20bb66558ab51 (diff)
downloadclasspath-d3b4922ac911978002581c2aefc8dd272e6e0de0.tar.gz
2004-09-04 Graydon Hoare <graydon@redhat.com>
* javax/swing/Box.java: Fix setting of layout in ctor. * javax/swing/JScrollPane.java: Scroll headers as well. * javax/swing/JTable.java: Reimplement. * javax/swing/JViewPort.java: Only add non-null children. * javax/swing/ScrollPaneLayout.java: Correct header calculations. * javax/swing/Timer.java: Fix stopping null waker. * javax/swing/plaf/basic/BasicTableHeaderUI.java: New file. * javax/swing/plaf/basic/BasicTableUI.java: New file. * javax/swing/table/DefaultTableCellRenderer.java: Configure. * javax/swing/table/DefaultTableColumnModel.java: Flesh out. * javax/swing/table/DefaultTableModel.java: Clean up. * javax/swing/table/JTableHeader.java: Implement.
Diffstat (limited to 'javax/swing/Timer.java')
-rw-r--r--javax/swing/Timer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/javax/swing/Timer.java b/javax/swing/Timer.java
index a005346f7..529ad1934 100644
--- a/javax/swing/Timer.java
+++ b/javax/swing/Timer.java
@@ -394,7 +394,8 @@ public class Timer implements Serializable
public void stop()
{
running = false;
- waker.interrupt();
+ if (waker != null)
+ waker.interrupt();
synchronized (queueLock)
{
queue = 0;