Changeset 30837


Ignore:
Timestamp:
2016-09-22T12:04:07+12:00 (5 years ago)
Author:
kjdon
Message:

use the new DisplayItemUtil class instead of loca methods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java

    r28966 r30837  
    4242    if (display_list != null) {
    4343      resolveMacros(display_list);
    44         addDisplayItems(display_list);
     44      DisplayItemUtil.storeDisplayItems(this.display_item_list, display_list);
    4545    }
    4646
     
    8787        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
    8888        if (param_list == null) {
    89         addAllDisplayInfo(description, lang);
     89          Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
     90          description.appendChild(di_list);
     91          DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
     92         
    9093        description.appendChild(response_doc.importNode(this.service_list, true));
    9194        description.appendChild(response_doc.importNode(this.metadata_list, true));
     
    108111            description.appendChild(response_doc.importNode(metadata_list, true));
    109112            } else if (info.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
    110             addAllDisplayInfo(description, lang);
     113              Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
     114              description.appendChild(di_list);
     115              DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
     116       
    111117           
    112118            } else if (info.equals(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER)) {
Note: See TracChangeset for help on using the changeset viewer.