Changeset 8952

Timestamp:

2005-02-02T14:42:29+13:00 (19 years ago)

Author:

kjdon

Message:

we now have a dictionary name specified for each class, rather than always using the class name. So classes can share dictionary files

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 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) {
@@ -112 +115 @@
     /** the no-args constructor */
     public ServiceRack() {
+    System.err.println("service rack");
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
     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;
+
     }
     
@@ -318 +327 @@
     /** overloaded version for no args case */
     protected String getTextString(String key, String lang) {
-    return getTextString(key, null, lang);
-    }
+    return getTextString(key, lang, this.dictionary_name, null);
+    }
+
+    protected String getTextString(String key, String lang, String dictionary) {
+    return getTextString(key, lang, dictionary, null);
+    }
+    protected String getTextString(String key, String lang, String [] args) {
+    return getTextString(key, lang, this.dictionary_name, args);
+    }
+    
     /** getTextString - retrieves a language specific text string for the given
-key and locale
+key and locale, from the specified resource_bundle
     */
-    protected String getTextString(String key, String[] args,  String lang) {
-
-    String class_name = this.getClass().getName();
-    class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    
-    Dictionary dict = new Dictionary(class_name, lang);
+    protected String getTextString(String key, String lang, String dictionary, String[] args) {
+
+    //String class_name = this.getClass().getName();
+    //class_name = class_name.substring(class_name.lastIndexOf('.')+1);
+    
+    Dictionary dict = new Dictionary(dictionary, lang);
     String result = dict.get(key, args);
     if (result == null) { // not found