small fixes here and there

[mir.git] / source / mir / util / ResourceBundleGeneratorFunction.java

diff --git a/source/mir/util/ResourceBundleGeneratorFunction.java b/source/mir/util/ResourceBundleGeneratorFunction.java
index a44a61f..c31b85e 100755 (executable)
--- a/source/mir/util/ResourceBundleGeneratorFunction.java
+++ b/source/mir/util/ResourceBundleGeneratorFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,31 +18,46 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mir.util;
 
-import java.util.*;
-import org.apache.struts.util.MessageResources;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
 
-import mir.generator.*;
+import mir.generator.Generator;
+import mir.generator.GeneratorExc;
+
+import org.apache.struts.util.MessageResources;
 
 public class ResourceBundleGeneratorFunction implements Generator.GeneratorFunction {
-  private MessageResources messages;
-  private Locale locale;
+  private List messages;
+  private List locales;
 
   public ResourceBundleGeneratorFunction(Locale aLocale, MessageResources aMessages) {
-    this.locale = aLocale;
-    this.messages = aMessages;
+    this(new Locale[] { aLocale}, new MessageResources[] {aMessages} );
+  }
+
+  public ResourceBundleGeneratorFunction(Locale[] aLocales, MessageResources[] aMessages) {
+    locales = new Vector();
+    messages = new Vector();
+
+    for(int i=0; i<aMessages.length; i++) {
+      messages.add(aMessages[i]);
+    }
+
+    for(int i=0; i<aLocales.length; i++) {
+      locales.add(aLocales[i]);
+    }
   }
 
   public Object perform(List aParameters) throws GeneratorExc {
@@ -56,7 +71,17 @@ public class ResourceBundleGeneratorFunction implements Generator.GeneratorFunct
 
     String key = (String) aParameters.get(0);
     extraParameters.remove(0);
-    String message = messages.getMessage(locale, key, extraParameters.toArray());
+
+    String message=null;
+    Iterator j = locales.iterator();
+    while (j.hasNext() && (message == null || message.trim().length()==0)) {
+      Locale locale = (Locale) j.next();
+
+      Iterator i = messages.iterator();
+      while (i.hasNext() && (message == null || message.trim().length()==0)) {
+        message = ( (MessageResources) i.next()).getMessage(locale, key, extraParameters.toArray());
+      }
+    }
 
     if (message == null) {
       return new String("??" + key + "??");