Changeset 8837

Timestamp:

2004-12-17T09:27:35+13:00 (19 years ago)

Author:

mdewsnip

Message:

Right-clicking on a table row now selects it correctly. By Matthew Whyte.

File:

• trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -556 +556 @@
     button_label_pane.setLayout(new GridLayout(4,1,0,2));
     button_label_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,2));
-    //button_label_pane.add(set_label);
-    // button_label_pane.add(file_label);
-    //button_label_pane.add(element_label);
-    //button_label_pane.add(attribute_label);
-    //button_label_pane.add(value_label);
 
     inner_button_pane.setLayout(new GridLayout(4,3,0,2));       
-    //inner_button_pane.add(add_set);
-    //inner_button_pane.add(edit_set_pane);
-    //inner_button_pane.add(remove_set);
-        
-     //inner_button_pane.add(add_file);
-     //inner_button_pane.add(edit_file_pane);
-    // inner_button_pane.add(remove_file);
-        
-    //inner_button_pane.add(add_element);
-    //inner_button_pane.add(edit_element_pane);
-    //inner_button_pane.add(remove_element);
-    //inner_button_pane.add(add_attribute);
-    //inner_button_pane.add(edit_attribute);
-    //inner_button_pane.add(remove_attribute);
-    //inner_button_pane.add(add_value);
-    //inner_button_pane.add(edit_value);
-    //inner_button_pane.add(remove_value);
           
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -769 +747 @@
         // File -> Exit
         if (event_source == file_exit) {
-                exit();
-              /*  
-                if(set_changed == true) {
-                    int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
-        
-                 //   System.out.println("Exit: "+result);
-                    if(result == 0) {
-                        msm.save();
-                        exit();
-                    }
-                    else{
-                        exit();
-                    }
- 
-                }
-                else{
-                    
-                    exit();
-                }*/
+                exit(); //The exit() method checks if data needs saving.
+              
         }
 
@@ -3108 +3069 @@
         private void maybeShowPopup(MouseEvent e) {
            
-           //TreeNode oTreeNode = e.getSource().
+         //TreeNode oTreeNode = e.getSource().
          int selRow = mds_tree.getRowForLocation(e.getX(), e.getY());
      TreePath selPath = mds_tree.getPathForLocation(e.getX(), e.getY());
+     Point p = null;
             if (e.isPopupTrigger()) {
                // setPopup.show(e.getComponent(),
@@ -3134 +3096 @@
                 
                     GEMSNode t = (GEMSNode)selPath.getLastPathComponent();
-                
-                
+            
+            mds_tree.setSelectionPath(selPath); //Select node right-clicked on
                 
                 if(t.type == ELEMENT){
@@ -3165 +3127 @@
                     
              }
-             else if(e.getSource() == set_attributes){
-                 
+             else if(e.getSource() == set_attributes){ //When right-click on table of set attributes
+         
+         //Select the table row that was right-clicked on.
+         p = e.getPoint();
+         set_attributes.changeSelection(set_attributes.rowAtPoint(p), set_attributes.columnAtPoint(p), false, false);
+
                  attributePopup.show(e.getComponent(),
+                           e.getX(), e.getY());  
+             }
+             else if(e.getSource() == element_attributes)  { //When right-click on table of element attributes
+                
+         //Select the table row that was right-clicked on.
+         p = e.getPoint();
+         element_attributes.changeSelection(element_attributes.rowAtPoint(p), element_attributes.columnAtPoint(p), false, false);
+
+         attributePopup.show(e.getComponent(),
                            e.getX(), e.getY());
-                 
-             }
-             else if(e.getSource() == element_attributes)  {
-                 attributePopup.show(e.getComponent(),
-                           e.getX(), e.getY());
-                 
              }