Changeset 33769 for main

Timestamp:

2019-12-09T11:29:20+13:00 (4 years ago)

Author:

kjdon

Message:

updated getTextSTring to contain all the functionality from ServiceRack's getTextString, so need to pass in class, and stop_at_class arguments

File:

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

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

@@ -30 +30 @@
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.Dictionary.class.getName());
 
+    /** The default servlet dictionary */
+    public static final String core_servlet_dictionary_name = "core_servlet_dictionary";
+    
     /** The locale of this dictionary. */
     protected Locale locale = null;
@@ -97 +100 @@
         }
         // try the specified class loader
-        try
-        {
+        if (loader != null) {
+            try
+            {
             this.raw = ResourceBundle.getBundle(this.resource, this.locale, loader);
             return;
-        }
-        catch (Exception e)
-        {
-        }
-        ;
-
+            }
+            catch (Exception e)
+            {
+            }
+        }
+
+        // try with default class loader
         try
         {
-            this.raw = ResourceBundle.getBundle(this.resource, this.locale);
+            this.raw = ResourceBundle.getBundle(this.resource, this.locale);
         }
         catch (Exception ex)
@@ -234 +239 @@
     }
 
-  public static String getTextString(String key, String lang, String dictionary_name, ClassLoader class_loader, String[] args)
+    
+    public static String getTextString(String key, String lang, String[] args, String dictionary_name, Class class_obj, String stop_at_class, ClassLoader class_loader)
   {
 
-      // we want to use the collection class loader in case there are coll specific files
-      if (dictionary_name != null)
-        {
-          // just try the one specified dictionary
-          Dictionary dict = new Dictionary(dictionary_name, lang, class_loader);
-          String result = dict.get(key, args);
-          if (result == null)
-        { // not found
-          
-          logger.error("couldn't find key in dict, "+key);
-          return "_" + key + "_";
-          //return null;
-        }
+      if (dictionary_name == null && class_obj == null) {
+      // no dictionary or class was specified, just use the default
+      // dictionary
+      dictionary_name = core_servlet_dictionary_name;
+      }
+      
+      if (dictionary_name != null)
+      {
+      // just try the one specified dictionary
+      Dictionary dict = new Dictionary(dictionary_name, lang, class_loader);
+      String result = dict.get(key, args);
+      if (result == null)
+      { // not found
+          
+          logger.error("couldn't find key in dict, "+key);
+          //return "_" + key + "_"; // should we use this??
+          return null;
+      }
+      return result;
+      }
+
+      // try the class names first before the default dictionary
+      String original_class_name = class_obj.getName();
+      original_class_name = original_class_name.substring(original_class_name.lastIndexOf('.') + 1);
+      Dictionary dict = new Dictionary(original_class_name, lang, class_loader);
+      String result = dict.get(key, args);
+      if (result != null)
+      {
+      return result;
+      }
+
+      // we have to try super classes
+      String class_name;
+      Class c = class_obj.getSuperclass();
+      while (c != null)
+      {
+      class_name = c.getName();
+      class_name = class_name.substring(class_name.lastIndexOf('.') + 1);
+      if (class_name.equals(stop_at_class))
+      {
+          // this is as far as we go
+          break;
+      }
+      dict = new Dictionary(class_name, lang, class_loader);
+      result = dict.get(key, args);
+      if (result != null) {
           return result;
-        }
-      return "_" + key + "_";
+      }
+      c = c.getSuperclass();
+      }
+
+      // if we got here, class names were no help, try the default dictionary
+      dict = new Dictionary(core_servlet_dictionary_name, lang, class_loader);
+
+      // First we try the key qualified with the original class name
+      // (eg have TextQuery.name and LuceneSearch.TextQuery.name in the
+      // default properties file)
+      String full_key = original_class_name+"."+key;
+      result = dict.get(full_key, args);
+      if (result == null) {
+      result = dict.get(key, args);
+      }
+      return result;
+       
   }