Changeset 7691

Timestamp:

2004-07-02T08:11:08+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed a bug where switching to a file with no metadata would cause an exception because it was trying to select a non-existant row in the table.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

@@ -175 +175 @@
         builder.select_closest_metadata = metadatum;
     }
-    // Otherwise, select the appropriate row in the table
+    // Otherwise, select the appropriate row in the table...
     else {
-
-        // If there was no previous metadata, select the first row (if any)
-        if(metadatum == null) {
-        if(current_metadata.size() > 0) {
-            // We have to put the selection task onto the AWT thread
-            SelectionTask task = new SelectionTask(0);
-            SwingUtilities.invokeLater(task);
-            task = null;
-        }
+        // ...but only if there actually is some metadata in the table
+        if (current_metadata.size() == 0) {
+        return;
+        }
+
+        // If there was no previous metadata, select the first row
+        if (metadatum == null) {
+        // We have to put the selection task onto the AWT thread
+        SelectionTask task = new SelectionTask(0);
+        SwingUtilities.invokeLater(task);
+        task = null;
         return;
         }
@@ -205 +207 @@
         // Select the same row as before, except if it would select a different element - in which case select the first element
         ElementWrapper element = metadatum.getElement();
-        if(i < 0) {
+        if (i < 0) {
         Gatherer.println("Could not find suitable row to select!");
-        i=0; // select the first one
-        //return;
-        } else {
+        i = 0; // select the first one
+        }
+        else {
         Metadata newly_selected_metadatum = (Metadata) current_metadata.get(i);
         if (!newly_selected_metadatum.getElement().equals(element)) {
             // Try one row previous
             i--;
-            if(i < 0) {
+            if (i < 0) {
             Gatherer.println("Could not find suitable row to select!");
-            i=0;
-            //return;
-            } else {
-            
+            i = 0;
+            }
+            else {
             newly_selected_metadatum = (Metadata) current_metadata.get(i);
             if (!newly_selected_metadatum.getElement().equals(element)) {
                 Gatherer.println("Could not find suitable row to select!");
-                i=0;
-                //return;
+                i = 0;
             }
             }