Changeset 4444

Timestamp:

2003-06-03T11:19:35+12:00 (21 years ago)

Author:

jmt12

Message:

Bug fix to prevent the model builder attempting to build a model before a collection has been created.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java (modified) (5 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.");
+        ///ystem.err.println("There are " + file_nodes.length + " selected files.");
+        ///ystem.err.println("This metadata is attached to " + entry.getCount() + " of them.");
         if(entry.getCount() == file_nodes.length) {
         return true;
@@ -292 +292 @@
     // 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)) {
-                // Brute force solution... rebuild the table.
+        // Brute force solution... rebuild the table.
         if(file_nodes != null && file_nodes.length > 0) {
         current_metadata.clear();
@@ -299 +299 @@
         builder.start();
         }
-
-                /*
-                // If old metadata has been removed then remove it. Update the unassigned list if necessary (first checking if there are other metadata entries with the same element, and furthermore if the were inherited metadata being supressed).
-                if(old_data != null) {
-                System.err.println("Remove: " + old_data);
-                // Determine the level of this metadata
-                ArrayList modified_metadata = null;
-                if(old_data.isFileLevel()) {
-                modified_metadata = file_metadata;
-                }
-                else {
-                modified_metadata = inherited_metadata;
-                }
-                     
-                int index = -1;
-                if((index = modified_metadata.indexOf(old_data)) != -1) {
-                Metadata data = (Metadata) modified_metadata.get(index);
-                data.dec();
-                // If we just removed the last occurance of this metadata, delete it
-                if(data.getCount() == 0) {
-                remove(modified_metadata, data);
-                // If there are no further occurances of the element of this entry, add entry to unassigned_metadata.
-                boolean found = false;
-                ElementWrapper element = data.getElement();
-                // Search the current metadata
-                for(int i = 0; i < modified_metadata.size(); i++) {
-                Metadata sibling = (Metadata) modified_metadata.get(i);
-                if(sibling.getElement().equals(element)) {
-                found = true;
-                }
-                }
-                // And the inherited metadata if we haven't already
-                if(modified_metadata != inherited_metadata) {
-                for(int i = 0; !found && i < inherited_metadata.size(); i++) {
-                Metadata sibling = (Metadata) inherited_metadata.get(i);
-                if(sibling.getElement().equals(element)) {
-                found = true;
-                }
-                }
-                }
-                // If we get this far and still haven't found a match then we do something very tricky. We retrieve all of the metadata for the parent file and notice any inherited nodes that were previously overwritten by the metadata entry we removed. The reason we use the parent is that we can't just assume that the GDMDocument changes occured before this method was called. Thus our about-to-be-removed overwritting metadata may still be in effect if we just called getMetadata for this file.
-                if(!found) {
-                ArrayList parent_metadatum = Gatherer.c_man.getCollection().gdm.getMetadata((file_node.getFile()).getParentFile());
-                // For each piece of parent metadata
-                for(int i = parent_metadatum.size(); i > 0; i--) {
-                Metadata parent_metadata = (Metadata) parent_metadatum.get(i - 1);
-                // If we found some previously suppressed metadata then add it and say we found something.
-                if(!inherited_metadata.contains(parent_metadata)) {
-                ///ystem.err.println("Restoring overwritten inherited metadata: " + parent_metadata);
-                found = true;
-                parent_metadata.setCount(1);
-                parent_metadata.setFileLevel(false); // Has to be folder level doesn't it.
-                add(inherited_metadata, parent_metadata);
-                }
-                }
-                // Run this getMetadata again to restore all of the file level and source file entries (they would have changed to reflect the parents call.
-                Gatherer.c_man.getCollection().gdm.getMetadata(file_node.getFile());
-                }
-                // And only then, if we haven't found a substitute, may we add a null metadata.
-                if(!found) {
-                add(unassigned_metadata, new Metadata(data.getElement()));
-                }
-                }
-                }
-                }
-                // If new metadata has been assigned, remove its entry from the unassigned metadata list. Furthermore add the new entry to either the file or folder metadata list depending on its level. Remember to rebuild the common metadata lists.
-                if(new_data != null) {
-                ///ystem.err.println("Add: " + new_data);
-                // Create dummy 'unassigned' metadata from the new metadata and remove it from the unassigned list (if its even there)
-                remove(unassigned_metadata, new Metadata(new_data.getElement()));
-                // Determine if we are adding the new node at the file or folder level.
-                ArrayList modified_metadata = null;
-                if(new_data.isFileLevel()) {
-                modified_metadata = file_metadata;
-                // If its file metadata, and its set to overwrite, then we need to remove any row it would overwrite.
-                if(new_data.accumulates()) {
-                // All good.
-                }
-                else {
-                // Remove any entries in the inherited_metadata that would be overwritten
-                ElementWrapper element = new_data.getElement();
-                for(int i = 0; i < inherited_metadata.size(); i++) {
-                Metadata sibling = (Metadata) inherited_metadata.get(i);
-                if(sibling.getElement().equals(element)) {
-                inherited_metadata.remove(sibling);
-                }
-                }
-                }
-                }
-                else {
-                modified_metadata = inherited_metadata;
-                }
-                // And add it.
-                int index = -1;
-                if((index = modified_metadata.indexOf(new_data)) == -1) {
-                add(modified_metadata, new_data);
-                new_data.setCount(1);
-                }
-                else {
-                Metadata data = (Metadata) modified_metadata.get(index);
-                data.inc();
-                data = null;
-                }
-                modified_metadata = null;
-                }
-                // As a current visible table is most likely affected, update the table component. We do this by calling changeView so as to also update any compound list.
-                //changeView(current_view);
-                */
-    }
-    else {
-                ///ystem.err.println("FileNodes = " + file_nodes);
-                ///ystem.err.println("FileNode = " + file_node);
     }
     }
