Fixes the bug

mgricken · mgricken · commit a13a05584468 · 2008-06-12T23:27:00.000Z
[ 1992497 ] Folders and Bins Cannot Be Selected http://sourceforge.net/tracker/index.php?func=detail&aid=1992497&group_id=44253&atid=438935 Folders and bins now can be selected. If a folder is closed, the selection in the navigator is moved to the document shown in the Definitions Pane, thus making sure that something is selected in the navigator, and that the selection is visible and not in a collapsed subtree. M src/edu/rice/cs/drjava/ui/MainFrame.java M src/edu/rice/cs/util/docnavigation/JTreeSortNavigator.java git-svn-id: file:///tmp/test-svn/trunk@4514 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -530,6 +530,11 @@ public void actionPerformed(ActionEvent ae) {
     public void actionPerformed(ActionEvent ae) { 
       _closeFolder();
       _findReplace.updateFirstDocInSearch();
+      // set the document currently visible in the definitions pane as active
+      // document in the document navigator
+      // this makes sure that something is selected in the navigator after the
+      // folder was closed
+      _model.getDocumentNavigator().setActiveDoc(_currentDefPane.getOpenDefDocument());
     }
   };
   
diff --git a/drjava/src/edu/rice/cs/util/docnavigation/JTreeSortNavigator.java b/drjava/src/edu/rice/cs/util/docnavigation/JTreeSortNavigator.java
@@ -805,6 +805,9 @@ public ItemT getCurrent() {
   /** Returns the model lock. */
   public Object getModelLock() { return _model; }
   
+  // This visitor is executed in getCurrent(). The case methods for files and strings return
+  // null, which caused DrJava to revert to the previous selection in requestSelectionUpdate().
+  // That code has now been commented out; this note is only for documentation purposes.
   private final NodeDataVisitor<ItemT, ItemT> _leafVisitor = new NodeDataVisitor<ItemT, ItemT>() {
     public ItemT fileCase(File f, Object... p){ return null; }
     public ItemT stringCase(String s, Object... p){ return null; }
@@ -943,9 +946,12 @@ public String generatePathString(TreePath tp) {
   /** If the currently selected item is not an INavigatorItem, select the one given. Only runs in event thread. */
   public void requestSelectionUpdate(ItemT ini) {
 //    synchronized (_model) {
-    if (getCurrent() == null) { // the currently selected node is not a leaf
-      setActiveDoc(ini);
-    }
+    // This code checked if the selected node was a leaf, i.e. a Java source file,
+    // and if it wasn't, reverts the selection. The code was commented out to allow
+    // selection of file nodes (i.e. folders) and string nodes (i.e. [ Source Files ], etc.)
+//    if (getCurrent() == null) { // the currently selected node is not a leaf
+//      setActiveDoc(ini);
+//    }
 //    }
   }  
   
