Revision: 2085
http://openutils.svn.sourceforge.net/openutils/?rev=2085&view=rev
Author: lucaboati
Date: 2010-03-02 21:32:51 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
[MGNLSTRIPES-2] bind template properties to action parameter
Modified Paths:
--------------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-03-02 21:32:19 UTC (rev 2084)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-03-02 21:32:51 UTC (rev 2085)
@@ -20,6 +20,7 @@
package it.openutils.magnoliastripes;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
@@ -33,9 +34,12 @@
import java.io.Writer;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -111,7 +115,11 @@
log.warn("Attempting to forward to {}, but response is already committed.", templatePath);
}
- Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent());
+ Map<String, String[]> templateDataMap = contentToMap(getTemplateContent());
+ Map<String, String[]> nodeDataMap = contentToMap(
+ MgnlContext.getAggregationState().getCurrentContent(),
+ templateDataMap);
+
try
{
renderCommon(definition.getTemplatePath(), nodeDataMap, out);
@@ -122,6 +130,32 @@
}
}
+ protected Content getTemplateContent()
+ {
+ Collection ancestors = null;
+ try
+ {
+ ancestors = MgnlContext.getAggregationState().getCurrentContent().getAncestors();
+ for (Iterator iterator = ancestors.iterator(); iterator.hasNext();)
+ {
+ Content ancestor = (Content) iterator.next();
+ if (ancestor.getItemType().equals(ItemType.CONTENT))
+ {
+ return ancestor;
+ }
+ }
+ }
+ catch (PathNotFoundException e1)
+ {
+ return null;
+ }
+ catch (RepositoryException e1)
+ {
+ return null;
+ }
+ return null;
+ }
+
/**
* {@inheritDoc}
*/
@@ -182,10 +216,9 @@
* @return a map of Strings (converted nodedata)
*/
@SuppressWarnings("unchecked")
- protected Map<String, String[]> contentToMap(Content content)
+ protected Map<String, String[]> contentToMap(Content content, Map<String, String[]> nodeDataMap)
{
Collection<NodeData> paragraphsData = content.getNodeDataCollection();
- Map<String, String[]> nodeDataMap = new HashMap<String, String[]>();
for (NodeData nodeData : paragraphsData)
{
String name = StringUtils.replaceChars(nodeData.getName(), "{}", "[]");
@@ -203,6 +236,17 @@
}
/**
+ * @param content paragraph node
+ * @return a map of Strings (converted nodedata)
+ */
+ @SuppressWarnings("unchecked")
+ protected Map<String, String[]> contentToMap(Content content)
+ {
+ Map<String, String[]> nodeDataMap = new HashMap<String, String[]>();
+ return contentToMap(content, nodeDataMap);
+ }
+
+ /**
* just needed to make the protected doPost() accessible
* @author fgiust
* @version $Id$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