@@ -487 +375 @@
           
     public void run() {
-        Vector elements = Gatherer.c_man.getCollection().msm.getElements();
-                // Show some visual indication that building is occuring.
-                //assigned_metadata_view.setEnabled(false);
-                //unassigned_metadata_view.setEnabled(false);
-                //activity_bar.setMaximum(file_nodes.length + elements.size());
-                //activity_bar.setValue(0);
-                //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Building"));
-                //long start = System.currentTimeMillis();
-                
-        ArrayList known_elements = new ArrayList(); // Elements that have metadata assigned.
-        for(int i = 0; i < file_nodes.length; i++) {
-        File current_file = file_nodes[i].getFile();
-        // The current assigned metadata for this file.
-        ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
-        for(int j = 0; j < metadatum.size(); j++) {
-            Metadata data = (Metadata) metadatum.get(j);
-            // Determine the target list by the metadata level
-            ArrayList modified_metadata;
-            if(data.isFileLevel()) {
-            modified_metadata = file_metadata;
+        if(Gatherer.c_man != null && Gatherer.c_man.ready()) {
+        Vector elements = Gatherer.c_man.getCollection().msm.getElements();
+        // Show some visual indication that building is occuring.
+        //assigned_metadata_view.setEnabled(false);
+        //unassigned_metadata_view.setEnabled(false);
+        //activity_bar.setMaximum(file_nodes.length + elements.size());
+        //activity_bar.setValue(0);
+        //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Building"));
+        //long start = System.currentTimeMillis();
+        
+        ArrayList known_elements = new ArrayList(); // Elements that have metadata assigned.
+        for(int i = 0; i < file_nodes.length; i++) {
+            File current_file = file_nodes[i].getFile();
+            // The current assigned metadata for this file.
+            ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
+            for(int j = 0; j < metadatum.size(); j++) {
+            Metadata data = (Metadata) metadatum.get(j);
+            // Determine the target list by the metadata level
+            ArrayList modified_metadata;
+            if(data.isFileLevel()) {
+                modified_metadata = file_metadata;
+            }
+            else {
+                showInheritedMetadataWarning();
+                modified_metadata = inherited_metadata;
+            }
+            int index = -1;
+            // Don't show hidden metadata
+            // If the given metadata already exists in our list of modified metadata then increment its commonality count.
+            if((index = modified_metadata.indexOf(data)) != -1) {
+                data = (Metadata) modified_metadata.get(index);
+                ///ystem.err.println("Increasing count:" + element);
+                data.inc();
+                // If the table shown is stale, refresh it.
+                //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                // fireTableRowsUpdated(index, index);
+                //}
+                // We may have to update a compound list
+                //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+                if((index = current_metadata.indexOf(data)) == -1) {
+                fireTableRowsUpdated(index, index);
+                }
+                //}
+            }
+            // Ensure the metadata's element is in our list of showable elements.
+            else if(contains(elements, data.getElement())) {
+                ///ystem.err.println("Setting count to one: " + element);
+                data.setCount(1);
+                index = add(modified_metadata, data); // Add to assigned metadata.
+                known_elements.add(data.getElement());
+                // If the table shown is stale, refresh it.
+                //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                //   fireTableRowsInserted(index, index);
+                //}
+                // We may have to update a compound list
+                //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+                if((index = current_metadata.indexOf(data)) == -1) {
+                index = add(current_metadata, data);
+                fireTableRowsInserted(index, index);
+                }
+                else {
+                fireTableRowsUpdated(index, index);  
+                }
+                //}
+            }
+            else {
+                ///ystem.err.println("No.\n***** Cannot match element so it must be hidden, right? *****");
+            }
             }
-            else {
-            showInheritedMetadataWarning();
-            modified_metadata = inherited_metadata;
-            }
-            int index = -1;
-            // Don't show hidden metadata
-            // If the given metadata already exists in our list of modified metadata then increment its commonality count.
-            if((index = modified_metadata.indexOf(data)) != -1) {
-            data = (Metadata) modified_metadata.get(index);
-            ///ystem.err.println("Increasing count:" + element);
-            data.inc();
-            // If the table shown is stale, refresh it.
-            //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
-            // fireTableRowsUpdated(index, index);
+            //activity_bar.setValue(activity_bar.getValue() + 1);
+            Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        }
+                // Add entries for the currently unassigned metadata. You can determine these as the difference between elements and known_elements.
+        for(int k = 0; k < elements.size(); k++) {
+            // For each key.
+            ElementWrapper element = (ElementWrapper) elements.get(k);
+            if(!known_elements.contains(element)) {
+            Metadata data = new Metadata(element);
+            int index = add(unassigned_metadata, data);
+            // Inform everyone that the model has changed, but only if it affects the current view.
+            //if(current_view == SHOW_UNASSIGNED) {
+            //  fireTableRowsInserted(index, index);
             //}
-            // We may have to update a compound list
-            //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
-            if((index = current_metadata.indexOf(data)) == -1) {
-                fireTableRowsUpdated(index, index);
-            }
-            //}
-            }
-            // Ensure the metadata's element is in our list of showable elements.
-            else if(contains(elements, data.getElement())) {
-            ///ystem.err.println("Setting count to one: " + element);
-            data.setCount(1);
-            index = add(modified_metadata, data); // Add to assigned metadata.
-            known_elements.add(data.getElement());
-            // If the table shown is stale, refresh it.
-            //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
-            //   fireTableRowsInserted(index, index);
-            //}
-            // We may have to update a compound list
-            //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+            //else if(current_view == SHOW_ALL) {
             if((index = current_metadata.indexOf(data)) == -1) {
                 index = add(current_metadata, data);
@@ -547 +464 @@
             }
             else {
-                fireTableRowsUpdated(index, index);  
+                fireTableRowsUpdated(index, index);
             }
             //}
             }
-            else {
-            ///ystem.err.println("No.\n***** Cannot match element so it must be hidden, right? *****");
-            }
-        }
-        //activity_bar.setValue(activity_bar.getValue() + 1);
-        Gatherer.g_man.metaedit_pane.validateMetadataTable();
-        }
-                // Add entries for the currently unassigned metadata. You can determine these as the difference between elements and known_elements.
-        for(int k = 0; k < elements.size(); k++) {
-        // For each key.
-        ElementWrapper element = (ElementWrapper) elements.get(k);
-        if(!known_elements.contains(element)) {
-            Metadata data = new Metadata(element);
-            int index = add(unassigned_metadata, data);
-            // Inform everyone that the model has changed, but only if it affects the current view.
-            //if(current_view == SHOW_UNASSIGNED) {
-            //  fireTableRowsInserted(index, index);
-            //}
-            //else if(current_view == SHOW_ALL) {
-            if((index = current_metadata.indexOf(data)) == -1) {
-            index = add(current_metadata, data);
-            fireTableRowsInserted(index, index);
-            }
-            else {
-            fireTableRowsUpdated(index, index);
-            }
-            //}
-        }
-        //activity_bar.setValue(activity_bar.getValue() + 1);
-        Gatherer.g_man.metaedit_pane.validateMetadataTable();
-        }
-                //long end = System.currentTimeMillis();
-                ///ystem.err.println("Took " + (end - start) + "ms to build table.");
-                //assigned_metadata_view.setEnabled(true);
-                //unassigned_metadata_view.setEnabled(true);
-                //activity_bar.setValue(activity_bar.getMaximum());
-                //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
-        Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
-        fireTableDataChanged();
-                // Finally complete
+            //activity_bar.setValue(activity_bar.getValue() + 1);
+            Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        }
+        //long end = System.currentTimeMillis();
+        ///ystem.err.println("Took " + (end - start) + "ms to build table.");
+        //assigned_metadata_view.setEnabled(true);
+        //unassigned_metadata_view.setEnabled(true);
+        //activity_bar.setValue(activity_bar.getMaximum());
+        //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
+        Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
+        fireTableDataChanged();
+        }
+        else {
+
+        }
+        // Finally complete (even if we didn't do anything).
         complete = true;
-                // If in the in between we've been asked to select a certain metadata, we action that now.
-        if(selected_metadata != null) {
+        // If in the in between we've been asked to select a certain metadata, we action that now.
+        if(getRowCount() > 0 && selected_metadata != null) {
         setSelectedMetadata(selected_metadata);
         }