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 5571c31..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,17 +18,15 @@
  * 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.Iterator;
@@ -43,22 +41,22 @@ import org.apache.struts.util.MessageResources;
 
 public class ResourceBundleGeneratorFunction implements Generator.GeneratorFunction {
   private List messages;
-  private Locale locale;
+  private List locales;
 
   public ResourceBundleGeneratorFunction(Locale aLocale, MessageResources aMessages) {
-    this(aLocale, new MessageResources[] {aMessages} );
-  }
-
-  public ResourceBundleGeneratorFunction(Locale aLocale, MessageResources aMessages1, MessageResources aMessages2) {
-    this(aLocale, new MessageResources[] {aMessages1, aMessages2} );
+    this(new Locale[] { aLocale}, new MessageResources[] {aMessages} );
   }
 
-  public ResourceBundleGeneratorFunction(Locale aLocale, MessageResources[] aMessages) {
-    locale = aLocale;
+  public ResourceBundleGeneratorFunction(Locale[] aLocales, MessageResources[] aMessages) {
+    locales = new Vector();
     messages = new Vector();
 
     for(int i=0; i<aMessages.length; i++) {
-      this.messages.add(aMessages[i]);
+      messages.add(aMessages[i]);
+    }
+
+    for(int i=0; i<aLocales.length; i++) {
+      locales.add(aLocales[i]);
     }
   }
 
@@ -75,9 +73,15 @@ public class ResourceBundleGeneratorFunction implements Generator.GeneratorFunct
     extraParameters.remove(0);
 
     String message=null;
-    Iterator i = messages.iterator();
-    while (i.hasNext() && message==null)
-      message = ((MessageResources) i.next()).getMessage(locale, key, extraParameters.toArray());
+    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 + "??");