Added capability to select multiple documents in flat file mode too,

mgricken · mgricken · commit 64292becb14d · 2007-02-21T20:38:06.000Z
just like in project mode in the previous commit. The context
(right-click) menu will be generated according to the selection.

M    src/edu/rice/cs/util/docnavigation/JListNavigator.java
M    src/edu/rice/cs/util/docnavigation/JListSortNavigatorTest.java


git-svn-id: file:///tmp/test-svn/trunk@4171 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/util/docnavigation/JListNavigator.java b/drjava/src/edu/rice/cs/util/docnavigation/JListNavigator.java
@@ -90,7 +90,7 @@ public JListNavigator() {
   private void init(DefaultListModel m) {
     _model = m;
     setModel(m);
-    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     addListSelectionListener(new ListSelectionListener() {
       /** Called when the list value has changed. Should only run in the event thread.
        *  @param e the event corresponding to the change
@@ -324,13 +324,19 @@ public boolean selectDocumentAt(final int x, final int y) {
     * @param y the y coordinate of the navigator pane
     * @return true if the item is currently selected
     */
-  public boolean isSelectedAt(int x, int y) { return false; }
+  public boolean isSelectedAt(int x, int y) {
+    synchronized(_model) {
+      final int idx = locationToIndex(new java.awt.Point(x,y));
+      if (idx == -1) return false;
+      return isSelectedIndex(idx);
+    }
+  }
 
   /** @return the renderer for this object. */
   public Component getRenderer(){ return _renderer; }
   
-  /** @return the number of selected items. Always 1 for JListSortNavigator */
-  public int getSelectionCount() { return 1; }
+  /** @return the number of selected items. */
+  public int getSelectionCount() { return getSelectedIndices().length; }
   
   /** @return true if at least one group of INavigatorItems is selected; always false for JListNavigator */
   public boolean isGroupSelected() { return false; }
@@ -344,13 +350,14 @@ public boolean selectDocumentAt(final int x, final int y) {
   /** @return true if at least one document is selected; always true for JListNavigator */
   public boolean isDocumentSelected() { return true; }
   
-  /** @return the number of documents selected. Always 1 for JListSortNavigator */
-  public int getDocumentSelectedCount() { return 1; }
+  /** @return the number of documents selected. Same as getSelectionCount for JListSortNavigator. */
+  public int getDocumentSelectedCount() { return getSelectionCount(); }
 
   /** @return the documents currently selected. Only runs in event thread. */
   @SuppressWarnings("unchecked") public java.util.List<ItemT> getSelectedDocuments() {
-    ArrayList<ItemT> l = new ArrayList<ItemT>(1);
-    l.add((ItemT)getSelectedValue());
+    Object[] selected = getSelectedValues();
+    ArrayList<ItemT> l = new ArrayList<ItemT>(selected.length);
+    for (Object o: selected) { l.add((ItemT)o); }
     return l;
   }
   
diff --git a/drjava/src/edu/rice/cs/util/docnavigation/JListSortNavigatorTest.java b/drjava/src/edu/rice/cs/util/docnavigation/JListSortNavigatorTest.java
@@ -92,4 +92,50 @@ public void testTraversalOps() {
     assertTrue("getDocuments test", Arrays.equals(docsArray, new DummyINavigatorItem[] {i1, i2, i3, i4}));
   }
   
+  /**
+   * Test of getting the list of selected items.
+   */
+  public void testGetSelectedDocuments() {
+    list.clearSelection();
+    list.addSelectionInterval(0, 1);
+    assertEquals("Two items should be selected", 2, list.getSelectionCount());
+    assertEquals("Two items should be selected", 2, list.getDocumentSelectedCount());
+    assertEquals("Zero groups should be selected", 0, list.getGroupSelectedCount());
+    java.util.List<DummyINavigatorItem> l = list.getSelectedDocuments();
+    assertEquals("Two items should be selected", 2, l.size());
+    assertEquals("Wrong item 1", i1, l.get(0));
+    assertEquals("Wrong item 2", i2, l.get(1));
+
+    list.clearSelection();
+    list.addSelectionInterval(0, 3);
+    assertEquals("Four items should be selected", 4, list.getSelectionCount());
+    assertEquals("Four items should be selected", 4, list.getDocumentSelectedCount());
+    assertEquals("Zero groups should be selected", 0, list.getGroupSelectedCount());
+    l = list.getSelectedDocuments();
+    assertEquals("Four items should be selected", 4, l.size());
+    assertEquals("Wrong item 1", i1, l.get(0));
+    assertEquals("Wrong item 2", i2, l.get(1));
+    assertEquals("Wrong item 3", i3, l.get(2));
+    assertEquals("Wrong item 4", i4, l.get(3));
+
+    list.clearSelection();
+    list.addSelectionInterval(0, 1);
+    list.addSelectionInterval(2, 3);
+    assertEquals("Four items should be selected", 4, list.getSelectionCount());
+    assertEquals("Four items should be selected", 4, list.getDocumentSelectedCount());
+    assertEquals("Zero groups should be selected", 0, list.getGroupSelectedCount());
+    l = list.getSelectedDocuments();
+    assertEquals("Four items should be selected", 4, l.size());
+    assertEquals("Wrong item 1", i1, l.get(0));
+    assertEquals("Wrong item 2", i2, l.get(1));
+    assertEquals("Wrong item 3", i3, l.get(2));
+    assertEquals("Wrong item 4", i4, l.get(3));
+    
+    list.clearSelection();
+    assertEquals("Zero items should be selected", 0, list.getSelectionCount());
+    assertEquals("Zero items should be selected", 0, list.getDocumentSelectedCount());
+    assertEquals("Zero groups should be selected", 0, list.getGroupSelectedCount());
+    l = list.getSelectedDocuments();
+    assertEquals("Zero items should be selected", 0, l.size());
+  }
 }
