Changeset 33994 for main

Timestamp:

2020-03-03T14:42:14+13:00 (4 years ago)

Author:

davidb

Message:

The introduction of UTF8Control class means we can now work directly with resource-bundle/property files and assume they deliver UTF-8 strings to the Java code; this class is based on a StackOverflow posting; additional comments to how we then use this in Greenstone (relating to the 'initial' string) noted in Dictionary.java

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util

Files:

• Dictionary.java (modified) (5 diffs)
• UTF8Control.java (added)

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

@@ -62 +62 @@
         try
         {
-            this.raw = ResourceBundle.getBundle(this.resource, this.locale);
+            this.raw = ResourceBundle.getBundle(this.resource, this.locale, new UTF8Control());
         }
         catch (Exception e)
@@ -76 +76 @@
         try
         {
-            this.raw = ResourceBundle.getBundle(this.resource, this.locale);
+            this.raw = ResourceBundle.getBundle(this.resource, this.locale, new UTF8Control());
         }
         catch (Exception e)
@@ -103 +103 @@
             try
             {
-            this.raw = ResourceBundle.getBundle(this.resource, this.locale, loader);
+            this.raw = ResourceBundle.getBundle(this.resource, this.locale, loader, new UTF8Control());
             return;
             }
@@ -114 +114 @@
         try
         {
-            this.raw = ResourceBundle.getBundle(this.resource, this.locale);
+            this.raw = ResourceBundle.getBundle(this.resource, this.locale, new UTF8Control());
         }
         catch (Exception ex)
@@ -220 +220 @@
         try
         {
-            String initial_raw = this.raw.getString(key);
-            // convert to unicode, copied from gatherer dictionary
-            String initial = new String(initial_raw.getBytes("ISO-8859-1"), "UTF-8");
+                // In older versions of Java, the resource-bundle/properties file was assumed to be "ISO-8859-1", and so
+            // we used to perform a string conversion here so we could support UTF-8
+            // With the introduction of UTF8Control, based on a StackOverflow posting, we now directly work
+            // with the resource as UTF-8, and so not conversion is needed
+            String initial = this.raw.getString(key);
 
             // if we haven't been given any args, don't bother looking for them