Changeset 4477 for trunk/gli

Timestamp:

2003-06-04T15:30:42+12:00 (21 years ago)

Author:

jmt12

Message:

2030105: Once again I was blodging the AWTEvent Dispatch Thread so that a ProgressMonitor wasn't getting any time to paint itself.

File:

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

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

@@ -557 +557 @@
     if(mds_new != null && mds_new.getDocument() != null) {
         String family = mds_new.getNamespace();
-                // 2. See if we have another metadata set of the same family
-                // already. If so retrieve it and merge.
+        // 2. See if we have another metadata set of the same family
+        // already. If so retrieve it and merge.
         boolean matched = false;
         for(Enumeration keys = mds_hashtable.keys(); 
@@ -567 +567 @@
             MetadataSet mds_cur = (MetadataSet)mds_hashtable.get(key);
             //ystem.err.println("Merging " + mds_new + " into " + mds_cur);
-            mergeMDS(mds_cur, mds_new);
+            MergeTask task = new MergeTask(mds_cur, mds_new);
+            task.start();
         }
         }
@@ -574 +575 @@
         mds_hashtable.put(family, mds_new);
         }
-                // Fire setChanged() message.
-        fireSetChanged(mds_new);
+        // Fire setChanged() message.
+        //fireSetChanged(mds_new);
         return true;
     }
     // else we cancelled for some reason.
     return false;
+    }
+
+    private class MergeTask
+    extends Thread {
+    private MetadataSet mds_cur;
+    private MetadataSet mds_new;
+    MergeTask(MetadataSet mds_cur, MetadataSet mds_new) {
+        this.mds_cur = mds_cur;
+        this.mds_new = mds_new;
+    }
+    public void run() {
+        mergeMDS(mds_cur, mds_new);
+        fireSetChanged(mds_new);
+    }
     }
 
@@ -627 +642 @@
     // For a super quick check for equivelent trees, we compare the last changed values.
     if(mds_cur.getLastChanged().equals(mds_new.getLastChanged())) {
-                // Exactly the same. Nothing to change.
+        // Exactly the same. Nothing to change.
         return true;
     }