Changeset 5108

Timestamp:

2003-08-07T16:24:39+12:00 (21 years ago)

Author:

kjdon

Message:

gadually standardising my Java code. have turned all class variables from like raw_ to this.raw

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Dictionary.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Dictionary.java

@@ -8 +8 @@
 
     /** The locale of this dictionary. */
-    protected Locale locale_ = null;
+    protected Locale locale = null;
     
     /** The resource that has been loaded */
-    protected String resource_ = null;
+    protected String resource = null;
 
     /** The ResourceBundle which contains the raw key-value mappings. Loaded from a file named "resource_locale.properties*/
-    private ResourceBundle raw_ = null;
+    private ResourceBundle raw = null;
 
     /**  Constructs the Dictionary class by first checking if a Locale has been set. If not the default locale is used, and a ResourceBundle is created. Finally a single important String, Language, is made available outside the class so a more read-able version of the Locale of this Dictionary is present.
@@ -22 +22 @@
     // Initialize.
     
-    locale_ = new Locale(lang);
-    resource_ = resource;
-    if (locale_ == null) {
-        locale_ = Locale.getDefault();
+    this.locale = new Locale(lang);
+    this.resource = resource;
+    if (this.locale == null) {
+        this.locale = Locale.getDefault();
     }
     try {
-        raw_ = ResourceBundle.getBundle(resource_, locale_);
+        this.raw = ResourceBundle.getBundle(this.resource, this.locale);
     } catch (Exception e) {
-        System.err.println("Dictionary: couldn't locate a resource bundle. Error message: "+e.getMessage());
+        System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
     }
     }
 
     public Enumeration getKeys() {
-    if (raw_ != null) {
-        return raw_.getKeys();
+    if (this.raw != null) {
+        return this.raw.getKeys();
     }
     return null;
@@ -55 +55 @@
      */
     public String get(String key, String args[]) {
-    if (raw_ == null) {
+    if (this.raw == null) {
         return null;
     }
     try {
-        String initial = raw_.getString(key);
+        String initial = this.raw.getString(key);
         // If the string contains arguments we have to insert them.
         String complete = "";
@@ -85 +85 @@
     }
     catch (Exception e) {
-        System.err.println("Exception: " + e.toString());
-        e.printStackTrace();
+        System.err.println("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
         return null;
     }