Changeset 30475 for main/trunk

Timestamp:

2016-04-14T13:49:00+12:00 (8 years ago)

Author:

kjdon

Message:

now we have a main ServiceRack.properties file for most of the core services. So we have changed the way we look for a text fragment. Do the same thing as before looking for classname.properties, then up the inheritance chain. But if not found then, we look up ServiceRack.properties, first looking for classname.key, then just key. May need to add inheritance in lookup names here too, but don't need it at the moment

File:

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

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

@@ -474 +474 @@
 
         // now 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, this.class_loader);
+        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)
@@ -484 +484 @@
 
         // we have to try super classes
+        String class_name;
         Class c = this.getClass().getSuperclass();
         while (result == null && c != null)
@@ -500 +501 @@
         if (result == null)
         {
-            return "_" + key + "_";
+          // 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 result;
-
+    
     }