Changeset 11601 for trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

Timestamp:

2006-04-06T15:05:44+12:00 (18 years ago)

Author:

mdewsnip

Message:

Moved the KeyListener from GatherPane into DragTree and removed the KeyListener from EnrichPane so now there is only one (consistent) key listener between the two panes (ie. you can now press "Enter" and "Delete" in the collection tree of the Enrich pane).

File:

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

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

@@ -210 +210 @@
     public void display() {
     // Create Components.
-    KeyListenerImpl key_listener = new KeyListenerImpl();
     MouseListenerImpl mouse_listener = new MouseListenerImpl();
-    this.addKeyListener(key_listener);
 
     // Workspace Tree
@@ -229 +227 @@
     group.add(workspace_tree);
     workspace_tree.addFocusListener(this);
-    workspace_tree.addKeyListener(key_listener);
     workspace_tree.addMouseListener(mouse_listener);
     workspace_tree.addMouseListener(Gatherer.g_man.foa_listener);
@@ -261 +258 @@
     group.add(collection_tree);
     collection_tree.addFocusListener(this);
-    collection_tree.addKeyListener(key_listener);
     collection_tree.addMouseListener(mouse_listener);
     collection_tree.addMouseListener(Gatherer.g_man.foa_listener);
@@ -756 +752 @@
 
 
-    /** This class listens for certain key presses, such as [Enter] or [Delete], and responds appropriately. */
-    private class KeyListenerImpl
-    extends KeyAdapter {
-    private boolean vk_left_pressed = false;
-    /** Called whenever a key that was pressed is released, it is this action that will cause the desired effects (this allows for the key event itself to be processed prior to this listener dealing with it). */
-    public void keyReleased(KeyEvent event) {
-        ///ystem.err.println("Key Release detected. " + event.getKeyCode());
-        if(event.getKeyCode() == KeyEvent.VK_DELETE) {
-        // Get the selected files from the tree and removal them using the default dnd removal method.
-        // Find the active tree (you've made selections in).
-        DragTree tree = (DragTree) group.getActive();
-        // Fudge things a bit
-        group.setSource(tree);
-        // Determine the selection.
-        TreePath paths[] = tree.getSelectionPaths();
-        if(paths != null) {
-            FileNode[] source_nodes = new FileNode[paths.length];
-            for(int i = 0; i < source_nodes.length; i++) {
-            source_nodes[i] = (FileNode) paths[i].getLastPathComponent();
-            }
-            Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
-            source_nodes = null;
-        }
-        }
-        else if(event.getKeyCode() == KeyEvent.VK_ENTER) {
-        // Get the first selected file.
-        DragTree tree = (DragTree)event.getSource();
-        TreePath path = tree.getSelectionPath();
-        if(path != null) {
-            File file = ((FileNode)path.getLastPathComponent()).getFile();
-            if (file != null && file.isFile()) {
-            Gatherer.f_man.openFileInExternalApplication(file);
-            }
-            else {
-            if(!tree.isExpanded(path)) {
-                tree.expandPath(path);
-            }
-            else {
-                tree.collapsePath(path);
-            }
-            }
-        }
-        } else if (event.getKeyCode() == KeyEvent.VK_UP || event.getKeyCode() == KeyEvent.VK_DOWN) {
-        DragTree tree = (DragTree)event.getSource();
-        // we need to manually do the up and down selections
-        boolean up = (event.getKeyCode() == KeyEvent.VK_UP);
-        int current_row = tree.getLeadSelectionRow();
-        tree.setImmediate(true);
-        if (up) {
-            if (current_row > 0) {
-            tree.clearSelection();
-            tree.setSelectionRow(current_row-1);
-            }
-        } else {
-            if (current_row < tree.getRowCount()-1){
-            tree.clearSelection();
-            tree.setSelectionRow(current_row+1);
-            }
-        }
-        tree.setImmediate(false);
-        } else if (event.getKeyCode() == KeyEvent.VK_LEFT) {
-        // left key on a file shifts the selection to the parent folder
-        DragTree tree = (DragTree)event.getSource();
-        TreePath path = tree.getLeadSelectionPath();
-        if(path != null) {
-            File file = ((FileNode)path.getLastPathComponent()).getFile();
-            if(file != null) {
-            if (file.isFile() || vk_left_pressed) {
-                vk_left_pressed = false;
-                TreePath parent_path = path.getParentPath();
-                if (parent_path != null && parent_path.getParentPath() != null) {
-                // if this file is in the top level folder, don't move the focus 
-                tree.setImmediate(true);
-                tree.clearSelection();
-                tree.setSelectionPath(parent_path);
-                tree.setImmediate(false);
-                }
-            }
-            }
-        }
-        }
-    }
-    
-    // we need to watch for left clicks on an unopened folder - should shift the focus to teh parent folder. But because there is some other mysterious key listener that does opening and closing folders on right and left clicks, we must detect the situation before the other handler has done its job, and process it after. 
-    public void keyPressed(KeyEvent event) {
-        if (event.getKeyCode() == KeyEvent.VK_LEFT) {
-        // left key on  closed directory shifts the selection to the parent folder
-        DragTree tree = (DragTree)event.getSource();
-        TreePath path = tree.getLeadSelectionPath();
-        if(path == null) return; 
-        File file = ((FileNode)path.getLastPathComponent()).getFile();
-        if(file == null) return;
-        
-        if (file.isDirectory() && tree.isCollapsed(path)) {
-            vk_left_pressed = true;
-        }
-        }
-    }   
-    }
-    
     /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. 
      * Used when creating a new shortcut to a folder */