Changeset 36151

Timestamp:

2022-05-09T09:48:37+12:00 (2 years ago)

Author:

kjdon

Message:

Facet and SortField inherit from Index, as basically the same code but diff element names. added getElementName() and getDefaultElementName() so that the subclasses can use their own element names

Location:

main/trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• Facet.java (added)
• Index.java (modified) (5 diffs)
• SortField.java (added)

main/trunk/gli/src/org/greenstone/gatherer/cdm/Index.java

@@ -49 +49 @@
     protected Element element = null;
     /** The name for our elements */
-    protected String element_name = StaticStrings.INDEX_ELEMENT;
+    static final String index_element = StaticStrings.INDEX_ELEMENT;
     /** The name for the default element */
-    protected String default_element_name = StaticStrings.INDEX_DEFAULT_ELEMENT;
+    static final String default_index_element = StaticStrings.INDEX_DEFAULT_ELEMENT;
     /** The unique, if cryptic, identifier of an index. */
     protected String id = null;
@@ -68 +68 @@
     this.sources = sources;
     // Create a new element
-    this.element = CollectionConfiguration.createElement(this.element_name);
+    this.element = CollectionConfiguration.createElement(getElementName());
     // For each source add a content element
     int size = sources.size();
@@ -87 +87 @@
     }
 
+    protected String getElementName() {
+    return index_element;
+    }
+
+    protected String getDefaultElementName() {
+    return default_index_element;
+    }
+
     /** Method to compare two indexes.
      * @param object The other index as an <strong>Object</strong>.
@@ -102 +110 @@
     public DOMProxyListEntry create(Element element) {
     return new Index(element);
+    }
+    public DOMProxyListEntry create(ArrayList sources) {
+    return new Index(sources);
     }
 
@@ -196 +207 @@
      */
     public void setSources(ArrayList sources) {
-    if(element != null && element.getNodeName().equals(this.default_element_name)) {
+    if(element != null && element.getNodeName().equals(getDefaultElementName())) {
         // Erase old sources
         XMLTools.clear(element);