Changeset 9170

Timestamp:

2005-02-24T14:44:42+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed a whole lot of dead code.

Location:

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

Files:

• ElementWrapper.java (modified) (1 diff)
• GValueModel.java (deleted)
• GValueNode.java (deleted)
• MSMUtils.java (modified) (2 diffs)
• MetadataSet.java (modified) (11 diffs)
• MetadataSetManager.java (modified) (3 diffs)
• TransformCharacterTextField.java (modified) (2 diffs)

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

@@ -266 +266 @@
     }
 
-    public boolean hasValueTree() {
-    return element.getAttribute(StaticStrings.VALUE_TREE_ATTRIBUTE).equalsIgnoreCase(StaticStrings.TRUE_STR);
-    }
-
     /** Increment the number of occurances of this metadata element.
      * @see org.greenstone.gatherer.msm.MSMUtils

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

@@ -424 +424 @@
 
 
-    /** Method to traverse the given value tree, and build up a hashtable of mappings between the value path key names and the Subject nodes of the tree.
-     * @param current The root <strong>Node</strong> of a subtree of the AssignedValues tree.
-     * @param prefix The value path key <strong>String</string>, which shows the path from the root of the AssignedValue tree to <i>current</i>s parent using '\' as a separator.
-     * @param values A <strong>Hashtable</strong> containing the mapping discovered so far in our tree traversal.
-     */ 
-    static final private void getValueMappings(Node current, String prefix, Hashtable values) {
-    if(current != null) {
-        String name = current.getNodeName();
-        String new_prefix = prefix;
-        // If we've found the outer layer of a new value, add it to our mapping
-        if(name.equals("Subject")) {
-        Node value_node = getNodeFromNamed(current, "Value");
-        String value = getValue(value_node);
-        if(new_prefix != null) {
-            new_prefix = new_prefix + "\\" + value;
-        }
-        else {
-            new_prefix = value;
-        }
-        values.put(new_prefix, current);
-        }
-        if(name.equals("Subject") || name.equals("AssignedValues")) {
-        for(Node child = current.getFirstChild(); child != null;
-            child = child.getNextSibling()) {
-            getValueMappings(child, new_prefix, values);
-        }
-        }
-    }
-    }
-
-
-    /** Parses the value tree template file.
-     * @return The Document parsed.
-     */
-    static final public Document getValueTreeTemplate() {
-    return Utility.parse(GEMS.METADATA_VALUE_TEMPLATE, true);
-    }
-
-
     /** Determine if the named attribute is language specific for this collection. This information is found in a DOM attribute of the document element, as a comma separated list of attribute names.
      * @param document the Document for which we wish to check the language requirements
@@ -686 +647 @@
     }
     }
- 
-
-    /** Method to determine if two Value nodes are equal.
-     * @param av A <strong>Node</strong> representing a value.
-     * @param bv The <strong>Node</strong> we want to compare it to.
-     * @return A <i>boolean</i> which is <i>true</i> if the two value nodes are equal, <i>false</i> otherwise.
-     */
-    static final private boolean valuesEqual(Node av, Node bv) {
-    // Check we are comparing apples and apples...
-    if(av.getNodeName().equals("Value") && 
-       bv.getNodeName().equals("Value")) {
-        // Retrieve and then compare their text values.
-        Node at = av.getFirstChild();
-        Node bt = bv.getFirstChild();
-        if(at.getNodeValue().equals(bt.getNodeValue())) {
-        return true;
-        }
-    }
-    return false;
-    }
 }

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

@@ -60 +60 @@
     public String old_filename = null;
     private File     file     = null;
-    /** A mapping from metadata elements to the root element of the value trees for that element. */
-    private Hashtable value_trees = null;
     /** The list of metadata elements which are, of course, children of the root node. */
     private ArrayList elements = null;
@@ -85 +83 @@
     
     this.file = new File(metadata_template);
