Changeset 8016

Timestamp:

2004-08-20T14:41:43+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed some dead code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileQueue.java (modified) (2 diffs)
• valuetree/GValueNode.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -39 +39 @@
 import org.greenstone.gatherer.gui.LongProgressBar;
 import org.greenstone.gatherer.gui.tree.DragTree;
-import org.greenstone.gatherer.msm.MetadataXMLFileManager;
 import org.greenstone.gatherer.undo.UndoManager;
 import org.greenstone.gatherer.util.ArrayTools;
@@ -445 +444 @@
                     if (job.source.toString().equals("Collection")) {
                     ///ystem.err.println("Move within collection...");
-                    MetadataXMLFileManager gdm = Gatherer.c_man.getCollection().gdm;
                     // we just retrieve the metadata attached to the origin node...
-                    ArrayList existing_metadata = gdm.getMetadataOnly(source_file);
+                    ArrayList existing_metadata = Gatherer.c_man.getCollection().gdm.getMetadataOnly(source_file);
                     ///atherer.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
                     // then assign this remainder to the new folder.
                     ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
-                    gdm.addMetadata(new_node, existing_metadata);
+                    Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
                     existing_metadata = null;
-                    gdm = null;
                     }
                 // If it came from the recycle bin retrieve the metadata from there, once again remembering to account for inherited metadata
                     else if (job.source.toString().equals("Undo")) {
-                    MetadataXMLFileManager gdm = Gatherer.c_man.getCollection().gdm;
                     // Retrieve metadata from the recycle bin
                     ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
                     // then assign this remainder to the new folder.
-                    gdm.addMetadata(new_node, existing_metadata);
+                    Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
                     existing_metadata = null;
-                    gdm = null;
                     }
                 // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueNode.java

@@ -50 +50 @@
 import java.util.*;
 import javax.swing.tree.*;
-import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.StaticStrings;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
 
@@ -87 +85 @@
     return toString().compareTo(sibling.toString());
     }
-
-    /** Determine if this tree node contains a child with a matching value.
-     * @param value The value we are attempting to match, as a <strong>String</strong>.
-     * @return <i>true</i> if there is a matching child node, <i>false</i> otherwise.
-     */
-    /* private boolean containsValue(String value) {
-    if(default_value != null) {
-        return false;
-    }
-    return getValue(value) != null;
-    } */
 
     /** Returns an enumeration of the child nodes.
@@ -323 +310 @@
     String result = null;
     if(name.equals("Subject")) {
-        result = MSMUtils.getValue(element);
+        result = XMLTools.getValue(element);
         ///ystem.err.print(result);
         switch(decode_type) {