Changeset 30838 for main/trunk/greenstone3/src/java

Timestamp:

2016-09-22T12:05:14+12:00 (8 years ago)

Author:

kjdon

Message:

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -33 +33 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.core.ModuleInterface;
-import org.greenstone.gsdl3.util.CollectionClassLoader;
+import org.greenstone.gsdl3.util.CustomClassLoader;
 import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.gsdl3.util.GSFile;
@@ -89 +89 @@
      * put properties files, dtds etc in here
      */
-    CollectionClassLoader class_loader = null;
+    //CustomClassLoader class_loader = null;
 
     /** same as setClusterName */
@@ -121 +121 @@
         }
         // set up the class loader
-        this.class_loader = new CollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name);
+        this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name));
 
         macro_resolver.addMacro("_httpcollection_", this.site_http_address + "/collect/" + this.cluster_name);
@@ -919 +919 @@
     }
 
-  // override this to use collection class loader
-  protected String getTextString(String key, String lang, String dictionary, String[] args)
-  {
-    Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
-    String result = dict.get(key, args);
-    if (result == null)
-      { // not found
-    //return "_" + key + "_";
-    return null;
-      }
-    return result;
-  }
 
 }