Changeset 9424

Timestamp:

2005-03-15T13:50:09+13:00 (19 years ago)

Author:

kjdon

Message:

added a new constructor that takes a specified classloader which is used to try and load the resource bundle

File:

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

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

@@ +1 @@
+/*
+ *    Dictionary.java
+ *    Copyright (C) 2005 New Zealand Digital Library, http://www.nzdl.org
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 package org.greenstone.gsdl3.util;
 
@@ -16 +34 @@
     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.
-     * @param locale The <strong>Locale</strong> used to load the desired dictionary resource bundle.
+    /**  Constructs the Dictionary class by first creating a locale from the specified language, (or using the default locale if this didn't work), then loading a resource bundle based on this locale. 
      */
     public Dictionary(String resource, String lang) {
@@ -34 +51 @@
     }
 
+    /**  Constructs the Dictionary class by first creating a locale from the specified language, (or using the default locale if this didn't work), then loading a resource bundle based on this locale. A classloader is specified which can be used to find the resource.
+     */
+    public Dictionary(String resource, String lang, ClassLoader loader) {
+    // Initialize.
+    
+    this.locale = new Locale(lang);
+    this.resource = resource;
+    if (this.locale == null) {
+        this.locale = Locale.getDefault();
+    }
+    // try the specified class loader
+    try {
+        this.raw = ResourceBundle.getBundle(this.resource, this.locale, loader);
+        return;
+    } catch (Exception e) {};
+    
+    try {
+        this.raw = ResourceBundle.getBundle(this.resource, this.locale);
+    } catch (Exception ex) {
+        System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
+    }
+    
+    }
+
+    
     public Enumeration getKeys() {
     if (this.raw != null) {