X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fproducer%2FResourceBundleProducerNode.java;h=533c9fc419a2bcfeb488face66b26b478b451915;hb=bd509ef78e9f9fdf45915a2e98e8021882a6cfba;hp=e172d11747cfb5e89cfa21519a40094ba5bbbc8d;hpb=e42ecea2db8ff123f268edf48190d6b9b28fcedb;p=mir.git diff --git a/source/mir/producer/ResourceBundleProducerNode.java b/source/mir/producer/ResourceBundleProducerNode.java index e172d117..533c9fc4 100755 --- a/source/mir/producer/ResourceBundleProducerNode.java +++ b/source/mir/producer/ResourceBundleProducerNode.java @@ -1,3 +1,34 @@ +/* + * Copyright (C) 2001, 2002 The Mir-coders group + * + * This file is part of Mir. + * + * Mir is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Mir is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Mir; if not, write to the Free Software + * 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. + */ + package mir.producer; import java.util.*; @@ -6,18 +37,16 @@ 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; - public ResourceBundleProducerNode(String aKey, String aBundleIdentifier, ProducerNode aSubNode) { - this (aKey, aBundleIdentifier, null, aSubNode); + public ResourceBundleProducerNode(String aKey, String aBundleIdentifier) { + this (aKey, aBundleIdentifier, null); } - public ResourceBundleProducerNode(String aKey, String aBundleIdentifier, String aLanguageIdentifier, ProducerNode aSubNode) { - super(aSubNode); - + public ResourceBundleProducerNode(String aKey, String aBundleIdentifier, String aLanguageIdentifier) { bundleIdentifier = aBundleIdentifier; languageIdentifier = aLanguageIdentifier; key = aKey; @@ -26,7 +55,6 @@ public class ResourceBundleProducerNode extends ProducerNodeDecorator { public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure { Object messages; - try { if (languageIdentifier!=null) { messages = @@ -41,8 +69,6 @@ public class ResourceBundleProducerNode extends ProducerNodeDecorator { ParameterExpander.expandExpression( aValueMap, bundleIdentifier )); } ParameterExpander.setValueForKey( aValueMap, key, messages ); - - super.produce(aValueMap, aVerb, aLogger); } catch (Throwable t) { throw new ProducerFailure(t.getMessage(), t);