X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fproducer%2FResourceBundleProducerNode.java;h=26d11181bc65c879fe53fab88c8a2dbf5e05ec0f;hb=8b91e8d8bf4a31a88440a404e83238dcf32f8f4a;hp=c88e2de878a4df59874c979ea86d90a6bada70ec;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mir/producer/ResourceBundleProducerNode.java b/source/mir/producer/ResourceBundleProducerNode.java
index c88e2de8..26d11181 100755
--- a/source/mir/producer/ResourceBundleProducerNode.java
+++ b/source/mir/producer/ResourceBundleProducerNode.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,65 +18,61 @@
  * 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.producer;
 
-import java.util.*;
-import java.io.*;
+import java.util.Locale;
+import java.util.Map;
+
+import mir.log.LoggerWrapper;
+import mir.util.ParameterExpander;
+import mir.util.ResourceBundleGeneratorFunction;
+
 import org.apache.struts.util.MessageResources;
-import mir.util.*;
-import mir.misc.*;
 
-public class ResourceBundleProducerNode extends ProducerNodeDecorator {
+public class ResourceBundleProducerNode implements ProducerNode {
   private String key;
-  private String bundleIdentifier;
-  private String languageIdentifier;
+  private String bundleExpression;
+  private String languageExpression;
 
-  public ResourceBundleProducerNode(String aKey, String aBundleIdentifier, ProducerNode aSubNode) {
-    this (aKey, aBundleIdentifier, null, aSubNode);
+  public ResourceBundleProducerNode(String aKey, String aBundleExpression) {
+    this (aKey, aBundleExpression, null);
   }
 
-  public ResourceBundleProducerNode(String aKey, String aBundleIdentifier, String aLanguageIdentifier, ProducerNode aSubNode) {
-    super(aSubNode);
-
-    bundleIdentifier = aBundleIdentifier;
-    languageIdentifier = aLanguageIdentifier;
+  public ResourceBundleProducerNode(String aKey, String aBundleExpression, String aLanguageExpression) {
+    bundleExpression = aBundleExpression;
+    languageExpression = aLanguageExpression;
     key = aKey;
   }
 
-  public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
+  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
     Object messages;
 
-
     try {
-      if (languageIdentifier!=null) {
+      if (languageExpression!=null) {
         messages =
             new ResourceBundleGeneratorFunction(
-                new Locale(ParameterExpander.expandExpression( aValueMap, languageIdentifier ), "" ),
-                MessageResources.getMessageResources( ParameterExpander.expandExpression( aValueMap, bundleIdentifier ))
+                new Locale(ParameterExpander.expandExpression( aValueMap, languageExpression ), "" ),
+                MessageResources.getMessageResources( ParameterExpander.expandExpression( aValueMap, bundleExpression ))
             );
       }
       else {
         messages =
           MessageResources.getMessageResources(
-              ParameterExpander.expandExpression( aValueMap, bundleIdentifier ));
+              ParameterExpander.expandExpression( aValueMap, bundleExpression ));
       }
       ParameterExpander.setValueForKey( aValueMap, key, messages );
-
-      super.produce(aValueMap, aVerb, aLogger);
     }
     catch (Throwable t) {
-      throw new ProducerFailure(t.getMessage(), t);
+      aLogger.error("Failed to load bundle " + bundleExpression + " for language " + languageExpression +  " into key " + key + ": " + t.getMessage());
     }
   };