Changeset 33774

Timestamp:

2019-12-09T11:37:07+13:00 (4 years ago)

Author:

kjdon

Message:

getTextString code moved to Dictionary.getTextSTring, as its no longer only used by ServiceRacks - actions, and LIbraryServlet now use this method too.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -579 +579 @@
     {
 
-        // we want to use the collection class loader in case there are coll specific files
-        if (dictionary != null)
-        {
-            // just try the one specified dictionary
-            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;
-        }
-
-        // now we try class names for dictionary names
-        String original_class_name = this.getClass().getName();
-        original_class_name = original_class_name.substring(original_class_name.lastIndexOf('.') + 1);
-        Dictionary dict = new Dictionary(original_class_name, lang, this.class_loader);
-        String result = dict.get(key, args);
-        if (result != null)
-        {
-            return result;
-        }
-
-        // we have to try super classes
-        String class_name;
-        Class c = this.getClass().getSuperclass();
-        while (result == null && c != null)
-        {
-            class_name = c.getName();
-            class_name = class_name.substring(class_name.lastIndexOf('.') + 1);
-            if (class_name.equals("ServiceRack"))
-            {
-                // this is as far as we go
-                break;
-            }
-            dict = new Dictionary(class_name, lang, this.class_loader);
-            result = dict.get(key, args);
-            c = c.getSuperclass();
-        }
-        if (result == null)
-        {
-          // try the ServiceRack properties
-          // at the moment we look for original_class_name.key, then just key
-          // if there is lots of inheritance, may want to try down the list of superclasses too...?
-          class_name = "ServiceRack";
-          dict = new Dictionary(class_name, lang, this.class_loader);
-          String full_key = original_class_name+"."+key;
-          result = dict.get(full_key, args);
-          if(result == null) {
-            result = dict.get(key, args);
-          }
-          if(result == null) {
-            //return "_" + key + "_";
-            return null;
-          }
-        }
-        return result;
-    
+        return Dictionary.getTextString(key, lang, args, dictionary, this.getClass(), "ServiceRack", this.class_loader);
     }