Changeset 9349

Timestamp:

2005-03-10T10:57:51+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the formatting args stuff.

File:

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

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

@@ -46 +46 @@
 import org.greenstone.gatherer.util.Utility;
 
-/** Extends the ResourceBundle class to allow for the automatic insertion of  arguments. Note that the key names beginning Farg are reserved for formatting. <BR>
+/** Extends the ResourceBundle class to allow for the automatic insertion of arguments.<BR>
  * <BR>
  * Property files usable by this class have the Backus-Naur form: <BR>
@@ -114 +114 @@
 
     /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
-     * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
+     * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned.
      * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
      * @param args A <strong>String[]</strong> used to populate argument fields within the complete String.
@@ -152 +152 @@
         }
         complete = complete + initial.substring(0, opening);
+
         // Parse arg_num
         String arg_str = null;
@@ -160 +161 @@
             arg_str = initial.substring(opening + 1, closing);
         }
-        int arg_num = Integer.parseInt(arg_str);
+
         if (closing + 1 < initial.length()) {
             initial = initial.substring(closing + 1);
@@ -167 +168 @@
             initial = "";
         }
+
         // Insert argument
-        if (args != null && 0 <= arg_num && arg_num < args.length) {
-            complete = complete + args[arg_num];
-        }
-        else if (arg_num >= 32) {
-            String f_subargs[] = new String[1];
-            if (font != null) {
-            f_subargs[0] = font.getFontName();
+        if (arg_str.equals("FONT")) {
+            complete = complete + (font != null ? font.getFontName() : "Arial");
+        }
+        else {
+            int arg_num = Integer.parseInt(arg_str);
+            if (args != null && 0 <= arg_num && arg_num < args.length) {
+            complete = complete + args[arg_num];
             }
-            else {
-            f_subargs[0] = "Arial";
-            }
-            complete = complete + get("Farg" + arg_num, f_subargs);
         }
         }