Changeset 30838

Show
Ignore:
Timestamp:
22.09.2016 12:05:14 (3 years ago)
Author:
kjdon
Message:

use CustomClassLoader? instead of CollectionClassLoader?. Also don't need to override getTextString as that is now handled by DisplayItemUtil?

Files:
1 modified

Legend:

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

    r30670 r30838  
    3333import org.apache.log4j.Logger; 
    3434import org.greenstone.gsdl3.core.ModuleInterface; 
    35 import org.greenstone.gsdl3.util.CollectionClassLoader; 
     35import org.greenstone.gsdl3.util.CustomClassLoader; 
    3636import org.greenstone.gsdl3.util.Dictionary; 
    3737import org.greenstone.gsdl3.util.GSFile; 
     
    8989     * put properties files, dtds etc in here 
    9090     */ 
    91     CollectionClassLoader class_loader = null; 
     91    //CustomClassLoader class_loader = null; 
    9292 
    9393    /** same as setClusterName */ 
     
    121121        } 
    122122        // set up the class loader 
    123         this.class_loader = new CollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name); 
     123        this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name)); 
    124124 
    125125        macro_resolver.addMacro("_httpcollection_", this.site_http_address + "/collect/" + this.cluster_name); 
     
    919919    } 
    920920 
    921   // override this to use collection class loader 
    922   protected String getTextString(String key, String lang, String dictionary, String[] args) 
    923   { 
    924     Dictionary dict = new Dictionary(dictionary, lang, this.class_loader); 
    925     String result = dict.get(key, args); 
    926     if (result == null) 
    927       { // not found 
    928     //return "_" + key + "_"; 
    929     return null; 
    930       } 
    931     return result; 
    932   } 
    933921 
    934922}