Author: reto
Date: Wed Sep 8 15:49:01 2010
New Revision: 995107
URL: http://svn.apache.org/viewvc?rev=995107&view=rev
Log:
CLEREZZA-270: added support for sharedRenderingValues
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala?rev=995107&r1=995106&r2=995107&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
Wed Sep 8 15:49:01 2010
@@ -57,7 +57,7 @@ abstract class PageRenderlet extends Ren
@throws(classOf[IOException])
override def render(res: GraphNode, context: GraphNode,
- sharedRenderingValues:
java.util.Map[String, Object] ,
+ sharedRenderingValues:
java.util.Map[String, Object],
renderer: CallbackRenderer ,
renderingSpecification: URI,
mode: String,
@@ -70,7 +70,7 @@ abstract class PageRenderlet extends Ren
val renderingSpecificationOption = if
(renderingSpecification != null) {Some(renderingSpecification)} else {None}
val modeOption = if (mode != null) {Some(mode)} else
{None}
renderedPage(
- RenderedPage.Arguments(res, context, renderer,
+ RenderedPage.Arguments(res, context,
sharedRenderingValues, renderer,
renderingSpecificationOption, modeOption, mediaType, os));
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala?rev=995107&r1=995106&r2=995107&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Wed Sep 8 15:49:01 2010
@@ -22,6 +22,7 @@ abstract class RenderedPage(arguments: R
val RenderedPage.Arguments(
res: GraphNode,
context: GraphNode,
+ sharedRenderingValues:
java.util.Map[String, Object],
renderer: CallbackRenderer,
renderingSpecificationOption:
Option[URI],
modeOption: Option[String],
@@ -47,9 +48,11 @@ abstract class RenderedPage(arguments: R
renderer.render(resource, context, mode, baos)
parseNodeSeq(new String(baos.toByteArray))
}
- println("rendering")
- val out = new PrintWriter(os)
+ object $ {
+ def apply(key: String) = sharedRenderingValues.get(key)
+ def update(key: String, value: Object) =
sharedRenderingValues.put(key, value)
+ }
def ifx[T](con: => Boolean)(f: => T) : T = {
if (con) f else null.asInstanceOf[T]
@@ -57,6 +60,8 @@ abstract class RenderedPage(arguments: R
val resultDocModifier =
org.apache.clerezza.platform.typerendering.ResultDocModifier.getInstance();
+ val out = new PrintWriter(os)
+
out.println(
content
)
@@ -68,6 +73,7 @@ abstract class RenderedPage(arguments: R
}
object RenderedPage {
case class Arguments(res: GraphNode, context: GraphNode,
+ sharedRenderingValues:
java.util.Map[String, Object],
renderer: CallbackRenderer ,
renderingSpecificationOption:
Option[URI],
modeOption: Option[String],
