Changeset 8000

Timestamp:

2004-08-18T17:16:31+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed some dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (11 diffs)

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

@@ -136 +136 @@
      * @return <i>true</i> if the two trees are equal, <i>false</i> otherwise.
      */
-    static final public boolean assignedValuesEqual(Node avt, Node bvt) {
+    static final private boolean assignedValuesEqual(Node avt, Node bvt) {
     if(avt == null && bvt == null) {
         return true; // Both are null so both are equal.
@@ -186 +186 @@
     }
 
-    /** Method to determine if a certain path of elements can be found in another tree. This method tests by comparing node names, and finally the #text node past the leaf end of the path.
-     * @param tree The root <strong>Node</strong> of the tree to be searched.
-     * @param path The <strong>Node[]</strong> path to be found.
-     * @return <i>true</i> if the path was found (including matching #text elements at the leaf), or <i>false</i> otherwise.
-     */
-    /* static final private boolean containsPath(Node tree, Node path[]) {
-    // If there is no tree then there are no values.
-    if(tree == null) {
-        return false;
-    }
-    // Ensure we are comparing equivent things.
-    if(tree.getNodeName().equals("AssignedValues") && path[0].getNodeName().equals("AssignedValues")) {
-        int index = 1;
-        while(index < path.length && tree != null) {
-        Node next = null;
-        for(Node n = tree.getFirstChild(); n != null && next == null; n = n.getNextSibling()) {
-            if(n.getNodeName().equals(path[index].getNodeName())) {
-            next = n;
-            index++;
-            }
-            tree = next;
-        }
-        }
-                // Tree may now be pointing at the same node as 
-                // path[path.length - 1] so we should test their child text nodes.
-        if(tree != null) {
-        Node tree_text = tree.getFirstChild();
-        Node path_text = path[path.length - 1].getFirstChild();
-        if(tree_text.getNodeValue().equals(path_text.getNodeValue())) {
-            // Path found!
-            return true;
-        }
-        }
-    }
-    return false;        
-    } */
     /** Method to compare two metadata elements (of type Element, which is bound to get more than a bit confusing) for equality. This test may only check the structural (ie pretty much unchanging) consistancy, or may include the AssignedValue tree as well (which will be different for each collection I'd imagine).
      * @param a_set The <strong>MetadataSet</strong> a comes from.
@@ -365 +329 @@
      * @return An <i>int</i> which is the number of attribute nodes.
      */
-    static final public int getAttributeCount(Node element) {
+    static final private int getAttributeCount(Node element) {
     int count = 0;
     for(Node n = element.getFirstChild(); n != null; 
@@ -374 +338 @@
     }
     return count;
-    }
-
-    /*************************************************************************/
-    /** This method is a slight variation on getNodeNamed in that it is especially written to retrieve the attribute Nodes of a certain name present under the given element. Note that this method is language specific.
-     * @param element The target element <strong>Node</strong>.
-     * @param name The name of the attribute you wish to return.
-     * @return An <strong>Element[]</strong> containing the attributes you requested, or <i>null</i> if no such attributes exists.
-     */
-    static final public Element getAttributeNodeNamed(Node element, String name) { 
-    Element attribute = null;
-    String language_code = Gatherer.config.getLanguage();
-    for(Node n = element.getFirstChild(); n != null; n = n.getNextSibling()) {
-        if(n.getNodeName().equals("Attribute")) {
-        Element e = (Element)n;
-        if(e.getAttribute("name").equals(name)) {
-            if(e.getAttribute("language").equalsIgnoreCase(language_code)) {
-            return e;
-            }
-            else if(e.getAttribute("language").equalsIgnoreCase("en")) {
-            attribute = e;
-            }
-            else if(attribute == null) {
-            attribute = e;
-            }
-        }
-        e = null;
-        }
-    }
-    return attribute;
     }
 
@@ -468 +403 @@
      * @see org.greenstone.gatherer.util.StaticStrings#NAME_ATTRIBUTE
      */
-    static public String getElementAttribute(Element element_element, String attribute_name_str, String language_code_str) {
+    static private String getElementAttribute(Element element_element, String attribute_name_str, String language_code_str) {
     boolean found = false;
     String result = StaticStrings.EMPTY_STR;
@@ -646 +581 @@
     }
 
-    /** This method traces the path between the 'root' node given and the target node. This path is returned starting at the root.
-     * @param root The root <strong>Node</strong> to start this path at.
-     * @param target The final <strong>Node</strong> to end up at.
-     * @return A <strong>Node[]</strong> that contains the sequence of nodes from root to target.
-     */
-    static final public Node[] getPath(Node root, Node target) {
-    if(root == target) {
-        return ArrayTools.add(null, root);
-    }
-    else {
-        return ArrayTools.add(getPath(root, target.getParentNode()), target);
-    }
-    }
 
     /** This method extracts the structural details from a certain element and stores them in an array, all ready for passing to the <strong>Dictionary</strong>.
@@ -724 +646 @@
      * @param values A <strong>Hashtable</strong> containing the mapping discovered so far in our tree traversal.
      */ 
-    static final public void getValueMappings(Node current, String prefix, Hashtable values) {
+    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 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");
@@ -761 +682 @@
      * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
      */
-    static public boolean isAttributeLanguageDependant(Document document, String attribute_name_str) {
+    static private boolean isAttributeLanguageDependant(Document document, String attribute_name_str) {
     String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE).toLowerCase();
     return language_specific_attributes.indexOf(attribute_name_str) != -1;
@@ -772 +693 @@
      * @see org.greenstone.gatherer.util.StaticStrings#EMPTY_STR
      */
-    static public boolean isLegacyMDS(Document document) {
+    static private boolean isLegacyMDS(Document document) {
     ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE));
     return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
@@ -783 +704 @@
      * TODO Implementation
      */
-    static final public boolean optionListsEqual(Node al, Node bl) {
+    static final private boolean optionListsEqual(Node al, Node bl) {
     // Compare the 'restricted' attribute of the two lists.
     Element ae = (Element) al;
@@ -1056 +977 @@
      * @return A <i>boolean</i> which is <i>true</i> if the two value nodes are equal, <i>false</i> otherwise.
      */
-    static final public boolean valuesEqual(Node av, Node bv) {
+    static final private boolean valuesEqual(Node av, Node bv) {
     // Check we are comparing apples and apples...
     if(av.getNodeName().equals("Value") &&