Changeset 8432

Timestamp:

2004-11-03T11:31:46+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed the problem where filtering empty values causes NPEs, and now displays all the values assigned to a metadata element, not just the last.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/metaaudit/MetaAuditTable.java (modified) (5 diffs)
• metadata/MetadataAuditTableModel.java (modified) (7 diffs)

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

@@ -57 +57 @@
     private boolean initial_state;
 
-    private boolean ready;
-
     private Filter filter;
 
@@ -64 +62 @@
 
     private MetaAuditFrame parent_frame;
+
+    private MetaAuditRenderer cell_renderer;
 
     private MetadataAuditTableModel metadata_audit_table_model;
@@ -73 +73 @@
     public MetaAuditTable(MetaAuditFrame parent_frame) {
     super();
+    this.cell_renderer = new MetaAuditRenderer();
     this.header_renderer = new HeaderRenderer();
     this.parent_frame = parent_frame;
     getTableHeader().addMouseListener(new HeaderListener(parent_frame, this));
     setAutoResizeMode(AUTO_RESIZE_OFF);
-    setDefaultRenderer(ArrayList.class, new MetaAuditRenderer());
-    ready = true;
     }
 
@@ -120 +119 @@
     TableColumnModel column_model = getColumnModel();
     for(int i = 0; i < column_model.getColumnCount(); i++) {
+        column_model.getColumn(i).setCellRenderer(cell_renderer);
         column_model.getColumn(i).setHeaderRenderer(header_renderer);
     }
@@ -129 +129 @@
     wait(true);
     super.tableChanged(e);
