Changeset 12150

Timestamp:

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

Author:

kjdon

Message:

removed ncm prompt stuff - now load dublin core as teh default set

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• gui/GUIManager.java (modified) (3 diffs)

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

@@ -57 +57 @@
 import org.greenstone.gatherer.gui.LockFileDialog;
 import org.greenstone.gatherer.gui.ModalProgressPopup;
-import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.metadata.DocXMLFileManager;
@@ -415 +414 @@
         }
 
-        // If no sets were imported...
-        if (MetadataSetManager.getMetadataSets().size() == 0) {
-            // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
-            DebugStream.println("This collection has no metadata sets. Present the user with the metadata set selection prompt.");
-            NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
-            // If cancelled then they really do mean to start a collection with no metadata sets.
-            if (!ncm_prompt.isCancelled()) {
-            ArrayList initial_sets = ncm_prompt.getSets();
-            for (int i = 0; initial_sets != null && i < initial_sets.size(); i++) {
-                importMetadataSet((MetadataSet) initial_sets.get(i));
-            }
-            }
-            ncm_prompt.dispose();
-            ncm_prompt = null;
-        }
-
         // Now we update our collect.cfg
         DebugStream.println("Copy and update collect.cfg from base collection.");
@@ -1226 +1209 @@
     }
 
-    // now we reuse the newcoll metadata prompt for the user to select metadata sets
-    NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt(true);
-    if (ncm_prompt.isCancelled()) {
-        return false;
-    }
-    ArrayList metadata_sets = ncm_prompt.getSets();
-    // Import default metadata sets if any.
-    for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
-        importMetadataSet((MetadataSet) metadata_sets.get(i));
+    // now we add dublin core which is the default metadata set. The user
+    // can change this later
+    File dc_file = new File(Gatherer.getGLIMetadataDirectoryPath()+"dublin.mds");
+    if (dc_file.exists()) {
+        importMetadataSet(new MetadataSet(dc_file));
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -59 +59 @@
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
 import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.metadata.MetadataSet;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
@@ -762 +763 @@
 
         // Create the collection details prompt from new collection prompt
-        NewCollectionMetadataPrompt ncm_prompt = null;
         NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
-        // If no previous collection was indicated as a model design, then show the metadata selection prompt from new collection prompt
-        if(!ncd_prompt.isCancelled() && (ncd_prompt.getBase() == null)) {
-        ncm_prompt = new NewCollectionMetadataPrompt();
+        // dc metadata set is the default
+        ArrayList metadata_sets  = new ArrayList();
+        File dc_file = new File(Gatherer.getGLIMetadataDirectoryPath()+"dublin.mds");
+        if (dc_file.exists()) {
+        metadata_sets.add(new MetadataSet(dc_file));
         }
         // Create the new collection (if not cancelled) in a new thread.
-        if (!ncd_prompt.isCancelled() && (ncm_prompt == null || !ncm_prompt.isCancelled())) {
+        if (!ncd_prompt.isCancelled()) {
         // If there is already a collection open, save and close it.
         if (Gatherer.c_man.ready()) {
             saveThenCloseCurrentCollection();
         }
-
+        
         // Create new collection.
-        if (ncm_prompt == null) {
-            Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), null);
-        }
-        else {
-            Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), null, ncm_prompt.getSets());
-            ncm_prompt.dispose();
-        }
-
+        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), metadata_sets);
         ncd_prompt.dispose();
 
@@ -798 +793 @@
         // Done
         ncd_prompt = null;
-        ncm_prompt = null;
     }
     }