Changeset 6854

Timestamp:

2004-02-20T12:38:04+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed another problem with dictionary strings not being read as UTF-8 properly. This time it was the argument processing at fault.

File:

• trunk/gli/src/org/greenstone/gatherer/Dictionary.java (modified) (8 diffs)

trunk/gli/src/org/greenstone/gatherer/Dictionary.java

@@ -70 +70 @@
     extends HashMap {
 
-    static final private boolean KEY_LIST_DEBUG = false;
-    static final private String KEY_LIST_FILENAME = "keylist.txt";
-
-    /** A String which more explicitly states the Locale of this dictionary. */
-    public String language = null;
     /** The font used when displaying various html text. */
-    static private FontUIResource font = null;
+    private FontUIResource font = null;
     /** A reference to remind us of the current locale. */
     private Locale locale = null;
     /** The ResourceBundle which contains the raw key-value mappings. Loaded from a file named "dictionary<I>locale</I>.properties*/
-    static private ResourceBundle dictionary = null;
-
-    private TreeSet key_list = 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.
-     */
-    public Dictionary(Locale locale, FontUIResource font) {
+    private ResourceBundle dictionary = null;
+
+
+    public Dictionary(Locale locale, FontUIResource font)
+    {
     super();
 
-    if (KEY_LIST_DEBUG) {
-        // Reload the keylist
-        File file = new File(KEY_LIST_FILENAME);
-        key_list = new TreeSet();
-        try {
-        BufferedReader br = new BufferedReader(new FileReader(file));
-        String line;
-        while((line = br.readLine()) != null) {
-            key_list.add(line);
-        }
-        br.close();
-        br = null;
-        }
-        catch(Exception error) {
-        error.printStackTrace();
-        }
-    }
-
-    // Initialize.
+    // Initialize
     this.font = font;
-    if (locale == null) {
-        this.locale = Locale.getDefault();
-    }
-    else {
-        this.locale = locale;
-        //Locale.setDefault(locale);
-    }
-    dictionary = ResourceBundle.getBundle(Utility.DICTIONARY, this.locale);
-    // Now quickly read in language name.
-    language = dictionary.getString("Language");
-    }
-
-
-    public void destroy() {
-//      if(key_list != null) {
-//          try {
-//          FileOutputStream fos = new FileOutputStream(KEY_LIST_FILENAME);
-//          for(Iterator iter = key_list.iterator(); iter.hasNext(); ) {
-//              String value = (String) iter.next();
-//              fos.write(value.getBytes());
-//              fos.write('\n');
-//              value = null;
-//          }
-//          fos.close();
-//          fos = null;
-//          }
-//          catch(Exception error) {
-//          error.printStackTrace();
-//          }
-//      }
+    this.locale = ((locale == null) ? Locale.getDefault() : locale);
+    this.dictionary = ResourceBundle.getBundle(Utility.DICTIONARY, this.locale);
     }
 
@@ -146 +92 @@
      * @return A <strong>String</strong> containing the two letter ISO639 language code.
      */
-    public String getLanguage() {
+    public String getLanguage()
+    {
     return locale.getLanguage();
     }
@@ -173 +120 @@
     static public String get(String key, String[] args)
     {
-//      if(key_list != null) {
-//          synchronized(this) {
-//          key_list.add(key);
-//          }
-//      }
     try {
-        String initial = dictionary.getString(key);
+        String initial_raw = dictionary.getString(key);
+
+        // Convert into Unicode
+        String initial = "";
+        try {
+        // This "ISO-8859-1" looks out of place, but it is very important.
+        // It is essential to call getBytes with an 8-bit encoding, otherwise
+        // Java kindly deems some characters "undisplayable", and replaces
+        // them with question marks. This is NOT good.
+        initial = new String(initial_raw.getBytes("ISO-8859-1"), "UTF-8");
+        }
+        catch (Exception ex) {
+        System.err.println("Exception: " + ex);
+        ex.printStackTrace();
+        return initial_raw;
+        }
 
         // If the string contains arguments we have to insert them.
@@ -190 +147 @@
         int closing = initial.indexOf('}');
         int comment_mark = initial.indexOf('-', opening); // May not exist
-        if(comment_mark > closing) { // May also be detecting a later comment
+        if (comment_mark > closing) { // May also be detecting a later comment
             comment_mark = -1;
         }
@@ -196 +153 @@
         // Parse arg_num
         String arg_str = null;
-        if(comment_mark != -1) {
+        if (comment_mark != -1) {
             arg_str = initial.substring(opening + 1, comment_mark);
         }
@@ -203 +160 @@
         }
         int arg_num = Integer.parseInt(arg_str);
-        if(closing + 1 < initial.length()) {
+        if (closing + 1 < initial.length()) {
             initial = initial.substring(closing + 1);
         }
@@ -210 +167 @@
         }
         // Insert argument
-        if(args != null && 0 <= arg_num && arg_num < args.length) {
+        if (args != null && 0 <= arg_num && arg_num < args.length) {
             complete = complete + args[arg_num];
         }
-        else if(arg_num >= 32) {
+        else if (arg_num >= 32) {
             String f_subargs[] = new String[1];
-            if(font != null) {
+            if (font != null) {
             f_subargs[0] = font.getFontName();
             }
@@ -226 +183 @@
         complete = complete + initial;
 
-        String unicode = "";
-        try {
-        // This "ISO-8859-1" looks out of place, but it is very important.
-        // It is essential to call getBytes with an 8-bit encoding, otherwise
-        // Java kindly deems some characters "undisplayable", and replaces
-        // them with question marks. This is NOT good.
-        unicode = new String(complete.getBytes("ISO-8859-1"), "UTF-8");
-        }
-        catch (Exception ex) {
-        System.err.println("Exception: " + ex);
-        Gatherer.printStackTrace(ex);
-        return initial;
-        }
-        return unicode;
+        return complete;
     }
     catch (Exception e) {