Author: reto
Date: Wed May 26 21:46:21 2010
New Revision: 948603
URL: http://svn.apache.org/viewvc?rev=948603&view=rev
Log:
CLEREZZA-220: Inlining exception message when render-method is called
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt?rev=948603&r1=948602&r2=948603&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
Wed May 26 21:46:21 2010
@@ -7,9 +7,13 @@ def render(resource : GraphNode, mode :
def parseNodeSeq(string : String) = {
_root_.scala.xml.XML.loadString("<elem>"+string+"</elem>").child
}
- val baos = new java.io.ByteArrayOutputStream
- renderer.render(resource, context, mode, baos)
- parseNodeSeq(new String(baos.toByteArray))
+ val baos = new java.io.ByteArrayOutputStream
+ try {
+ renderer.render(resource, context, mode, baos)
+ } catch {
+ case e: Exception => baos.write(<div
class="exception">{e.toString}</div>.toString.getBytes)
+ }
+ parseNodeSeq(new String(baos.toByteArray))
}
def ifx[T](con: => Boolean)(f: => T) : T = {
if (con) f else null.asInstanceOf[T]
