Changeset 35391

Timestamp:

2021-09-14T14:17:21+12:00 (3 years ago)

Author:

kjdon

Message:

getInterfaceText now uses a custom classloader, which looks in web/interfaces/interface_name/resources - this allows you to put your interface_xxx.properties file directly into your interface - useful when developing a custom interface, as it keeps the files together inside the interface

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -237 +237 @@
     public static String getInterfaceText(String interface_name, String dictionary_name, String lang, String key, String args_str)
     {
-        String[] args = null;
+          // now we allow looking for files in the interface's resources folder
+          CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), interface_name));
+                String[] args = null;
         if (args_str != null && !args_str.equals(""))
         {
@@ -244 +246 @@
 
         // try the specified dictionary first
-        Dictionary dict = new Dictionary(dictionary_name, lang);
+        Dictionary dict = new Dictionary(dictionary_name, lang, my_loader);
         String result = dict.get(key, args);
         if (result == null) {
@@ -285 +287 @@
   public static String getInterfaceTextWithArgs(String interface_name, String lang, String key, String[] args)
   {
-    Dictionary dict = new Dictionary("interface_" + interface_name, lang);
+    // now we allow looking for files in the interface's resources folder
+    CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), interface_name));
+    Dictionary dict = new Dictionary("interface_" + interface_name, lang, my_loader);
     
-    // do we need this?? values can have __INTERFACE_NAME__ but would keys ever have it???
-    key = key.replaceAll("__INTERFACE_NAME__", interface_name);
     String result = dict.get(key, args);
     if (result == null)
-      { // not found - TODO delete this???
-    //if not found, search a separate subdirectory named by the interface name
+      {  
+    //if not found, search a separate subdirectory named by the interface name. this is used for eg the flax interface. this could be replaced by new class loader option?
     String sep_interface_dir = interface_name + File.separatorChar + lang + File.separatorChar + "interface";
     dict = new Dictionary(sep_interface_dir, lang);