Changeset 23455

Timestamp:

2010-12-13T13:24:20+13:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the problem with the metadata data getting mixed up at random sometimes when moving folders in the CollectionTree. The metadata was previously getting mixed up in the MetadataValueTable because of a race condition/state inconsistency due to the table trying to update itself when the collection tree was getting updated: when nodes are selected in the tree, which happens on Tree refresh (including file/directory move operations), it fires a valueChanged event which the Table responds to. However, since the filenodes of the tree (and so their associated metadata) are in flux at that point, the table should hold off updating its metadata on such an occasion. The current fix is to clear the selection in the tree upon the drop event of a drag and drop in the tree: no nodes are selected, no selection changed events are fired, the table does not even get displayed because nothing is selected.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionTree.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionTree.java

@@ -28 +28 @@
 
 import java.awt.*;
+import java.awt.dnd.DropTargetDropEvent;
 import java.awt.event.*;
 import javax.swing.*;
@@ -69 +70 @@
     }
 
+    // Overridden here: when a successful drag and drop takes place 
+    // make sure nothing is selected in the tree, so that no valueChanged()
+    // event gets fired anymore by items getting reselected in the tree 
+    // (this  used to result in the metadata table in EnrichPane being updated 
+    // upon its valueChanged() getting called and funny things happened to
+    // the metadata due to state inconsistencies). 
+    public void drop(DropTargetDropEvent event) {
+        if (!isDroppable()) {
+            return;
+        }
+        
+        setImmediate(true);
+        clearSelection();
+        setImmediate(false);
+        
+        // let the superclass' drop() process the rest of the drag event
+        super.drop(event);
+        
+    }
 
     public void mouseClicked(MouseEvent event)