-    this.value_trees = new Hashtable();
     this.document = Utility.parse(metadata_template, true);
 
@@ -96 +93 @@
     public MetadataSet(File file) {
     this.file = file;
-    this.value_trees = new Hashtable();
     this.document = XMLTools.parseXMLFile(file);
 
@@ -106 +102 @@
      */
     public MetadataSet(MetadataSet original) {
-    this.value_trees = new Hashtable();
     // We have to create a new document.
     document = new DocumentImpl(original.getDocument().getDoctype());
@@ -114 +109 @@
     //elements = root.getElementsByTagName("Element");
     file = original.getFile();
-    // Now for each element read in its value tree if present.
-    for(int i = elements.size() - 1; i >= 0; i--) {
-        ElementWrapper value_element_wrapper = new ElementWrapper((Element)elements.get(i));
-        GValueModel value_tree = original.getValueTree(value_element_wrapper);
-        Document value_document = value_tree.getDocument();
-        Document value_document_copy = new DocumentImpl(value_document.getDoctype());
-        Element value_element = value_document.getDocumentElement();
-        Element value_element_copy = (Element) value_document_copy.importNode(value_element, true);
-        value_document_copy.appendChild(value_element_copy);
-        GValueModel value_tree_copy = new GValueModel(value_element_wrapper, value_document_copy);
-        value_trees.put(value_element_wrapper, value_tree_copy);
-    }
     }
   
@@ -136 +119 @@
         setChanged = val;
     }
-      /** Conditional copy constructor. 
-     * @param original The original metadata set to copy from.
-     * @param condition An <i>int</i> which matches one of the tree pruning filter types.
-     */
-    public MetadataSet(MetadataSet original, int condition) {
-    this(original); 
-    // Now based on condition, we may have to remove some nodes from
-    // this model.
-    switch(condition) {
-    case ALL_VALUES:
-        // Do nothing.
-        break;
-    case SUBJECTS_ONLY:
-        // For each element retrieve its AssignedValues element.
-        for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); ) {
-        ElementWrapper value_element = (ElementWrapper)keys.nextElement();
-        GValueModel value_tree = (GValueModel)value_trees.get(value_element);
-        Document value_tree_document = value_tree.getDocument();
-        Element value_tree_root_element = value_tree_document.getDocumentElement();
-        // Traverse tree and remove leaf nodes. 
-        MSMUtils.traverseTree(value_tree_root_element, MSMUtils.NONE, true);
-        }
-        break;
-    case NO_VALUES:
-        // Remove assigned values trees.
-        value_trees.clear();
-        break;
-    }
-    }
+
 
     public void setCollection(String coll) {
@@ -213 +168 @@
     }
 
