From: <die...@us...> - 2012-03-19 09:03:29
|
Revision: 3823 http://openutils.svn.sourceforge.net/openutils/?rev=3823&view=rev Author: diego_schivo Date: 2012-03-19 09:03:18 +0000 (Mon, 19 Mar 2012) Log Message: ----------- StripesRenderer Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 08:58:53 UTC (rev 3822) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 09:03:18 UTC (rev 3823) @@ -24,7 +24,9 @@ import info.magnolia.cms.core.NodeData; import info.magnolia.context.MgnlContext; import info.magnolia.context.WebContext; +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.IOException; @@ -35,6 +37,7 @@ import java.util.Locale; import java.util.Map; +import javax.jcr.Node; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.servlet.ServletContext; @@ -76,7 +79,7 @@ * @author fgiust * @version $Id$ */ -public class StripesRenderer extends JspTemplateRenderer implements ParagraphRenderer +public class StripesRenderer extends JspRenderer //implements ParagraphRenderer { private StripesDispatcherServlet stripesDispatcherServlet = new StripesDispatcherServlet(); @@ -89,21 +92,9 @@ /** * {@inheritDoc} */ - public void render(Content content, Paragraph paragraph, Writer out) throws RenderException, IOException - { - try - { - render(content, (RenderableDefinition) paragraph, out); - } - finally - { - out.flush(); - } - } - @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 { Map<String, String[]> templateDataMap = contentToMap(getTemplateContent()); @@ -113,7 +104,7 @@ try { - renderCommon(definition.getTemplatePath(), nodeDataMap, out); + renderCommon(definition.getTemplateScript(), nodeDataMap, (Writer) renderingCtx.getOutputProvider().getAppendable()); } catch (IOException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-19 10:44:44
|
Revision: 3828 http://openutils.svn.sourceforge.net/openutils/?rev=3828&view=rev Author: diego_schivo Date: 2012-03-19 10:44:33 +0000 (Mon, 19 Mar 2012) Log Message: ----------- ItemType.PAGE Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 10:31:31 UTC (rev 3827) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 10:44:33 UTC (rev 3828) @@ -121,7 +121,7 @@ for (Iterator iterator = ancestors.iterator(); iterator.hasNext();) { Content ancestor = (Content) iterator.next(); - if (ancestor.getItemType().equals(ItemType.CONTENT)) + if (ancestor.getItemType().equals(ItemType.PAGE)) { return ancestor; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:44:29
|
Revision: 3834 http://openutils.svn.sourceforge.net/openutils/?rev=3834&view=rev Author: diego_schivo Date: 2012-03-20 15:44:19 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StripesRenderer: renderingCtx.getAppendable() Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-20 15:34:24 UTC (rev 3833) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-20 15:44:19 UTC (rev 3834) @@ -104,7 +104,7 @@ try { - renderCommon(definition.getTemplateScript(), nodeDataMap, (Writer) renderingCtx.getOutputProvider().getAppendable()); + renderCommon(definition.getTemplateScript(), nodeDataMap, renderingCtx.getAppendable()); } catch (IOException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |