Changeset 4650

Timestamp:

2003-06-13T15:41:54+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many improvements to this pane, mostly to do with keeping selections as the user clicks between files, and when the user adds/updates/removes metadata.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java (modified) (8 diffs)

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

@@ -250 +250 @@
         }
         GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
-        model.setSelectedMetadata(new Metadata(element, value_node));
+        Metadata added_metadata = new Metadata(element, value_node);
+        model.selectMetadataWhenBuildingComplete(added_metadata);
         }
     }
@@ -266 +267 @@
         String value = tree.getSelectedValue();
         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.OVERWRITE, selected_metadata.isFileLevel());
-        }
-        GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
-        model.setSelectedMetadata(new Metadata(element, value_node));
+        selected_metadata = Gatherer.c_man.getCollection().msm.updateMetadata(System.currentTimeMillis(), selected_metadata, records, value, MetaEditPrompt.CONFIRM, selected_metadata.isFileLevel());
+        }
+        model.selectMetadataWhenBuildingComplete(selected_metadata);
     }
     }
@@ -282 +282 @@
         Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
         }
+
+        // Select the closest piece of metadata with the same element name
+        model.selectClosestMetadataWhenBuildingComplete(selected_metadata);
     }
     }
@@ -514 +517 @@
     ///atherer.println("\tCreating metadata_table");
     table = new JTable();
-    //model = new GTableModel(table, assigned_metadata_view, unassigned_metadata_view, activity_bar);
     model = new GTableModel(table);
     table.setModel(model);
@@ -707 +709 @@
     */
     public Rectangle setSelectedMetadata(Metadata metadata) {
-    return model.setSelectedMetadata(metadata);
+    // return model.setSelectedMetadata(metadata);
+    return null;  // For now
     }
 
@@ -796 +799 @@
 
         // Can only remove if the metadata is file level
-        remove.setEnabled(selected_metadata.isFileLevel());
+        if (selected_metadata != null) {  // Shouldn't be necessary, but is
+            remove.setEnabled(selected_metadata.isFileLevel());
+        }
         }
     }
@@ -883 +888 @@
         }
 
+        // Remember the previous selection so we can select it again later
+        Metadata previous_selection = selected_metadata;
+
         table_label.setText(collection_tree.getSelectionDetails());
 
@@ -890 +898 @@
         model = new GTableModel(table, records);
         table.setModel(model);
+
+        // Select the closest piece of metadata in the new file
+        model.selectClosestMetadataWhenBuildingComplete(previous_selection);
     }
     else {