-    if(ready) {
-        // Create storage area
-        ArrayList heights[] = new ArrayList[dataModel.getRowCount()];
-        int widths_value[] = new int[dataModel.getColumnCount()];
-        ArrayList widths[] = new ArrayList[dataModel.getColumnCount()];
-        // Iterate through cell values finding tallest and widest for each row and column respectively.
-        for(int j = 0; j < dataModel.getRowCount(); j++) {
-        for(int k = 0; k < dataModel.getColumnCount(); k++) {
-            Object object = dataModel.getValueAt(j, k);
-            if(object instanceof ArrayList) {
-            ArrayList data = (ArrayList) object;
-            if(heights[j] == null || data.size() > heights[j].size()) {
-                heights[j] = data;
+
+    // Create storage area
+    ArrayList heights[] = new ArrayList[dataModel.getRowCount()];
+    int widths_value[] = new int[dataModel.getColumnCount()];
+    ArrayList widths[] = new ArrayList[dataModel.getColumnCount()];
+
+    // Iterate through cell values finding tallest and widest for each row and column respectively.
+    for (int j = 0; j < dataModel.getRowCount(); j++) {
+        for (int k = 0; k < dataModel.getColumnCount(); k++) {
+        Object object = dataModel.getValueAt(j, k);
+        if (object instanceof ArrayList) {
+            ArrayList data = (ArrayList) object;
+            if (heights[j] == null || data.size() > heights[j].size()) {
+            heights[j] = data;
+            }
+            String longest = "";
+            for (int i = 0; i < data.size(); i++) {
+            String temp = data.get(i).toString();
+            if (temp.length() > longest.length()) {
+                longest = temp;
             }
-            String longest = "";
-            for(int i = 0; i < data.size(); i++) {
-                String temp = data.get(i).toString();
-                if(temp.length() > longest.length()) {
-                longest = temp;
-                }
-                temp = null;
-            }
-            if(widths[k] == null || longest.length() > widths_value[k]) {
-                widths_value[k] = longest.length();
-                widths[k] = data;
-            }
-            longest = null;
-            data = null;
+            }
+            if (widths[k] == null || longest.length() > widths_value[k]) {
+            widths_value[k] = longest.length();
+            widths[k] = data;
             }
         }
         }
-        // Now assign the dimensions we have determined to be the largest.
-        TableCellRenderer renderer = getDefaultRenderer(ArrayList.class);
-        for(int l = 0; l < heights.length; l++) {
-        if(heights[l] != null) {
-            Component component = renderer.getTableCellRendererComponent(this, heights[l], false, false, 0, 0);
-            Dimension size = component.getPreferredSize();
-            setRowHeight(l, size.height);
-            size = null;
-            component = null;
+    }
+
+    // Now assign the dimensions we have determined to be the largest.
+    for (int l = 0; l < heights.length; l++) {
+        if (heights[l] != null) {
+        Component component = cell_renderer.getTableCellRendererComponent(this, heights[l], false, false, 0, 0);
+        Dimension size = component.getPreferredSize();
+        setRowHeight(l, size.height);
+        }
+    }
+    for (int m = 0; m < widths.length; m++) {
+        if (widths[m] != null) {
+        Component component = cell_renderer.getTableCellRendererComponent(this, widths[m], false, false, 0, 0);
+        Dimension size = component.getPreferredSize();
+        int width = size.width + MARGIN;
+        if (width > (2 * parent_frame.getSize().width) / 3) {
+            width = (2 * parent_frame.getSize().width) / 3;
         }
+
+        Component header = header_renderer.getTableCellRendererComponent(this, dataModel.getColumnName(m), false, false, 0, 0);
+        if (header.getPreferredSize().width + MARGIN > width) {
+            width = header.getPreferredSize().width + MARGIN;
+        }
+        columnModel.getColumn(m).setPreferredWidth(width);
         }
-        heights = null;
-        for(int m = 0; m < widths.length; m++) {
-        if(widths[m] != null) {
-            Component component = renderer.getTableCellRendererComponent(this, widths[m], false, false, 0, 0);
-            Dimension size = component.getPreferredSize();
-            int width = size.width + MARGIN;
-            if(width > (2 * parent_frame.getSize().width) / 3) {
-            width = (2 * parent_frame.getSize().width) / 3;
-            }
-            Component header = header_renderer.getTableCellRendererComponent(this, dataModel.getColumnName(m), false, false, 0, 0);
-            if(header.getPreferredSize().width + MARGIN > width) {
-            width = header.getPreferredSize().width + MARGIN;
-            }
-            columnModel.getColumn(m).setPreferredWidth(width);
-            size = null;
-            component = null;
-        }
-        }
-        widths = null;
-        renderer = null;
     }
+
     wait(initial_state);
     }
+
 
     public void sortOrderChanged(TableModelSorterEvent event) {

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java

@@ -34 +34 @@
 import javax.swing.table.*;
 import org.greenstone.gatherer.Configuration;
-import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.file.FileNode;
 
@@ -74 +73 @@
     for (int i = 0; i < metadata_audit_table_entries.size(); i++) {
         MetadataAuditTableEntry metadata_audit_table_entry = (MetadataAuditTableEntry) metadata_audit_table_entries.get(i);
-        MetadataValueTreeNode metadata_value_tree_node = metadata_audit_table_entry.getMetadataValueTreeNode(col);
-        column_values.add(metadata_value_tree_node.toString());
+        MetadataValueTreeNode[] metadata_value_tree_nodes = metadata_audit_table_entry.getMetadataValueTreeNodes(col);
+        if (metadata_value_tree_nodes != null) {
+        for (int j = 0; j < metadata_value_tree_nodes.length; j++) {
+            column_values.add(metadata_value_tree_nodes[j].toString());
+        }
+        }
     }
 
@@ -97 +100 @@
     }
 
+    ArrayList cell_values = new ArrayList();
     MetadataAuditTableEntry metadata_audit_table_entry = (MetadataAuditTableEntry) metadata_audit_table_entries.get(row);
-    return metadata_audit_table_entry.getMetadataValueTreeNode(col);
+    MetadataValueTreeNode[] metadata_value_tree_nodes = metadata_audit_table_entry.getMetadataValueTreeNodes(col);
+    if (metadata_value_tree_nodes != null) {
+        for (int j = 0; j < metadata_value_tree_nodes.length; j++) {
+        cell_values.add(metadata_value_tree_nodes[j].toString());
+        }
+    }
+
+    return cell_values;
     }
 
@@ -144 +155 @@
     {
     private File file = null;
-    private MetadataValue[] metadata_values = null;
+    private ArrayList[] metadata_values = null;
 
 
@@ -151 +162 @@
         this.file = file;
 
-        metadata_values = new MetadataValue[metadata_elements.size()];
+        metadata_values = new ArrayList[metadata_elements.size()];
+        for (int i = 0; i < metadata_values.length; i++) {
+        metadata_values[i] = new ArrayList();
+        }
+
         for (int i = 0; i < metadata_values_list.size(); i++) {
         MetadataValue metadata_value = (MetadataValue) metadata_values_list.get(i);
@@ -159 +174 @@
         for (int j = 0; j < metadata_elements.size(); j++) {
             if (metadata_element.equals(metadata_elements.get(j))) {
-            metadata_values[j] = metadata_value;
+            metadata_values[j].add(metadata_value);
             break;
             }
@@ -167 +182 @@
 
 
-    public MetadataValueTreeNode getMetadataValueTreeNode(int col)
-    {
-        if (metadata_values[col] == null) {
-        return null;
+    public MetadataValueTreeNode[] getMetadataValueTreeNodes(int col)
+    {
+        ArrayList metadata_values_list = metadata_values[col];
+        if (metadata_values_list == null) {
+        return null;
+        }
+
+        MetadataValueTreeNode[] metadata_value_tree_nodes = new MetadataValueTreeNode[metadata_values_list.size()];
+        for (int i = 0; i < metadata_values_list.size(); i++) {
+        metadata_value_tree_nodes[i] = ((MetadataValue) metadata_values_list.get(i)).getMetadataValueTreeNode();
         }
 
-        return metadata_values[col].getMetadataValueTreeNode();
-    }
+        return metadata_value_tree_nodes;
+    }
     }
 }