Revision: 3851
http://openutils.svn.sourceforge.net/openutils/?rev=3851&view=rev
Author: diego_schivo
Date: 2012-03-20 16:56:11 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
openutils-mgnlrules
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-20 16:50:46 UTC (rev 3850)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-20 16:56:11 UTC (rev 3851)
@@ -98,11 +98,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-templating-compatibility</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
<version>5.0.0-SNAPSHOT</version>
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2012-03-20 16:50:46 UTC (rev 3850)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2012-03-20 16:56:11 UTC (rev 3851)
@@ -19,15 +19,16 @@
package net.sourceforge.openutils.mgnlrules.samples.render;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.module.templating.RenderException;
-import info.magnolia.module.templating.RenderableDefinition;
-import info.magnolia.module.templating.paragraphs.JspParagraphRenderer;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.rendering.context.RenderingContext;
+import info.magnolia.rendering.engine.RenderException;
+import info.magnolia.rendering.renderer.JspRenderer;
+import info.magnolia.rendering.template.RenderableDefinition;
-import java.io.Writer;
import java.util.Map;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions;
@@ -37,29 +38,29 @@
* @author dschivo
* @version $Id$
*/
-public class ConditionalRenderer extends JspParagraphRenderer
+public class ConditionalRenderer extends JspRenderer
{
/**
* {@inheritDoc}
*/
@Override
- protected void onRender(Content content, RenderableDefinition definition, Writer out, Map ctx, String templatePath)
- throws RenderException
+ protected void onRender(Node content, RenderableDefinition definition, RenderingContext renderingCtx,
+ Map<String, Object> ctx, String templateScript) throws RenderException
{
- String expression = NodeDataUtil.getString(content, "renderCondition");
+ String expression = PropertyUtil.getString(content, "renderCondition");
try
{
// expression evaluation without a pageContext
String result = ExpressionsElFunctions.evaluate(expression);
if ("true".equals(result))
{
- super.onRender(content, definition, out, ctx, templatePath);
+ super.onRender(content, definition, renderingCtx, ctx, templateScript);
}
}
catch (Exception e)
{
- throw new RenderException("Can't render paragraph template " + templatePath, e);
+ throw new RenderException("Can't render paragraph template " + templateScript, e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
