Changeset 467:ea4a2e807f0c

Timestamp:

09/21/09 15:50:19 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@468

Message:

produceError and produceOutput now have the same signature

Location:

src/org/w3c/unicorn/output

Files:

• OutputFormater.java (modified) (3 diffs)
• OutputModule.java (modified) (3 diffs)
• SimpleOutputFormater.java (modified) (3 diffs)
• SimpleOutputModule.java (modified) (3 diffs)

src/org/w3c/unicorn/output/OutputFormater.java

@@ -1 @@
-// $Id: OutputFormater.java,v 1.5 2009-09-21 14:38:35 tgambet Exp $
+// $Id: OutputFormater.java,v 1.6 2009-09-21 15:50:19 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -10 +10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.unicorn.util.Message;
 
 /**
@@ -29 +28 @@
 
         /**
-         * @param errorMessage 
+         * @param messages 
          * @param aWriter
          */
-        public abstract void produceError(Message errorMessage, Writer output);
+        public abstract void produceError(Map<String, Object> mapOfStringObject, Writer output);
 
 }

src/org/w3c/unicorn/output/OutputModule.java

@@ -1 @@
-// $Id: OutputModule.java,v 1.5 2009-09-21 14:38:35 tgambet Exp $
+// $Id: OutputModule.java,v 1.6 2009-09-21 15:50:19 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -10 +10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.unicorn.util.Message;
 
 /**
@@ -32 +31 @@
          * 
          */
-        public abstract void produceError(final OutputFormater aOutputFormater, Message errorMessage,
+        public abstract void produceError(final OutputFormater aOutputFormater, Map<String, Object> mapOfStringObject,
                         final Map<String, String> mapOfParameter, final Writer aWriter);
 

src/org/w3c/unicorn/output/SimpleOutputFormater.java

@@ -1 @@
-// $Id: SimpleOutputFormater.java,v 1.4 2009-09-07 16:32:20 tgambet Exp $
+// $Id: SimpleOutputFormater.java,v 1.5 2009-09-21 15:50:19 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -7 +7 @@
 import java.io.IOException;
 import java.io.Writer;
+import java.util.ArrayList;
 import java.util.Map;
 
 import org.apache.velocity.VelocityContext;
 import org.w3c.unicorn.Framework;
-import org.w3c.unicorn.util.Message;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.Templates;
@@ -80 +80 @@
         }
 
-        public void produceError(Message errorMessage, final Writer output) {
+        public void produceError(Map<String, Object> mapOfStringObject, final Writer output) {
                 
                 logger.trace("produceError");
-                logger.debug("ErrorMessage : " + errorMessage.getMessage() + ".");
                 logger.debug("Writer : " + output + ".");
                 
-                Message[] messages = {errorMessage};
+                ArrayList<?> messages = (ArrayList<?>) mapOfStringObject.get("messages");
                 aVelocityContext.put("messages", messages);
                 

src/org/w3c/unicorn/output/SimpleOutputModule.java

@@ -1 @@
-// $Id: SimpleOutputModule.java,v 1.4 2009-09-08 14:22:02 tgambet Exp $
+// $Id: SimpleOutputModule.java,v 1.5 2009-09-21 15:50:19 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -7 +7 @@
 import java.io.Writer;
 import java.util.Map;
-
-import org.w3c.unicorn.util.Message;
 
 /**
@@ -22 +20 @@
         }
 
-        public void produceError(final OutputFormater aOutputFormater, Message errorMessage,
+        public void produceError(final OutputFormater aOutputFormater, Map<String, Object> mapOfStringObject,
                         final Map<String, String> mapOfParameter, final Writer aWriter) {
-                aOutputFormater.produceError(errorMessage, aWriter);
+                aOutputFormater.produceError(mapOfStringObject, aWriter);
         }