Changeset 6848

Timestamp:

2004-02-19T11:52:25+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fix to a bug where files were incorrectly marked as having folder level metadata.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/EnrichPane.java (modified) (22 diffs)
• gui/table/GTableModel.java (modified) (2 diffs)
• msm/GDMDocument.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java

@@ -222 +222 @@
         }
     }
-    else if(esrc == expand_for_extracted) {
+    else if (esrc == expand_for_extracted) {
         EditorDialog ed = new EditorDialog();
         ed.setEditable(false);
@@ -246 +246 @@
 
     public void run() {
-        ///ystem.err.println("Add metadata - '" + value + "'");
+        // System.err.println("Add metadata - '" + value + "'");
         // Check the new metadata is valid
-        if(records != null && element != null && value != null) {
+        if (records != null && element != null && value != null) {
         // Check the records, and if they are folders then display the warning.
         Metadata added_metadata = null;
-        if(!records[0].isLeaf()) {
+        if (!records[0].isLeaf()) {
             WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", true);
-            if(dialog.display() == JOptionPane.OK_OPTION) {
+            if (dialog.display() == JOptionPane.OK_OPTION) {
             added_metadata = Gatherer.c_man.getCollection().msm.addMetadata(System.currentTimeMillis(), records, element, value);
             }
@@ -285 +285 @@
         // you have valid values in all fields.
         Gatherer.println("Replacing value:");
-        if(selected_metadata != null && records != null && element != null && value != null) {
+        if (selected_metadata != null && records != null && element != null && value != null) {
         selected_metadata = Gatherer.c_man.getCollection().msm.updateMetadata(System.currentTimeMillis(), selected_metadata, records, value, MetaEditPrompt.CONFIRM, selected_metadata.isFileLevel());
         }
@@ -299 +299 @@
     public void run() {
         Gatherer.println("Removing value:");
-        if(selected_metadata != null && records != null) {
+        if (selected_metadata != null && records != null) {
         Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
         }
@@ -320 +320 @@
      */
     public void collectionChanged(boolean ready) {
-    if(ready) {
+    if (ready) {
         TreeModel collection_model = Gatherer.c_man.getRecordSet();
         //String[] args = new String[1];
@@ -333 +333 @@
         collection_tree.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
         // Register our msm dependant components (or correctly their models) with msm.
-        if(model != null) {
+        if (model != null) {
         // remove the listener first - in case its already present
         Gatherer.c_man.getCollection().msm.removeMSMListener(model);
@@ -377 +377 @@
     DragGroup group = new DragGroup();
     TreeModel collection_model = Gatherer.c_man.getRecordSet();
-    if(collection_model != null) {
+    if (collection_model != null) {
         collection_tree = new DragTree("MetaEdit", collection_model, null, false);
     }
@@ -408 +408 @@
 
     // Collection Pane
-
     collection_pane.add(collection_label, BorderLayout.NORTH);
     collection_pane.add(collection_scroll, BorderLayout.CENTER);
@@ -485 +484 @@
     JTableHeader table_header = table.getTableHeader();
     Dimension table_header_preferred_size = table_header.getPreferredSize();
-    if(table_header_preferred_size.height < MINIMUM_TABLE_HEADER_SIZE) {
+    if (table_header_preferred_size.height < MINIMUM_TABLE_HEADER_SIZE) {
         table_header_preferred_size.setSize(table_header_preferred_size.width, MINIMUM_TABLE_HEADER_SIZE);
         table_header.setPreferredSize(table_header_preferred_size);
@@ -584 +583 @@
     // Use this opportunity to update the table model etc.
     // Select the first file (if any)
-    if(collection_tree != null && collection_tree.getRowCount() > 0) {
+    if (collection_tree != null && collection_tree.getRowCount() > 0) {
         collection_tree.setImmediate(true);
         collection_tree.setSelectionRow(0);
@@ -595 +594 @@
 
     // Update the menubars idea of whats been selected
-    if(collection_tree != null) {
-        if(collection_tree.isSelectionEmpty()) {
+    if (collection_tree != null) {
+        if (collection_tree.isSelectionEmpty()) {
         Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
         }
@@ -644 +643 @@
     // Validate card_layout_2
     // We only ever change tools if the metadata table has finished building or is empty.
-    if(update_card) {
+    if (update_card) {
         if (selected_metadata == null && model.isBuildingComplete() && model.getRowCount() == 0) {
         card_layout2.show(control_pane, TOOLS_OFF);
@@ -721 +720 @@
         tree.setSelectedMetadataElement(selected_metadata.getElement());
         GValueNode value_node = selected_metadata.getValueNode();
-        if(value_node != null) {
+        if (value_node != null) {
             tree.setSelectedValue(value_node.getFullPath(true));
         }
@@ -757 +756 @@
     }
 
-    if(collection_tree.getSelectionCount() > 0) {
+    if (collection_tree.getSelectionCount() > 0) {
         records = null;
         TreePath paths[] = collection_tree.getSelectionPaths();
-        for(int i = 0; i < paths.length; i++) {
+        for (int i = 0; i < paths.length; i++) {
         FileNode record = (FileNode) paths[i].getLastPathComponent();
         records = ArrayTools.add(records, record);
@@ -784 +783 @@
 
         // Remove old model from msm
-        if(Gatherer.c_man.ready()) {
+        if (Gatherer.c_man.ready()) {
         Gatherer.c_man.getCollection().msm.removeMSMListener(model);
         }
@@ -792 +791 @@
     }
 
-    if(table != null) {
+    if (table != null) {
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
         Dimension table_size = table.getPreferredSize();
@@ -960 +959 @@
      */
     public void mouseClicked(MouseEvent event) {
-        if(SwingUtilities.isRightMouseButton(event)) {
+        if (SwingUtilities.isRightMouseButton(event)) {
         new RightButtonMenu(event);
         }
@@ -986 +985 @@
         // Creation
         // Any folder node gets a menu item allowing you to collapse or expand it depending on its current status
-        if(!node.isLeaf()) {
+        if (!node.isLeaf()) {
                 // Collapse
-        if(collection_tree.isExpanded(path)) {
+        if (collection_tree.isExpanded(path)) {
             collapse_expand_folder_menuitem = new JMenuItem(Dictionary.get("Menu.Collapse"), KeyEvent.VK_C);
         }
@@ -1015 +1014 @@
     public void actionPerformed(ActionEvent event) {
         Object source = event.getSource();
-        if(source == show_metaaudit) {
+        if (source == show_metaaudit) {
         Gatherer.g_man.showMetaAuditBox();
         }
-        else if(source == collapse_expand_folder_menuitem && path != null && node != null && !node.isLeaf()) {
+        else if (source == collapse_expand_folder_menuitem && path != null && node != null && !node.isLeaf()) {
                 // Collapse
-        if(collection_tree.isExpanded(path)) {
+        if (collection_tree.isExpanded(path)) {
             collection_tree.collapsePath(path);
         }
@@ -1097 +1096 @@
 
         JPanel value_field_pane = new JPanel();
-        //TransformCharacterTextField value_init = new TransformCharacterTextField();
-        //value_init.replaceCharacter(StaticStrings.PIPE_CHAR, StaticStrings.FORWARDSLASH_CHAR);
         value = new JTextField();
-        //value_init = null;
         value.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
         value.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
@@ -1184 +1180 @@
 
     public String getSelectedValue() {
-        //return /odec.transform(/odec.transformUnicode(value.getText()), /odec.TEXT_TO_GREENSTONE);
         String raw_value = value.getText();
         raw_value = Codec.transformUnicode(raw_value);
@@ -1220 +1215 @@
         // Load the model for the newly selected metadata element
         selected_metadata_element = element;
-        if(Gatherer.c_man != null && Gatherer.c_man.getCollection() != null && Gatherer.c_man.getCollection().msm != null && tree != null) {
+        if (Gatherer.c_man != null && Gatherer.c_man.getCollection() != null && Gatherer.c_man.getCollection().msm != null && tree != null) {
         vm = Gatherer.c_man.getCollection().msm.getValueTree(element);
         tree.setModel(vm);

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

@@ -131 +131 @@
     /* Called to retrieve the Metadata record that matches a certain row. Usually caused by the user selectiong a row in the table. It synchronized so that the model doesn't up and change while we're trying to retrieve the indicated element. */
     public synchronized Metadata getMetadataAtRow(int row) {
-    if(0 <= row && row < current_metadata.size()) {
+    if (row >= 0 && row < current_metadata.size()) {
         return (Metadata) current_metadata.get(row);
     }
@@ -206 +206 @@
         ElementWrapper element = metadatum.getElement();
         if(i < 0) {
-              Gatherer.println("Could not find suitable row to select!");
-              return;
-         }
+        Gatherer.println("Could not find suitable row to select!");
+        return;
+        }
         Metadata newly_selected_metadatum = (Metadata) current_metadata.get(i);
         if (!newly_selected_metadatum.getElement().equals(element)) {
-            // Try one row previous
-            i--;
-            if(i < 0) {
-                  Gatherer.println("Could not find suitable row to select!");
-                  return;
-             }
-
-            newly_selected_metadatum = (Metadata) current_metadata.get(i);
-            if (!newly_selected_metadatum.getElement().equals(element)) {
-                Gatherer.println("Could not find suitable row to select!");
-                return;
-            }
+        // Try one row previous
+        i--;
+        if(i < 0) {
+            Gatherer.println("Could not find suitable row to select!");
+            return;
+        }
+
+        newly_selected_metadatum = (Metadata) current_metadata.get(i);
+        if (!newly_selected_metadatum.getElement().equals(element)) {
+            Gatherer.println("Could not find suitable row to select!");
+            return;
+        }
         }
 

trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java

@@ -338 +338 @@
                     }
                     }
-                    // check whether the metadata is null
+
+                    // Determine whether this metadata is file or folder level
                     if (metadata != null) {
-                    // We determine whether this metadata is file or folder level
-                    if(filename != null) {
-                        ///ystem.err.println("Filename    = " + filename);
-                        ///ystem.err.println("filename_text = " + filename_text);
-                        // If can only be file level if there is no folder path details in filename and if the filename matched the filename text node (it may have matched .* instead)!
-                        if(filename.indexOf(File.separator) == -1 && filename.equals(filename_text)) {
-                        metadata.setFileLevel(true);
-                        ///ystem.err.println("File level!!!");
-                        }
-                        else {
-                        metadata.setFileLevel(false);
-                        ///ystem.err.println("Inherited!!!");
-                        }
-                    }
+                    // The metadata is folder level if the file expression matches .*
+                    if (filename_text != null && filename_text.equals(DIRECTORY_FILENAME)) {
+                        metadata.setFileLevel(false);
+                    }
+                    // Otherwise it must be file level
                     else {
-                        ///ystem.err.println("Filename is null therefore this is file level metadata.");
                         metadata.setFileLevel(true);
                     }
+
                     metadata.setFile(file);
                     // If mode is overwrite, then remove any previous values for this metadata element.