Changeset 4625 for trunk

Timestamp:

2003-06-12T18:07:10+12:00 (21 years ago)

Author:

mdewsnip

Message:

Added a new ModelBuilder which is a bit cleaner than the old one, and handles correctly some cases the old one doesn't. Hasn't had a lot of testing tho'.

File:

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

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

@@ -277 +277 @@
     if(0 <= row && row < current_metadata.size()) {
         Metadata entry = (Metadata) current_metadata.get(row);
-        ///ystem.err.println("There are " + file_nodes.length + " selected files.");
-        ///ystem.err.println("This metadata is attached to " + entry.getCount() + " of them.");
+        // System.err.println("Of the " + file_nodes.length + " selected files, " + entry + " is attached to " + entry.getCount() + " of them.");
+        // System.err.println("There are " + file_nodes.length + " selected files.");
+        // System.err.println("This metadata is attached to " + entry.getCount() + " of them.");
         if(entry.getCount() == file_nodes.length) {
         return true;
@@ -380 +381 @@
     }
 
+
     private class ModelBuilder
+    extends Thread {
+
+    public boolean complete = false;
+    public Metadata selected_metadata = null;;
+    private boolean had_warning = false;
+
+    public void run()
+    {
+        if (!Gatherer.c_man.ready()) {
+        System.err.println("Not ready!");
+        return;
+        }
+
+        // System.err.println("Building metadata model...");
+        Vector elements = Gatherer.c_man.getCollection().msm.getElements();
+        ArrayList known_elements = new ArrayList();
+        current_metadata.clear();
+
+        for (int i = 0; i < file_nodes.length; i++) {
+        File current_file = file_nodes[i].getFile();
+        // System.err.println("File: " + current_file);
+
+        // Get the currently assigned metadata for this file
+        ArrayList metadata = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
+        for (int j = 0; j < metadata.size(); j++) {
+            Metadata metadatum = (Metadata) metadata.get(j);
+            // System.err.println("  Metadatum: " + metadatum + " (" + metadatum.getCount() + ")");
+
+            // If a piece of metadata is at folder level, display the warning
+            if (!metadatum.isFileLevel()) {
+            showInheritedMetadataWarning();
+            }
+
+            // If the piece of metadata is in the list, increment its count
+            int index = current_metadata.indexOf(metadatum);
+            if (index >= 0) {
+            Metadata existing = (Metadata) current_metadata.get(index);
+            existing.inc();
+            }
+            // Otherwise add it to the list
+            else {
+            metadatum.setCount(1);
+            index = add(current_metadata, metadatum);
+            fireTableRowsInserted(index, index);
+
+            // Remember we have seen this element
+            ElementWrapper element = metadatum.getElement();
+            if (known_elements.contains(element) == false) {
+                known_elements.add(element);
+            }
+            }
+        }
+        }
+
+        // Make sure each element has a piece of metadata (even if blank)
+        for (int i = 0; i < elements.size(); i++) {
+        ElementWrapper element = (ElementWrapper) elements.get(i);
+        // System.err.println("Element: " + element);
+
+        // If we haven't seen this metadata element, add it now
+        if (!known_elements.contains(element)) {
+            Metadata metadatum = new Metadata(element);
+            metadatum.setCount(file_nodes.length);
+
+            // Add it to the table
+            int index = add(current_metadata, metadatum);
+            fireTableRowsInserted(index, index);
+        }
+        }
+
+        // Sort the metadata and update the table
+        Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
+        fireTableDataChanged();
+
+        // Processing complete
+        complete = true;
+
+        // If while processing we've been asked to select a certain metadata, do it now
+        if (selected_metadata != null) {
+        setSelectedMetadata(selected_metadata);
+        }
+    }
+
+
+    private void showInheritedMetadataWarning()
+    {
+        if (!had_warning) {
+        had_warning = true;
+        Runnable task = new Runnable() {
+            public void run() {
+                WarningDialog dialog = new WarningDialog("warning.InheritedMetadata", false);
+                dialog.display();
+                dialog.dispose();
+                dialog = null;
+            }
+            };
+        SwingUtilities.invokeLater(task);
+        }
+    }
+    }
+
+
+    private class OldModelBuilder
     extends Thread {
 
@@ -391 +497 @@
     public void run() {
         if(Gatherer.c_man != null && Gatherer.c_man.ready()) {
+        System.err.println("Building metadata model...");
         Vector elements = Gatherer.c_man.getCollection().msm.getElements();
         // Show some visual indication that building is occuring.
@@ -403 +510 @@
         for(int i = 0; i < file_nodes.length; i++) {
             File current_file = file_nodes[i].getFile();
+            System.err.println("File: " + current_file);
             // The current assigned metadata for this file.
             ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
+            System.err.println("Pieces of metadata: " + metadatum.size());
             for(int j = 0; j < metadatum.size(); j++) {
             Metadata data = (Metadata) metadatum.get(j);
+            System.err.println("  Metadata value: " + data);
             // Determine the target list by the metadata level
             ArrayList modified_metadata;
@@ -463 +573 @@
         }
                 // Add entries for the currently unassigned metadata. You can determine these as the difference between elements and known_elements.
+        System.err.println("Number of elements: " + elements.size());
+        System.err.println("Number of known elements: " + known_elements.size());
         for(int k = 0; k < elements.size(); k++) {
             // For each key.
             ElementWrapper element = (ElementWrapper) elements.get(k);
+            System.err.println("Element " + k + ": " + element);
             if(!known_elements.contains(element)) {
+            System.err.println("(Doesn't contain)");
             Metadata data = new Metadata(element);
             int index = add(unassigned_metadata, data);
@@ -475 +589 @@
             //else if(current_view == SHOW_ALL) {
             if((index = current_metadata.indexOf(data)) == -1) {
+                System.err.println("Adding " + data + " to " + current_metadata);
                 index = add(current_metadata, data);
                 fireTableRowsInserted(index, index);