Changeset 4662

Timestamp:

2003-06-13T17:21:33+12:00 (21 years ago)

Author:

mdewsnip

Message:

Now rebuilds model when elementChanged events are received (eg. when someone adds or removes an element in a metadata set).

File:

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

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

@@ -127 +127 @@
 
 
-    /** Returns the data class of the specified column. */
-//      private Class getColumnClass(int col) {
-//      if(col == 2) {
-//          return JButton.class;
-//      }
-//      return String.class;
-//      }
-
-
     /* Called to retrieve the Metadata record that matches a certain row. Usually caused by the user selectiong a row in the table. It synchronized so that the model doesn't up and change while we're trying to retrieve the indicated element. */
     public synchronized Metadata getMetadataAtRow(int row) {
@@ -238 +229 @@
     /** Called whenever an element in a set is added, edited or removed from the metadata set manager. We listen for this just incase the name of one of the elements currently shown changes. After that the table will be up to date, as the element references are otherwise live. */
     public void elementChanged(MSMEvent event) {
-    MSMAction profile = event.getProfile();
-    if(profile != null) {
-        // Retrieve the element's new name (hopefully returned by getValue()).
-        String name = profile.getTarget();
-        for(int row = 0; row < current_metadata.size(); row++) {
-        if(getValueAt(row, 0).equals(name)) {
-            fireTableCellUpdated(row, 0);
-        }
-        }
-        name = null;
-    }
-    profile = null;
-    event = null;
+    // Brute force solution... rebuild the table.
+    rebuildModel();
     }
 
@@ -257 +237 @@
     public void metadataChanged(MSMEvent event) {
     FileNode file_node = event.getRecord();
-    ///ystem.err.println("File node effected");
     // First check whether this record is one of those that we have showing.
-    if(file_nodes != null && file_node != null && ArrayTools.contains(file_nodes, file_node)) {
+    if (file_nodes != null && file_nodes.length > 0 && file_node != null && ArrayTools.contains(file_nodes, file_node)) {
         // Brute force solution... rebuild the table.
-        if(file_nodes != null && file_nodes.length > 0) {
-        Metadata select_exact_metadata = null;
-        Metadata select_closest_metadata = null;
-        boolean had_warning = false;
-        // If there is a current builder...
-        if (builder != null) {
-            // ...and it is still building...
-            if (!builder.complete) {
-            select_exact_metadata = builder.select_exact_metadata;
-            select_closest_metadata = builder.select_closest_metadata;
-            had_warning = builder.had_warning;
-            // ...kill it...
-            builder.kill();
-            }
-            // ...and wait until it dies
-            while (!builder.complete) { }
-        }
-
-        // Create model builder
-        builder = new ModelBuilder();
-        builder.start();
-        builder.select_exact_metadata = select_exact_metadata;
-        builder.select_closest_metadata = select_closest_metadata;
-        builder.had_warning = had_warning;
-        }
+        rebuildModel();
     }
     }
@@ -299 +254 @@
     public void valueChanged(MSMEvent event) {
     // Don't care. Tra-la-la-la-la.
+    }
+
+
+    private void rebuildModel()
+    {
+    Metadata select_exact_metadata = null;
+    Metadata select_closest_metadata = null;
+    boolean had_warning = false;
+    // If there is a current builder...
+    if (builder != null) {
+        // ...and it is still building...
+        if (!builder.complete) {
+        select_exact_metadata = builder.select_exact_metadata;
+        select_closest_metadata = builder.select_closest_metadata;
+        had_warning = builder.had_warning;
+        // ...kill it...
+        builder.kill();
+        }
+        // ...and wait until it dies
+        while (!builder.complete) { }
+    }
+
+    // Create model builder
+    builder = new ModelBuilder();
+    builder.start();
+    builder.select_exact_metadata = select_exact_metadata;
+    builder.select_closest_metadata = select_closest_metadata;
+    builder.had_warning = had_warning;
     }
 
@@ -312 +295 @@
     }
     return false;
-    }
-
-
-    /** Alphabetically inserts the new_metadata in the target vector. */
-    private int add(ArrayList target, Metadata new_metadata) {
-    int i = 0;
-    while(i < target.size()) {
-        Metadata current = (Metadata)target.get(i);
-        if(current.compareTo(new_metadata) > 0) {
-        target.add(i, new_metadata);
-        return i;
-        }
-        i++;
-    }
-    target.add(new_metadata);
-    return i;
     }
 
@@ -433 +400 @@
         killed = true;
         notify();
+    }
+
+
+    /** Alphabetically inserts the new_metadata in the target vector. */
+    private int add(ArrayList target, Metadata new_metadata) {
+        int i = 0;
+        while(i < target.size()) {
+        Metadata current = (Metadata)target.get(i);
+        if(current.compareTo(new_metadata) > 0) {
+            target.add(i, new_metadata);
+            return i;
+        }
+        i++;
+        }
+        target.add(new_metadata);
+        return i;
     }