Changeset 4933 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-07-15T14:17:08+12:00 (21 years ago)

Author:

jmt12

Message:

Major CDM rewrite so it uses DOM.

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• BuildOptions.java (modified) (2 diffs)
• CollectionManager.java (modified) (3 diffs)

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

@@ -213 +213 @@
             }
             else if(node_name.equals("Desc")) {
-            argument.setDesc(MSMUtils.getValue(node));
+            argument.setDescription(MSMUtils.getValue(node));
             }
             else if(node_name.equals("Type")) {
@@ -219 +219 @@
             }
             else if(node_name.equals("Default")) {
-            argument.setDefault(MSMUtils.getValue(node));
+            argument.setDefaultValue(MSMUtils.getValue(node));
             }
             else if(node_name.equals("List")) {

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

@@ -376 +376 @@
         }
 
-        collection.cdm = new CollectionDesignManager();
+        collection.cdm = new CollectionDesignManager(new File(getCollectionConfig()));
         collection.gdm = new GDMManager();
 
@@ -783 +783 @@
                 msm = collection.msm; // Legacy
                 collection.msm.load();
-                collection.cdm = new CollectionDesignManager();
+                collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_DIR));
                 collection.gdm = new GDMManager();
                 // Tell everyone that it worked.
@@ -933 +933 @@
     }
     /** Determine if the manager is ready for actions apon its collection.
-      * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise.
-      */
-
-    public synchronized boolean ready() {
-        if(collection != null) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
+     * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise.
+     */
+    
+    public synchronized boolean ready() {
+    if(collection != null) {
+        return true;
+    }
+    else {
+        return false;
+    }
+    }
+    
     public synchronized boolean reallyReady() {
-    if(collection == null) {
-        Gatherer.println("Called reallyReady() when collection was null.");
-        Gatherer.println("Closing thread = " + closing_thread);
-        Gatherer.println("This thread = " + Thread.currentThread());
-        Gatherer.println("Thus we return: " + (closing_thread == null || closing_thread == Thread.currentThread() ? "not ready" : "ready"));
-    }
     // If the closing thread is non-null we should only allow that thread to see the collection as closed.
     if(closing_thread != null) {
-        // Only the closing thread sees the truth
-        if(Thread.currentThread() == closing_thread) {
-            return (collection == null);
-        }
-        // All other threads are told a lie.
-        else {
-            return true;
-        }
+        // Only the closing thread sees the truth
+        if(Thread.currentThread() == closing_thread) {
+        return (collection == null);
+        }
+        // All other threads are told a lie.
+        else {
+        return true;
+        }
     }
     else {
-        if(collection != null) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    }
+        if(collection != null) {
+        return true;
+        }
+        else {
+        return false;
+        }
+    }
+    }
     /** Called to refresh the models upon which the trees are based.
-      * @see org.greenstone.gatherer.collection.Collection
-      */
+     * @see org.greenstone.gatherer.collection.Collection
+     */
     public void refreshTrees() {
     }