-   
-    /** Method to add a new metadata element to this metadata set, if and only if the element is not already present. 
-     * @param others_element An <strong>Element</strong> we wish to add to this metadata set, that currently belongs to some other set.
-     * @param model A <strong>GValueModel</strong> value tree 
-     * @return <i>null</i> if the add is successful, otherwise a <strong>String</strong> containing an error message (phrase key).
-     */
-    public String addElement(Element others_element, GValueModel model) {
-    if(!containsElement(others_element.getAttribute("name"))) {
-        // First get ownership of the new element, then add it.
-        Element our_element = (Element)document.importNode(others_element, true);
-        // add the value tree
-        root.appendChild(our_element);
-        if (model != null) {
-        addValueTree(new ElementWrapper(our_element), model);   
-        }    
-        return null;
-    }
-    else {
-        return "MSMPrompt.Name_Exists";
-    }
-    }
-
-    /** Method to add a new metadata element with the specified new name to this metadata set, if and only if the name is not already in use. 
-     * @param others_element An <strong>Element</strong> we wish to add to this metadata set, that currently belongs to some other set.
-     * @param new_name The new name to be given this element, as a <strong>String</strong>.
-     * @param model A <strong>GValueModel</strong> value tree 
-     * @return <i>null</i> if the add is successful, otherwise a <strong>String</strong> containing an error message (phrase key).
-     */
-    public String addElement(Element others_element, String new_name, GValueModel model) {
-    if(!containsElement(new_name)) {
-        // First get ownership of the new element, then add it.
-        Element our_element = 
-        (Element) document.importNode(others_element, true);
-        // Change name
-        our_element.setAttribute("name", new_name);
-        // we also want to change the english identifier of this element
-        MSMUtils.setIdentifier(our_element, new_name);
-        // Add it to teh set
-        root.appendChild(our_element);
-        // add the value tree
-        if (model != null) {
-        addValueTree(new ElementWrapper(our_element), model);
-        }
-        return null;
-    }
-    else {
-        return "MSMPrompt.Name_Exists";
-    }
-    }
-    /** Add a value tree to a given metadata element.
-     * @param element The <strong>ElementWrapper</strong> containing the element you wish to add a value tree for.
-     * @param model A <strong>GValueModel</strong> value tree 
-     */
-    public void addValueTree(ElementWrapper element, GValueModel model) {
-    ///ystem.err.println("Adding value tree for " + element.toString());
-    value_trees.put(element, model);
-    }
 
     public int compare(Element e1, Element e2) {
@@ -466 +364 @@
     return root;
     }
-    /** Retrieve the value tree from this set that matches the given element.
-     * @param element The target <strong>ElementWrapper</strong>.
-     * @return A <strong>GValueModel</strong> value tree, or <i>null</i> if no such element or value tree.
-     */
-    public GValueModel getValueTree(ElementWrapper element) {
-    GValueModel value_tree = null;
-    // Stinking hashtable get doesn't use the overridden equals. So I'll do a loop, which should be pretty small ie O(n) for n metadata elements.
-    for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); ) {
-        ElementWrapper sibling = (ElementWrapper) keys.nextElement();
-        if(sibling.equals(element)) {
-        value_tree = (GValueModel) value_trees.get(sibling);
-        break;
-        }
-    }
-    // If we've found no value tree, create a new one.
-    if(value_tree == null) {
-        value_tree = new GValueModel(element);
-        value_trees.put(element, value_tree);
-    }
-    return value_tree;
-    }
+
     /** Remove a mds level attribute.
      * @param name The name of the attribute to remove.
@@ -501 +379 @@
     try {
         ElementWrapper element_wrapped = new ElementWrapper(element);
-        removeValueTree(element_wrapped);
 
         if(parent == null)
@@ -531 +408 @@
     
 
-    /** Used to remove the value tree for a specific element.
-     * @param element The <strong>ElementWrapper</strong> whose tree you wish to remove.
-     * @return The <strong>GValueModel</strong> we just removed
-     */
-    public GValueModel removeValueTree(ElementWrapper element) {
-    for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); )
-        {
-        ElementWrapper sibling = (ElementWrapper) keys.nextElement();
-        if(sibling.equals(element))
-            {
-            GValueModel value_tree = (GValueModel) value_trees.get(sibling);
-            value_trees.remove(sibling);
-            return value_tree;
-            }
-        }
-    return null;
-    }
     /** Set one of the mds level attributes.
      * @param name The attribute to change.
@@ -683 +543 @@
         this.root = document.getDocumentElement();
         this.elements = XMLTools.getChildElementsByTagName(root, "Element");
-        // Now for each element read in its value tree if present.
-        for(int i = elements.size() - 1; i >= 0; i--) {
-        ElementWrapper value_element = new ElementWrapper((Element)elements.get(i));
-        File value_file = new File(file.getParentFile(), value_element.getName() + ".mdv");
-        ///ystem.err.println("Searching for " + value_file.getAbsolutePath());
-        if(value_file.exists()) {
-            Document value_document;
-            if (use_classloader) {
-            value_document = Utility.parse(value_file.toString(), true);
-            }
-            else {
-            value_document = XMLTools.parseXMLFile(value_file);
-            }
-            if(value_document != null) {
-            value_trees.put(value_element, new GValueModel(value_element, value_document));
-            }
-            else {
-            DebugStream.println("Error! Missing mdv file: " + value_file.getAbsolutePath());
-            }
-        }
-        }
     }
     else {

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

@@ -120 +120 @@
         System.err.println("Error: no such set \'" + current_set + "\'");
         }
-    }
-
-
-    /** Add a value tree to a given metadata element represented as a GValueModel
-     * @param model The <strong>GValueTree</strong> model
-     */
-    public void addValueTree(GValueModel model) {
-    ElementWrapper element = model.getElement();
-    String namespace = element.getNamespace();
-    MetadataSet mds = (MetadataSet) mds_hashtable.get(namespace);
-    if(mds != null) {
-        mds.addValueTree(element, model);
-    }
     }
 
