Changeset 9108

Timestamp:

2005-02-18T14:54:12+13:00 (19 years ago)

Author:

kjdon

Message:

fixed up the right click selection on the colleciton tree

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -58 +58 @@
 import org.greenstone.gatherer.file.WorkspaceTreeNode;
 import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.gui.ExplodeMetadataPrompt;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.DragGroup;
@@ -488 +489 @@
         this.tree = tree;
 
-        // Get the paths currently selected in the tree
-        selection_paths = tree.getSelectionPaths();
-
+        // Note we have to use setImmediate() with the set selction paths
+        // otherwise the selection doesn't get updated until after the 
+        // popup comes up.
+
+        // the right click position
+        TreePath right_click_path = tree.getPathForLocation(event.getX(), event.getY());
+        if (right_click_path == null) {
+        // user has clicked outside of the tree, clear the selection
+        selection_paths = null;
+        tree.setImmediate(true);
+        tree.clearSelection();
+        tree.setImmediate(false);
+        } else {
+        // Get the paths currently selected in the tree
+        selection_paths = tree.getSelectionPaths();
+        if (selection_paths == null) {
+            // nothing currently selected - we shift the selection to 
+            // the node that was right clicked on
+            selection_paths = new TreePath[1];
+            selection_paths[0] = right_click_path;
+            tree.setImmediate(true);
+            tree.setSelectionPath(right_click_path);
+            tree.setImmediate(false);
+        } else if (selection_paths.length == 1 && ! selection_paths[0].equals( right_click_path)) {
+            tree.setImmediate(true);
+            tree.clearSelection();
+            tree.setSelectionPath(right_click_path);
+            tree.setImmediate(false);
+            selection_paths[0] = right_click_path;
+        } else {
+            // we had multiply selected paths in the tree.
+            // if we clicked on one of those paths, then use all the 
+            // current selection, otherwise clear the selection and 
+            // select the one we right clicked on
+            boolean clicked_in_selection = false;
+            for (int i=0; i<selection_paths.length; i++) {
+            if (selection_paths[i].equals(right_click_path)) {
+                clicked_in_selection = true;
+                break;
+            }
+            }
+            if (!clicked_in_selection) {
+            // want the tree to update right away
+            tree.setImmediate(true);
+            tree.clearSelection();
+            tree.setSelectionPath(right_click_path);
+            tree.setImmediate(false);
+            selection_paths = new TreePath[1];
+            selection_paths[0] = right_click_path;
+            }
+        }
+        }
+        // finally we have the correct selection paths!!
+        
         // Create an appropriate context menu, based on what is selected
         buildContextMenu(selection_paths);
@@ -628 +680 @@
         // Explode metadata database
         else if (source == explode_metadata_database) {
+        ExplodeMetadataPrompt emp = new ExplodeMetadataPrompt(node.getFile());
+        //emp.destroy();
         // !! TO DO: Open dialog with options to explode_metadata_databases.pl, then run it
         }