Changeset 5992

Timestamp:

2003-11-25T16:19:15+13:00 (20 years ago)

Author:

jmt12

Message:

MSMEvents are now created including an integer to specify what user action caused them - thus I am able to differentiate between assigns and replaces later on

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java (modified) (15 diffs)

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

@@ -244 +244 @@
     }
 
+/** Fire a metadata value changed message, whose id is to be generated now, and whose action code is -1, off to all registered listeners. */
+    public void fireMetadataChanged(FileNode node, Metadata old_data, Metadata new_data) {
+    fireMetadataChanged(System.currentTimeMillis(), node, old_data, new_data, -1);
+    }
+
     /** Fire a metadata value changed message, whose id is to be generated now, off to all registered listeners. */
-    public void fireMetadataChanged(FileNode node, Metadata old_data, Metadata new_data) {
+    public void fireMetadataChanged(FileNode node, Metadata old_data, Metadata new_data, int action) {
     fireMetadataChanged(System.currentTimeMillis(), node, old_data, new_data);
     }
@@ -251 +256 @@
     /** Fire a metadata value changed message off to all registered listeners. */
     public void fireMetadataChanged(long id, FileNode node, Metadata old_data, Metadata new_data) {
+    fireMetadataChanged(id, node, old_data, new_data, -1);
+    }
+
+    public void fireMetadataChanged(long id, FileNode node, Metadata old_data, Metadata new_data, int action) {
     if(old_data != null) {
         old_data.getElement().dec();
@@ -259 +268 @@
     ///ystem.err.println("Metadata changed: " + record + " > '" + old_data + "' -> '" + new_data + "'");
     // Create a new MSMEvent based on the record.
-    MSMEvent event = new MSMEvent(this, id, node, old_data, new_data);
+    MSMEvent event = new MSMEvent(this, id, node, old_data, new_data, action);
     // Then send it to all the listeners.
     for(int i = 0; i < listeners.size(); i++) {
@@ -900 +909 @@
     // Reset undo buffer
     undo_buffer.clear();
-    // Simplier than the others. Simply remove the metadata.
+    // Simplier than the others. Simply remove the metadata. Note that we only bother prompting if there is more than one
     int action = MetaEditPrompt.CONFIRM;
+    if(records.length == 1) {
+        action = MetaEditPrompt.REMOVE;
+    }
     // Now remove metadata from the selected file nodes.
     for(int i = 0; action != MetaEditPrompt.CANCEL && i < records.length; i++) {
@@ -1048 +1060 @@
     // And update the old with it.
     if(action == -1) {
+        //Note that we only bother prompting if there is more than one
         action = MetaEditPrompt.CONFIRM;
+        if(records.length == 1) {
+        action = MetaEditPrompt.OVERWRITE;
+        }
     }
     // And then update each selection file node.
@@ -1078 +1094 @@
     // Super special exception for accumulate all action. We are going to add this metadata anyway, regardless of whats already there, so just add it.
     if(action == MetaEditPrompt.ACCUMULATE_ALL || action == MetaEditPrompt.OVERWRITE_ALL) {
-        fireMetadataChanged(id, record, null, data);
+        fireMetadataChanged(id, record, null, data, action - 1); // Transform action to accumulate or overwrite
     }
     else {
@@ -1115 +1131 @@
             if(old_data.getElement().equals(data.getElement()) && old_data.isFileLevel()) {
                 // We have a match. Remove this metadata.
-                fireMetadataChanged(id, record, old_data, null);
+                fireMetadataChanged(id, record, old_data, null, MetaEditPrompt.REMOVE);
                 // Add it to our undo buffer.
                 undo.add(old_data);
@@ -1131 +1147 @@
         if((user_action == MetaEditPrompt.ACCUMULATE || user_action == MetaEditPrompt.ACCUMULATE_ALL || user_action == MetaEditPrompt.OVERWRITE || user_action == MetaEditPrompt.OVERWRITE_ALL) && !metadata.contains(data)) {
             ///ystem.err.println("Adding metadata " + data);
-            fireMetadataChanged(id, record, null, data);
+            fireMetadataChanged(id, record, null, data, ((user_action == MetaEditPrompt.ACCUMULATE || user_action == MetaEditPrompt.ACCUMULATE_ALL) ? MetaEditPrompt.ACCUMULATE : MetaEditPrompt.OVERWRITE));
             // The last element in undo is the new element.
             undo.add(data);
@@ -1193 +1209 @@
         }
         if(action == MetaEditPrompt.REMOVE_ALL || user_action == MetaEditPrompt.REMOVE) {
-        fireMetadataChanged(id, record, data, null);
+        fireMetadataChanged(id, record, data, null, MetaEditPrompt.REMOVE);
         undo.add(data);
         }
@@ -1215 +1231 @@
     // If there is no undo then we can't do anything, but there should be
     if(undo != null && undo.size() > 0) {
-                // The last piece of data in an add actions undo buffer is the metadata that was added
+        // The last piece of data in an add actions undo buffer is the metadata that was added
         Metadata data = (Metadata) undo.remove(undo.size() - 1);
-                // Remove the data
-        fireMetadataChanged(id, record, data, null);
-                // If we removed other metadata when adding this metadata restore it too
+        // Remove the data
+        fireMetadataChanged(id, record, data, null, MetaEditPrompt.REMOVE);
+        // If we removed other metadata when adding this metadata restore it too
         for(int i = 0; i < undo.size(); i++) {
         Metadata old_data = (Metadata) undo.get(i);
-        fireMetadataChanged(id, record, null, old_data);
+        fireMetadataChanged(id, record, null, old_data, MetaEditPrompt.ACCUMULATE);
         }
     }
@@ -1235 +1251 @@
     // Ensure that we have something to undo
     if(undo != null && undo.size() == 1) {
-                // The undo buffer should contain exactly one entry, the metadata removed
+        // The undo buffer should contain exactly one entry, the metadata removed
         Metadata data = (Metadata) undo.get(0);
-        fireMetadataChanged(id, record, null, data);
+        fireMetadataChanged(id, record, null, data, MetaEditPrompt.ACCUMULATE);
     }
     }
@@ -1250 +1266 @@
         Metadata old_data = (Metadata) undo.get(0);
         Metadata new_data = (Metadata) undo.get(1);
-        fireMetadataChanged(id, record, new_data, null);
+        fireMetadataChanged(id, record, new_data, null, MetaEditPrompt.REMOVE);
         if(old_data != new_data) { // Correct reference comparison
-        fireMetadataChanged(id, record, null, old_data);
+        fireMetadataChanged(id, record, null, old_data, MetaEditPrompt.ACCUMULATE);
         }
     }
@@ -1278 +1294 @@
     if(metadata.contains(old_data)) {
         ArrayList undo = new ArrayList();
-                // If we are to prompt the user, do so.
+        // If we are to prompt the user, do so.
         if(action == MetaEditPrompt.CONFIRM) {
         MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.UPDATE_PROMPT, multiple_selection, record.getFile(), old_data.getElement().toString(), old_data.getValue(), new_data.getValue());
@@ -1292 +1308 @@
         // If this is file level then we can do a normal replace
         if(file_level) {
-            fireMetadataChanged(id, record, old_data, new_data);
+            fireMetadataChanged(id, record, old_data, new_data, MetaEditPrompt.OVERWRITE);
             undo.add(old_data);
             undo.add(new_data);
@@ -1298 +1314 @@
         // Otherwise we are dealing with someone attempting to override inherited metadata, so we actually fire an add. To this end we add new data twice to the undo buffer, thus we can detect if this has happened.
         else {
-            fireMetadataChanged(id, record, null, new_data);
+            fireMetadataChanged(id, record, null, new_data, MetaEditPrompt.OVERWRITE);
             undo.add(new_data);
             undo.add(new_data);