Changeset 9279

Timestamp:

2005-03-04T15:22:41+13:00 (19 years ago)

Author:

kjdon

Message:

changed again how you get text strings. have gone back to using the class name if no dictionary name is specified, but will now look up the super class list until a string is found. can still specify a dictionary in the getTextString call.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (5 diffs)

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

@@ -87 +87 @@
     protected HashMap format_info_map = null;
 
-    /** the name of the Dictionary to be used. The classname will be used if null */
-    protected String dictionary_name = null;
-
     /** sets the cluster name */
     public void setClusterName(String cluster_name) {
@@ -119 +116 @@
     this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
     this.format_info_map = new HashMap();
-    // the default value for the dictionary is the classname
-    String class_name = this.getClass().getName();
-    class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    this.dictionary_name = class_name;
-
     }
     
@@ -335 +327 @@
     /** overloaded version for no args case */
     protected String getTextString(String key, String lang) {
-    return getTextString(key, lang, this.dictionary_name, null);
+    return getTextString(key, lang, null, null);
     }
 
@@ -342 +334 @@
     }
     protected String getTextString(String key, String lang, String [] args) {
-    return getTextString(key, lang, this.dictionary_name, args);
+    return getTextString(key, lang, null, args);
     }
     
@@ -352 +344 @@
     //String class_name = this.getClass().getName();
     //class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    
-    Dictionary dict = new Dictionary(dictionary, 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;
+    }
+
+    // else 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) { // not found
+    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;
+    
     }