Changeset 4329

Timestamp:

2003-05-26T15:50:54+12:00 (21 years ago)

Author:

jmt12

Message:

Metadata changes update appropriately - John

File:

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

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

@@ -39 +39 @@
 import org.greenstone.gatherer.msm.MSMEvent;
 import org.greenstone.gatherer.msm.MSMListener;
+import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.ArrayTools;
 /** Provides the model for a GTable component, filling it with metadata values for the choosen files or folders. The model also provides several different view of this data; assigned folder metadata, assigned file metadata, all assigned metadata, unassigned metadata, and all metadata. It also differentiates between metadata that is common to all of the files or folders, and that which isn't. The building of the actual model is done on a separate thread so that the gui remains responsive, and the gui is intermitantly updated by this thread. Updating of the model is triggered by events recieved from the metadata set manager in terms of new or obsolete metadata. A new model is rebuilt whenever the user selects a different group of files or folders.
@@ -50 +51 @@
      private ArrayList current_metadata    = new ArrayList();
      /** The metadata currently assigned at the file level. */
-     private ArrayList file_metadata       = new ArrayList();
+     private ArrayList file_metadata       = null; // new ArrayList();
      /** The metadata currently assigned at the folder level. */
-     private ArrayList inherited_metadata  = new ArrayList();
+     private ArrayList inherited_metadata  = null; // new ArrayList();
      /** The metadata currently unassigned. */
-     private ArrayList unassigned_metadata = new ArrayList();
+     private ArrayList unassigned_metadata = null; // new ArrayList();
      /** The file nodes this model is built upon. */
      private FileNode[] file_nodes;
@@ -79 +80 @@
      public GTableModel(JTable table) {
           this.builder = null;
+          this.file_metadata = current_metadata;
+          this.inherited_metadata = current_metadata;
           this.table = table;
+          this.unassigned_metadata = current_metadata;
           //changeView();
           // Register this model with the msm manager.
@@ -149 +153 @@
      public void changeView(int view) {
           //current_view = view;
+          /*
           switch(view) {
           case SHOW_ASSIGNED:
@@ -155 +160 @@
                 current_metadata.addAll(file_metadata);
                 current_metadata.addAll(inherited_metadata);
-                Collections.sort(current_metadata);
+                Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
                 break;
           case SHOW_FILE:
@@ -171 +176 @@
           default:
                 // SHOW_ALL
-                ///ystem.err.println("Show all");
+                System.err.println("Show all");
                 // Create a new array from the three other arrays.
                 current_metadata = new ArrayList();
@@ -177 +182 @@
                 current_metadata.addAll(inherited_metadata);
                 current_metadata.addAll(unassigned_metadata);
-                Collections.sort(current_metadata);
+                Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
           }
           // Inform everyone that the model has changed.
           fireTableDataChanged();
+          */
      }
 
@@ -286 +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)) {
-                Metadata old_data = event.getOldMetadata();
-                Metadata new_data = event.getNewMetadata();
+                // Brute force solution... rebuild the table.
+                if(file_nodes != null && file_nodes.length > 0) {
+                     current_metadata.clear();
+                     // Create model builder
+                     builder = new ModelBuilder();
+                     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) {
-                     ///ystem.err.println("Remove: " + old_data);
+                     System.err.println("Remove: " + old_data);
                      // Determine the level of this metadata
-                     ArrayList modified_metadata;
+                     ArrayList modified_metadata = null;
                      if(old_data.isFileLevel()) {
                           modified_metadata = file_metadata;
@@ -299 +312 @@
                           modified_metadata = inherited_metadata;
                      }
+                     
                      int index = -1;
                      if((index = modified_metadata.indexOf(old_data)) != -1) {
@@ -356 +370 @@
                      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;
+                     ArrayList modified_metadata = null;
                      if(new_data.isFileLevel()) {
                           modified_metadata = file_metadata;
@@ -392 +406 @@
                 // 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 {
@@ -571 +586 @@
                 //activity_bar.setValue(activity_bar.getMaximum());
                 //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
+                Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
+                fireTableDataChanged();
                 // Finally complete
                 complete = true;