Changeset 32712 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2018-12-18T19:23:21+13:00 (5 years ago)

Author:

ak19

Message:

1. Some dialogs do not exist when GLI starts up and becomes visible. These dialogs only get created when the user launches them, such as the new collection dialog appearing when you choose it through the file menu. When testing, such locally instantiated dialogs need to have setNamesRecursively() called on their GUI components too before setVisible() is called on them. 2. Leaving in instances of what I think are safe calls to SwingUntilities.invokeLater() to fix EDT violation exceptions detected during testing, but not committing those cases where I've made the change that actually need proper fixing by using SwingWorker threads.

File:

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

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

@@ -60 +60 @@
 import org.greenstone.gatherer.gui.LockFileDialog;
 import org.greenstone.gatherer.gui.ModalProgressPopup;
+import org.greenstone.gatherer.gui.TestingPreparation;
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.metadata.DocXMLFileManager;
@@ -551 +552 @@
     // Create the collection on a separate thread so the progress bar updates correctly
     (new CreateCollectionTask(description, email, name, title, base_collection_directory, metadata_sets, create_collection_progress_popup)).start();
+    //SwingUtilities.invokeLater(new CreateCollectionTask(description, email, name, title, base_collection_directory, metadata_sets, create_collection_progress_popup));
     }
 
@@ -1285 +1287 @@
     // Load the collection on a separate thread so the progress bar updates correctly
     (new LoadCollectionTask(collection_file_path, load_collection_progress_popup)).start();
+    //SwingUtilities.invokeLater(new LoadCollectionTask(collection_file_path, load_collection_progress_popup));
     }
 
@@ -1394 +1397 @@
     if (lock_file.exists()) {
         LockFileDialog dialog = new LockFileDialog(Gatherer.g_man, collection_name, lock_file);
+        TestingPreparation.setNamesRecursively(dialog);
         int choice = dialog.getChoice();
         dialog.dispose();