Index: javax/swing/JTree.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v retrieving revision 1.32 diff -u -r1.32 JTree.java --- javax/swing/JTree.java 8 Aug 2005 14:05:35 -0000 1.32 +++ javax/swing/JTree.java 10 Aug 2005 17:43:43 -0000 @@ -1297,7 +1297,7 @@ // Don't expand if last path component is a leaf node. if ((path == null) || (treeModel.isLeaf(path.getLastPathComponent()))) return; - + setExpandedState(path, true); } @@ -1503,21 +1503,9 @@ return null; } - private void checkExpandParents(TreePath path) throws ExpandVetoException - { - - TreePath parent = path.getParentPath(); - - if (parent != null) - checkExpandParents(parent); - - fireTreeWillExpand(path); - } - private void doExpandParents(TreePath path, boolean state) { - TreePath parent = path.getParentPath(); - + TreePath parent = path.getParentPath(); if (isExpanded(parent)) { nodeStates.put(path, state ? EXPANDED : COLLAPSED); @@ -1536,17 +1524,6 @@ return; TreePath parent = path.getParentPath(); - - try - { - if (parent != null) - checkExpandParents(parent); - } - catch (ExpandVetoException e) - { - // Expansion vetoed. - return; - } doExpandParents(path, state); }