Changeset 19270

Timestamp:

2009-04-27T15:06:59+12:00 (15 years ago)

Author:

kjdon

Message:

don't add dc metadata set all the time. only add it if there is not a valid one already loaded

File:

• gli/trunk/src/org/greenstone/gatherer/cdm/DepositorMetadataManager.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/cdm/DepositorMetadataManager.java

@@ -67 +67 @@
     static private Dimension LABEL_SIZE = new Dimension(150, 15);
     static private Dimension ROW_SIZE = new Dimension(400, 20);
+    static private Dimension MAX_ROW_SIZE = new Dimension(1000, 30);
     
     /** Available types, corresponds to the HTML input types */ 
@@ -202 +203 @@
         ArrayList metadata_sets = MetadataSetManager.listMetadataSets(new File(file_name));
         
-        // if the collection doesn't have a metadata directory, load all the MDSets in the global GLI/metadata directory 
-        if (metadata_sets == null) {
-        file_name = org.greenstone.gatherer.gems.MetadataSetManager.getGLIMetadataDirectoryPath();
-        metadata_sets = MetadataSetManager.listMetadataSets(new File(file_name));
-        } 
-            
-        // always load the dc mds
-        boolean found = false;
-        for (int i = 0, j = metadata_sets.size(); i < j; i++) {
-        if (((MetadataSet) metadata_sets.get(i)).getNamespace().equals("dc")) {
-            found = true;
-            break;
-        }                   
-        }
-        if (found == false) {
+        if (metadata_sets != null) {
+          // unload the ex mds
+          for (int i = 0, j = metadata_sets.size(); i < j; i++) {
+        if (((MetadataSet) metadata_sets.get(i)).getNamespace().equals("ex")) {
+          metadata_sets.remove(i);
+          break;
+        }
+          }
+        }
+        
+        if (metadata_sets == null || metadata_sets.size() == 0) {
+          // load dublin core
         file_name = org.greenstone.gatherer.gems.MetadataSetManager.getGLIMetadataDirectoryPath();
         file_name += "dublin.mds";
@@ -224 +222 @@
             metadata_sets = MetadataSetManager.getMetadataSets();
         }
-        }           
-
-        // unload the ex mds
-        for (int i = 0, j = metadata_sets.size(); i < j; i++) {
-        if (((MetadataSet) metadata_sets.get(i)).getNamespace().equals("ex")) {
-            metadata_sets.remove(i);
-            break;
-        }
-        }
-            
+        }
+        // if we are still null :-(
         if (metadata_sets == null) {
         System.err.println("Error: DepositorMetadataMananger can't find any valid metadata set files.");
@@ -339 +329 @@
         setLayout(new BorderLayout());
         setPreferredSize(ROW_SIZE);
+        setMaximumSize(MAX_ROW_SIZE);
             
         // the checkbox component