Index: javax/swing/tree/DefaultTreeCellEditor.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultTreeCellEditor.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- javax/swing/tree/DefaultTreeCellEditor.java 2 Sep 2005 18:03:25 -0000 1.15 +++ javax/swing/tree/DefaultTreeCellEditor.java 12 Sep 2005 16:34:17 -0000 1.16 @@ -513,6 +513,8 @@ // Cell may not be currently editable, but may need to start timer. if (shouldStartEditingTimer(event)) startEditingTimer(); + else if (timer.isRunning()) + timer.stop(); return false; }