Changeset 8864

Timestamp:

2004-12-20T17:28:18+13:00 (19 years ago)

Author:

kjdon

Message:

Matthew's changes - added a catch statement

File:

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

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

@@ -2569 +2569 @@
         if(result == 0) {
             ignore = true;
+            //System.err.println("Current element's getElement: " + current_element.getElement()); //Debug
             msm.removeElement(current_element);
             // Clear selection
@@ -2670 +2671 @@
      */
     public void actionPerformed(ActionEvent event) {
-        if(current_value_node != null) {                 
+        if(current_value_node != null) {    
         int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Value")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the current selected value
@@ -3100 +3101 @@
             
             mds_tree.setSelectionPath(selPath); //Select node right-clicked on
-                
-                if(t.type == ELEMENT){
-                    
-                    elementPopup.show(e.getComponent(),
-                           e.getX(), e.getY());
+            
+            if(t.type == ELEMENT){
+            
+            elementPopup.show(e.getComponent(),
+                      e.getX(), e.getY());
+            }
+            else if(t.type == ELEMENT){
+            
+            subfieldPopup.show(e.getComponent(),
+                       e.getX(), e.getY());
+            }
+            else if(t.type == ROOT){
+            
+            setPopup.show(e.getComponent(),
+                      e.getX(), e.getY());
+            }
+            else if(t.type == SET){
+            
+            setPopup.show(e.getComponent(),
+                      e.getX(), e.getY());
+            }
                 }
-                else if(t.type == ELEMENT){
-                    
-                    subfieldPopup.show(e.getComponent(),
-                           e.getX(), e.getY());
-                }
-                else if(t.type == ROOT){
-                    
-                    setPopup.show(e.getComponent(),
-                           e.getX(), e.getY());
-                }
-                else if(t.type == SET){
-                    
-                    setPopup.show(e.getComponent(),
-                           e.getX(), e.getY());
-                }
-                }
+        catch(Exception NullPointerException) {
+            //Right-clicked in tree area, but no item to select. Do nothing.
+        }
+
                 finally {
                     ;