Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/gui/metaaudit

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

Location:

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit

Files:

• HeaderListener.java (modified) (2 diffs)
• MetaAuditModel.java (deleted)
• MetaAuditTable.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/HeaderListener.java

@@ -37 +37 @@
 package org.greenstone.gatherer.gui.metaaudit;
 
-/**************************************************************************************
- * Title:        Gatherer
- * Description:  The Gatherer: a tool for gathering and enriching a digital collection.
- * Company:      The University of Waikato
- * Written:      03/09/02
- * Revised:      
- * @author John Thompson, 9826509
- * @version 2.3
- **************************************************************************************/
+
 import de.qfs.lib.gui.TableModelSorter;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import org.greenstone.gatherer.metadata.MetadataAuditTableModel;
 
 public class HeaderListener
@@ -67 +60 @@
     Filter filter_model = table.getFilter();
     Autofilter filter = filter_model.getFilter(clicked_column);
-    MetaAuditModel model = table.getOriginalModel();
+    MetadataAuditTableModel model = table.getOriginalModel();
     ArrayList default_values = model.getColumnValues(clicked_column);
     String column_name = model.getColumnName(clicked_column);

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditTable.java

@@ -44 +44 @@
 import javax.swing.table.*;
 import org.greenstone.gatherer.file.FileNode;
+import org.greenstone.gatherer.metadata.MetadataAuditTableModel;
+
 
 /**
@@ -63 +65 @@
     private MetaAuditFrame parent_frame;
 
-    private MetaAuditModel model;
+    private MetadataAuditTableModel metadata_audit_table_model;
 
     private SortedTableHelper helper;
@@ -83 +85 @@
     }
 
-    public MetaAuditModel getOriginalModel() {
-    return model;
-    }
+
+   public MetadataAuditTableModel getOriginalModel()
+   {
+      return metadata_audit_table_model;
+   }
+
 
     public TableModelSorter getSorter() {
@@ -105 +110 @@
     wait(true);
     initial_state = true;
-    ///ystem.err.println("Build new Model - should only be called once per click!");
-    model = new MetaAuditModel(records);
-    setModel(model);
-    filter = new Filter(model.getColumnCount());
+    // System.err.println("Build new Model - should only be called once per click!");
+    metadata_audit_table_model = new MetadataAuditTableModel();
+    metadata_audit_table_model.rebuild(records);
+    setModel(metadata_audit_table_model);
+    filter = new Filter(metadata_audit_table_model.getColumnCount());
     helper = new SortedTableHelper (this, filter, new DefaultTableModelSorter(), header_renderer, null);
     helper.prepareTable();