Changeset 4565 for trunk/gli

Timestamp:

2003-06-11T13:53:57+12:00 (21 years ago)

Author:

jmt12

Message:

2030118, 2030119: MetaAudit view now has columns sorted by natural ordering and correctly reflects the current selection in the visible tree.

Location:

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

Files:

• MetaAuditFrame.java (modified) (2 diffs)
• MetaAuditModel.java (modified) (2 diffs)
• MetaAuditTable.java (modified) (1 diff)

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

@@ -151 +151 @@
      */
     public void valueChanged(TreeSelectionEvent event) {
-    if(event.getSource() instanceof JTree) {
-        TreePath paths[] = Gatherer.g_man.metaedit_pane.collection_tree.getSelectionPaths();
+    Object source = event.getSource();
+    if(source instanceof JTree) {
+        TreePath paths[] = ((JTree)source).getSelectionPaths();
         if(paths != null) {
         records = new FileNode[paths.length];
@@ -171 +172 @@
     Component glass_pane = getGlassPane();
     if(waiting) {
-                // Show wait cursor.
+        // Show wait cursor.
         glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         glass_pane.setVisible(true);
     }
     else {
-                // Hide wait cursor.
+        // Hide wait cursor.
         glass_pane.setVisible(false);
         glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

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

@@ -45 +45 @@
 import org.greenstone.gatherer.msm.Metadata;
 import org.greenstone.gatherer.msm.MetadataSetManager;
+import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.valuetree.GValueNode;
 /**
@@ -58 +59 @@
     public MetaAuditModel(FileNode records[]) {
     this.elements = new ArrayList(Gatherer.c_man.getCollection().msm.getElements());
-    Collections.sort(this.elements);
+    Collections.sort(this.elements, MSMUtils.METADATA_COMPARATOR);
     this.data = new MetadataTableCache(elements.size() + 1);
     // Work our way through the record array provided, adding files, skipping blanks and recursively searching directories.

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

@@ -105 +105 @@
     public void newModel(FileNode records[]) {
     if(records == null || records.length == 0) {
+        setModel(new DefaultTableModel());
         return;
     }