diff options
| author | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-07-03 22:28:31 +0000 |
|---|---|---|
| committer | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-07-03 22:28:31 +0000 |
| commit | 9fcf2d2352094b519bf39c483e5b72206da76eed (patch) | |
| tree | 8f2fbc649dbc73fea58dac391c2d192ef4079f11 | |
| parent | 8170f5a9fa34d522c6baeb9301cf18a52f5634ac (diff) | |
| download | classpath-9fcf2d2352094b519bf39c483e5b72206da76eed.tar.gz | |
2006-07-04 Audrius Meskauskas <AudriusA@Bioinformatics.org>
PR 28061
* javax/swing/JTree.java (COLLAPSED): Initialise to Boolean.FALSE.
(EXPANDED): Initialise to Boolean.TRUE.
* javax/swing/plaf/basic/BasicTreeUI.java (completeUIInstall):
First configure layout cache and then set the assigned value
as row mapper. Set the root visibility property.
(toggleExpandState): Obtains expansion state from the layout cache.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | javax/swing/JTree.java | 4 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicTreeUI.java | 7 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,13 @@ +2006-07-04 Audrius Meskauskas <AudriusA@Bioinformatics.org> + + PR 28061 + * javax/swing/JTree.java (COLLAPSED): Initialise to Boolean.FALSE. + (EXPANDED): Initialise to Boolean.TRUE. + * javax/swing/plaf/basic/BasicTreeUI.java (completeUIInstall): + First configure layout cache and then set the assigned value + as row mapper. Set the root visibility property. + (toggleExpandState): Obtains expansion state from the layout cache. + 2006-07-03 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/lang/management/MemoryPoolMXBean.java: diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java index f7583ad69..6530265b9 100644 --- a/javax/swing/JTree.java +++ b/javax/swing/JTree.java @@ -1392,9 +1392,9 @@ public class JTree extends JComponent implements Scrollable, Accessible public static final String EXPANDS_SELECTED_PATHS_PROPERTY = "expandsSelectedPaths"; - private static final Object EXPANDED = new Object(); + private static final Object EXPANDED = Boolean.TRUE; - private static final Object COLLAPSED = new Object(); + private static final Object COLLAPSED = Boolean.FALSE; private boolean dragEnabled; diff --git a/javax/swing/plaf/basic/BasicTreeUI.java b/javax/swing/plaf/basic/BasicTreeUI.java index 4c139fe46..24d6d4036 100644 --- a/javax/swing/plaf/basic/BasicTreeUI.java +++ b/javax/swing/plaf/basic/BasicTreeUI.java @@ -845,9 +845,9 @@ public class BasicTreeUI updateRenderer(); updateDepthOffset(); setSelectionModel(tree.getSelectionModel()); - treeState = createLayoutCache(); - treeSelectionModel.setRowMapper(treeState); configureLayoutCache(); + treeState.setRootVisible(tree.isRootVisible()); + treeSelectionModel.setRowMapper(treeState); updateSize(); } @@ -1848,7 +1848,8 @@ public class BasicTreeUI */ protected void toggleExpandState(TreePath path) { - if (tree.isExpanded(path)) + // tree.isExpanded(path) would do the same, but treeState knows faster. + if (treeState.isExpanded(path)) tree.collapsePath(path); else tree.expandPath(path); |