Changeset 8274

Timestamp:

2004-10-11T15:07:57+13:00 (20 years ago)

Author:

mdewsnip

Message:

Made the GEMS start initially with the core GLI metadata sets, and removed the non-functioning "Importing Profiles" node. Fixed some craziness also.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GEMS.java (modified) (6 diffs)
• GEMSNode.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -88 +88 @@
 
     static private Configuration config = null;
-    static public MetadataSetManager msm = new MetadataSetManager();
+    static private MetadataSetManager msm = new MetadataSetManager();
 
     private AddElementActionListener add_element_action_listener = null;
@@ -171 +171 @@
     }
 
-    new GEMS(null, NORMAL);
+    new GEMS();
     }
 
@@ -179 +179 @@
      * @param action a systematic action that should be performed
      */
-    public GEMS(MetadataSet set, int action)
+    public GEMS()
     {
     this.dialog_options = new String[2];
@@ -206 +206 @@
     upper_pane.setOpaque(false);
           
+    // Load all the core metadata sets (in the GLI "metadata" directory)
     model = new GEMSModel();
+    File metadata_directory = new File(Utility.METADATA_DIR);
+    if (metadata_directory.exists()) {
+        // Load just those .mds files in this directory, and return them
+        File[] directory_files = metadata_directory.listFiles();
+        for (int i = 0; i < directory_files.length; i++) {
+        File child_file = directory_files[i];
+        if (!child_file.isDirectory() && child_file.getName().endsWith(".mds")) {
+            System.err.println("Found mds file: " + child_file);
+            MetadataSet metadata_set = msm.loadMetadataSet(child_file);
+            model.add(null, metadata_set, GEMSNode.SET);
+        }
+        }
+    }
 
     JPanel mds_tree_pane = new JPanel();
@@ -218 +232 @@
     mds_tree.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
     mds_tree.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-    // We may have been asked to select a cetain initial set
-    if(set != null) {
-        GEMSNode root = (GEMSNode) model.getRoot();
-        for(int i = 0; i < root.getChildCount(); i++) {
-        GEMSNode child = (GEMSNode) root.getChildAt(i);
-        if(set.equals(child.getUserObject())) {
-            TreePath path = new TreePath(child.getPath());
-            mds_tree.setSelectionPath(path);
-            mds_tree.expandPath(path);
-            path = null;
-        }
-        child = null;
-        }
-        root = null;
-    }
 
     details_pane = new JPanel();
@@ -545 +544 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
 
-    // Callback - we may have been asked to perform some systematic action, but we can't do that until the dialog is visible, which in itself causes a problem as the dialog is modal and setVisible won't return until the dialog is cancelled. The solution is to spawn a task on a new thread which waits until the dialog is visible then calls doClick on the appropriate button.
-    if(action != NORMAL) {
-        ActionTask task = new ActionTask(action);
-        task.start();
-    }
     // Display
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);

trunk/gli/src/org/greenstone/gatherer/gems/GEMSNode.java

@@ -191 +191 @@
     return text;
     }
-    private void mapChildren() {
-    ///ystem.err.println("Mapping the children of " + this);
+
+
+    private void mapChildren()
+    {
     children = new Vector();
+
     // How we build children depends on the node type
-    switch(type) {
-    case PROFILER: // Add the collections as children
-        // ArrayList a = GEMS.msm.profiler.getCollections();
-        // for(int i = 0; i < a.size(); i++) {
-        // children.add(new GEMSNode(COLLECTION, a.get(i), this));
-        // }
-        // a = null;
-        break;
-    case ROOT:
-        Vector v = GEMS.msm.getSets();
-        for(int i = 0; i < v.size(); i++) {
-        children.add(new GEMSNode(SET, v.get(i), this));
-        }
-        v = null;
-        // Add the profile set.
-        children.add(new GEMSNode(PROFILER, Dictionary.get("MEM.Profiles"), this));
-        break;
-    case SET: // Add the elements as children
+    if (type == SET) {
+        // Add the elements as children
         MetadataSet set = (MetadataSet) userObject;
         NodeList elements = set.getElements();
-        set = null;
-        for(int i = 0; i < elements.getLength(); i++) {
+        for (int i = 0; i < elements.getLength(); i++) {
         children.add(new GEMSNode(ELEMENT, new ElementWrapper((Element) elements.item(i)), this));
         }
-        elements = null;
-        break;
-    case COLLECTION:
-    case ELEMENT:
-    default:
     }
     }