Changeset 33771 for main

Timestamp:

2019-12-09T11:33:34+13:00 (4 years ago)

Author:

kjdon

Message:

use the new Dictionary.getTExtSTring instead of repeating all the code here

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -226 +226 @@
     }
 
-    protected String getTextString(String key, String lang, String dictionary, String[] args)
-    {
-      logger.error("lang = "+lang);
-        if (dictionary != null)
-        {
-            // just try the one specified dictionary
-          Dictionary dict = new Dictionary(dictionary, lang);
-            String result = dict.get(key, args);
-            if (result == null)
-            { // not found
-                return "_" + key + "_";
-            }
-            return result;
-        }
-
-        // otherwise we try class names for dictionary names
-        String class_name = this.getClass().getName();
-        class_name = class_name.substring(class_name.lastIndexOf('.') + 1);
-        Dictionary dict = new Dictionary(class_name, lang);
-        String result = dict.get(key, args);
-        if (result != null)
-        {
-            return result;
-        }
-
-        // we have to try super classes
-        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);
-            result = dict.get(key, args);
-            c = c.getSuperclass();
-        }
-        if (result == null)
-        {
-            return "_" + key + "_";
-        }
-        return result;
-
+    protected String getTextString(String key, String lang, String[] args)
+    {
+        return Dictionary.getTextString(key, lang, args, null, null, null, null);
     }