Changeset 4571

Timestamp:

2003-06-11T15:21:31+12:00 (21 years ago)

Author:

mdewsnip

Message:

Removed ProgressMonitor, which for some reason was locking up when saving collections.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java

@@ -110 +110 @@
     Gatherer.g_man.wait(true);
     // Create progress monitor box. It will display itself as necessary.
-    ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Gatherer.dictionary.get("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
-    spd.setMillisToDecideToPopup(100);
-    spd.setMillisToPopup(100);
+    // WARNING: ProgressMonitors seem to be extremely dodgy, and are not recommended!
+    // ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Gatherer.dictionary.get("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
+    // spd.setMillisToDecideToPopup(100);
+    // spd.setMillisToPopup(100);
     // 0. Force all remaining metadata.xml files to load.
     // 1. Perform a regular collection save on what we will later refer to as the origin collection.
@@ -120 +121 @@
     args[0] = collection.getName() + ".col";
     try {
-                // Block until all of the metadata files have been read in.
+        // Block until all of the metadata files have been read in.
         collection.gdm.waitUntilComplete();
-                // Write out the metadata xml files. The destroy below is meant to do this, but never does.
+        // Write out the metadata xml files. The destroy below is meant to do this, but never does.
         collection.gdm.save();
-                
-        spd.setProgress(getValue(METADATA_XML_SAVED));
+        // spd.setProgress(getValue(METADATA_XML_SAVED));
+
         File file = new File(tmp_loc);
-                // Create backup
+        // Create backup
         if(file.exists()) {
         File backup = new File(tmp_loc + "~");
@@ -135 +136 @@
         }
         }
-                // Carry on.
+
+        // Carry on.
         collection.save();
-        spd.setProgress(getValue(COLLECTION_SAVED));
-                // Write out the collection configuration file.
+        // spd.setProgress(getValue(COLLECTION_SAVED));
+
+        // Write out the collection configuration file.
         Gatherer.g_man.config_pane.saveConfiguration();
-        spd.setProgress(getValue(COLLECTION_CFG_SAVED));
-                // Write out the metadata files.
+        // spd.setProgress(getValue(COLLECTION_CFG_SAVED));
+
+        // Write out the metadata files.
         Gatherer.c_man.msm.save();
-        spd.setProgress(getValue(METADATA_SAVED));
-                // Clean-up
-        spd.setProgress(100);
-                ///atherer.g_man.collectionChanged(Gatherer.c_man.ready());
+        // spd.setProgress(getValue(METADATA_SAVED));
+
         collection.setSaved(true);
     } 
@@ -157 +159 @@
                 ///ystem.err.println("2. Make copy.");
         Gatherer.c_man.createCollection(null, null, name, null, null, null);
-        spd.setProgress(getValue(MAKE_COLLECTION));
+        // spd.setProgress(getValue(MAKE_COLLECTION));
                 // 3. Copy files from the origin to the copied collections (except special collection files ending with ~).
                 // As part of this we must rename origin.col to copy.col
@@ -202 +204 @@
         file = null;
         }
-        spd.setProgress(getValue(COPY_COLLECTION));
+        // spd.setProgress(getValue(COPY_COLLECTION));
                 // 4. Restore origin collection by undoing file copy actions and removing the ~ from the end of collection files.
                 ///ystem.err.println("4. Restore origin.");
@@ -230 +232 @@
         }
                 ///ystem.err.println(" - Restore *~ complete.");
-        spd.setProgress(getValue(RESTORE_COLLECTION));
+        // spd.setProgress(getValue(RESTORE_COLLECTION));
                 // 5. Close the origin collection.
                 ///ystem.err.println("5. Close origin.");
         collection.setSaved(true);
         Gatherer.c_man.closeCollection();
-        spd.setProgress(getValue(CLOSE_COLLECTION));
+        // spd.setProgress(getValue(CLOSE_COLLECTION));
                 // 6. Open the copied collection.   
                 ///ystem.err.println("6. Open copy.");
         Gatherer.c_man.loadCollection(copied_dir.getAbsolutePath() + File.separator + name + ".col");
-        spd.setProgress(getValue(OPEN_COLLECTION));
+        // spd.setProgress(getValue(OPEN_COLLECTION));
         copied_dir = null;
     }
-    spd.close();
-    spd = null;
+    // spd.close();
+    // spd = null;
     tmp_loc = null;
     args = null;