merged 1.1 branch into head

[mir.git] / source / mir / producer / LoggingProducerNode.java

diff --git a/source/mir/producer/LoggingProducerNode.java b/source/mir/producer/LoggingProducerNode.java
index e1d0451..bbb359a 100755 (executable)
--- a/source/mir/producer/LoggingProducerNode.java
+++ b/source/mir/producer/LoggingProducerNode.java
@@ -1,30 +1,59 @@
+/*
+ * Copyright (C) 2001-2006 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  any library licensed under the Apache Software License,
+ * 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.io.*;
-import java.util.*;
-import mir.util.*;
-import mir.producer.*;
+import mir.log.LoggerWrapper;
+import mir.util.ParameterExpander;
 
-public class LoggingProducerNode implements ProducerNode {
+import java.util.Map;
+
+public class LoggingProducerNode extends AbstractProducerNode {
   private String expression;
+  private int messageType;
 
-  public LoggingProducerNode(String anExpression) {
+  public LoggingProducerNode(String anExpression, int aMessageType) {
     expression = anExpression;
+    messageType = aMessageType;
   }
 
-  public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
+  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
     String text;
 
     try {
       text = ParameterExpander.expandExpression( aValueMap, expression );
-      aLogger.println(text);
+      aLogger.message(messageType, text);
     }
     catch (Throwable t) {
-      throw new ProducerFailure(t.getMessage(), t);
+      try {
+        aLogger.error("Exception while logging message '"+expression+"': " + t.getMessage());
+      }
+      catch (Throwable s) {
+      }
     }
   }
-
-  public Set buildVerbSet() {
-    return new HashSet();
-  }
 }
\ No newline at end of file