@@ -314 +301 @@
   
 
-    /** Get the value tree that matches the given element.
-     * @param element The ElementWrapper representing the element.
-     * @return The GValueModel representing the value tree or null.
-     */
-    public GValueModel getValueTree(ElementWrapper element) {
-    GValueModel value_tree = null;
-    if(element != null) {
-        String namespace = element.getNamespace();
-        if(namespace.length() > 0) {
-        MetadataSet mds = (MetadataSet) mds_hashtable.get(namespace);
-        if(mds != null) {
-            value_tree = mds.getValueTree(element);
-        }
-        }
-    }
-    return value_tree;
-    }
-
-
     public MetadataSet loadMetadataSet(File metadata_set_file)
     {
@@ -430 +398 @@
 
 
-    /*Following write() and write() and save() were taken from msm/metadatasetmanager.java and converted to 
-     *the gems standard
-     */
-     private void write(ElementWrapper element, GValueModel model, String etc_dir) {
-    try {
-        File out_file = new File(etc_dir + element.getName() + ".txt");
-        FileOutputStream fos = new FileOutputStream(out_file);
-        OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8");
-        BufferedWriter bw = new BufferedWriter(osw, Utility.BUFFER_SIZE);
-        Vector all_values = model.traverseTree();
-        for(int i = 0; i < all_values.size(); i++) {
-        GValueNode node = (GValueNode)all_values.get(i);
-        String full_value = node.getFullPath(false);
-        String index = model.getHIndex(full_value);
-
-        write(bw, "\"" + full_value + "\"\t" + index + "\t\"" + node.toString(GValueNode.GREENSTONE) + "\"");
-        }
-        // Very important we do this, or else buffer may not be flushed
-        bw.flush();
-        bw.close();
-    }
-    catch(Exception error) {
-        error.printStackTrace();
-    }
-    }
-
-    private void write(Writer w, String text)
-    throws Exception {
-    text = text + "\r\n";
-    char buffer[] = text.toCharArray();
-    w.write(buffer, 0, buffer.length);
-    }
-
     public void save() {
     File file = new File(Utility.METADATA_DIR);

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

@@ -27 +27 @@
 package org.greenstone.gatherer.gems;
 
-/**************************************************************************************
- * Written:     04/07/03
- * Revised:     
- **************************************************************************************/
 import java.util.*;
 import javax.swing.*;
 import javax.swing.text.*;
+
+
 /** A JTextField that doesn't allow certain characters, either blocking or replacing them
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -64 +62 @@
     }
 
-//      public void blockCharacter(char x) {
-//      mappings.put(new Character(x), null);
-//      }
-
     public void replaceCharacter(char x, char y) {
     mappings.put(new Character(x), new Character(y));
     }
-
-//      public void restoreCharacter(char x) {
-//      mappings.remove(new Character(x));
-//      }
 
     public void setBlockAllExceptMappings(boolean block_all_except_mappings) {