Changeset 12157

Timestamp:

2006-07-11T16:58:06+12:00 (18 years ago)

Author:

kjdon

Message:

no longer uses ExternalCollectionPrompt or NewCollectionMetadataPrompt. Just has a warning dialog about loading a legacy colleciton, then adds dublin core metadata set

File:

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

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

@@ -54 +54 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
-import org.greenstone.gatherer.gui.ExternalCollectionPrompt;
 import org.greenstone.gatherer.gui.LockFileDialog;
 import org.greenstone.gatherer.gui.ModalProgressPopup;
@@ -849 +848 @@
     if (!collection_metadata_directory.exists()) {
         DebugStream.println("Loading non-gatherer collection...");
+        // Show a warning message in case user wants to quit now
         non_gli_collection = true;
+        WarningDialog legacy_dialog = new WarningDialog("warning.LegacyCollection", Dictionary.get("LegacyCollection.Title"), Dictionary.get("LegacyCollection.Message"), null, true);
+        if (legacy_dialog.display()==JOptionPane.CANCEL_OPTION) {
+        legacy_dialog.dispose();
+        collection_directory = null;
+        collection_config_file = null;
+        return;
+        }
+        legacy_dialog.dispose();
+
     }
 
@@ -903 +912 @@
         ProfileXMLFileManager.loadProfileXMLFile(collection_metadata_directory);
  
-        // If this is a non-GLI (legacy) collection, ask the user to choose some metadata sets
+        // If this is a non-GLI (legacy) collection, load the 
+        // default metadata 
         if (non_gli_collection) {
-        if (!addSomeMetadataSets(collection_directory)) {
-            lock_file = null;
-            collection_directory = null;
-            closeCollection();
-            return;
-        }
-
+        addDefaultMetadataSets(collection_directory);
+        
         // Recurse the import folder tree, backing up the metadata.xml files before they are edited
         LegacyCollectionImporter.backupMetadataXMLFiles(collection_directory);
@@ -1199 +1204 @@
 
     /** I started giving the user the choice of using an existing meta set or creating a new one. The second option being so that they didn't have to add/merge/ignore each element, they could all be added automatically. However, I am not sure where the merge prompt gets called from, and it is not essential, so I am leaving it for now - it should be added back in and finished. [kjdon] */
-    private boolean addSomeMetadataSets(File collection_dir) {
-
-
-    ExternalCollectionPrompt external_prompt = new ExternalCollectionPrompt();
-    int meta_choice = external_prompt.getMetadataChoice();
-    boolean cancelled = external_prompt.isCancelled();
-    if (cancelled) {
-        return false;
-    }
-
-    // now we add dublin core which is the default metadata set. The user
+    private boolean addDefaultMetadataSets(File collection_dir) {
+
+
+    // Add dublin core which is the default metadata set. The user
     // can change this later
     File dc_file = new File(Gatherer.getGLIMetadataDirectoryPath()+"dublin.mds");