cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r387520 - in /cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl: AbstractCompositeAspect.java CompositeContentAspect.java
Date Tue, 21 Mar 2006 13:10:23 GMT
Author: cziegeler
Date: Tue Mar 21 05:10:21 2006
New Revision: 387520

URL: http://svn.apache.org/viewcvs?rev=387520&view=rev
Log:
Option to disable item tags and more possibilities for root tag

Modified:
    cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
    cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java

Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java?rev=387520&r1=387519&r2=387520&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
(original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
Tue Mar 21 05:10:21 2006
@@ -47,9 +47,9 @@
 	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext,
org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
-                		Layout layout,
-                		PortalService service,
-                		ContentHandler handler)
+                	  Layout                layout,
+                	  PortalService         service,
+                	  ContentHandler        handler)
 	throws SAXException {
         if ( layout instanceof CompositeLayout) {
             CompositeLayout compositeLayout = (CompositeLayout)layout;
@@ -60,16 +60,16 @@
 	            for (Iterator iter = compositeLayout.getItems().iterator(); iter.hasNext();)
{
 	                Item item = (Item) iter.next();
 	                if ( item.equals(maximizedInfo.item) ) {
-	                    this.processMaximizedItem(item, maximizedInfo.layout, handler, service);
+	                    this.processMaximizedItem(context, item, maximizedInfo.layout, handler,
service);
 	                } else if ( item.getLayout().isStatic().booleanValue() ) {
-	                    this.processItem(item, handler, service);	                	
+	                    this.processItem(context, item, handler, service);	                

 	                }
 	            }            	
             } else {
 	        	// loop over all rows
 	            for (Iterator iter = compositeLayout.getItems().iterator(); iter.hasNext();)
{
 	                Item item = (Item) iter.next();
-	                this.processItem(item, handler, service);
+	                this.processItem(context, item, handler, service);
 	            }
             }
         } else {
@@ -85,8 +85,11 @@
      * @param service portal service providing component access
      * @throws SAXException
      */
-    protected abstract void processItem(Item item, ContentHandler handler, PortalService
service)
-    throws SAXException;
+    protected abstract void processItem(RendererAspectContext context,
+                                        Item                  item,
+                                        ContentHandler        handler,
+                                        PortalService         service)
+        throws SAXException;
 
     /**
      * Process an item containing a maximized layout.
@@ -97,7 +100,7 @@
      * @param service portal service providing component access
      * @throws SAXException
      */
-    protected abstract void processMaximizedItem(Item item, Layout maximizedLayout, ContentHandler
handler, PortalService service)
+    protected abstract void processMaximizedItem(RendererAspectContext context, Item item,
Layout maximizedLayout, ContentHandler handler, PortalService service)
     throws SAXException;
 
     /**

Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java?rev=387520&r1=387519&r2=387520&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
(original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
Tue Mar 21 05:10:21 2006
@@ -54,8 +54,12 @@
  *
  * <h2>Parameters</h2>
  * <table><tbody>
- * <tr><th>root-tag</th><td><Enclose result in root tag?/td><td></td><td>boolean</td><td><code>true</code></td></tr>
- * <tr><th>tag-name</th><td>Name of root tag to  use.</td><td></td><td>String</td><td><code>"composite"</code></td></tr>
+ * <tr><th>root-tag</th><td>Enclose result in root tag?</td><td></td><td>boolean</td><td><code>true</code></td></tr>
+ * <tr><th>tag-name</th><td>Name of root tag to use.</td><td></td><td>String</td><td><code>"composite"</code></td></tr>
+ * <tr><th>item-tag</th><td>Enclose each item in item tag?</td><td></td><td>boolean</td><td><code>true</code></td></tr>
+ * <tr><th>item-tag-name</th><td>Name of item tag to use.</td><td></td><td>String</td><td><code>"item"</code></td></tr>
+ * <tr><th>root-tag-id</th><td>Value of optional id attribute for
the root tag.</td><td></td><td>String</td><td><code>-</code></td></tr>
+ * <tr><th>root-tag-class</th><td>Value of optional class attribute
for the root tag.</td><td></td><td>String</td><td><code>-</code></td></tr>
  * </tbody></table>
  *
  * @version $Id$
@@ -68,14 +72,20 @@
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext,
org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
-                      Layout layout,
-                      PortalService service,
-                      ContentHandler handler)
+                      Layout                layout,
+                      PortalService         service,
+                      ContentHandler        handler)
     throws SAXException {
         PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
-
-        if ( config.rootTag ) {
-            XMLUtils.startElement(handler, config.tagName);
+        if ( config.rootTag) {
+            final AttributesImpl ai = new AttributesImpl();
+            if ( config.rootTagClass != null ) {
+                ai.addCDATAAttribute("class", config.rootTagClass);
+            }
+            if ( config.rootTagId != null ) {
+                ai.addCDATAAttribute("id", config.rootTagId);
+            }
+            XMLUtils.startElement(handler, config.tagName, ai);
         }
         super.toSAX(context, layout, service, handler);
         if ( config.rootTag ) {
@@ -86,57 +96,81 @@
 	/**
 	 * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractCompositeAspect#processItem(org.apache.cocoon.portal.layout.Item,
org.xml.sax.ContentHandler, org.apache.cocoon.portal.PortalService)
 	 */
-	protected void processItem(Item item,
-		                         ContentHandler handler,
-		                         PortalService service)
+	protected void processItem(RendererAspectContext context,
+                               Item                  item,
+		                       ContentHandler        handler,
+		                       PortalService         service)
     throws SAXException {
+        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
         Layout layout = item.getLayout();
 
-        Map parameters = item.getParameters();
-        if (parameters.size() == 0) {
-            XMLUtils.startElement(handler, ITEM_STRING);
-        } else {
-            AttributesImpl attributes = new AttributesImpl();
-
-			Map.Entry entry;
-			for (Iterator iter = parameters.entrySet().iterator(); iter.hasNext();) {
-				entry = (Map.Entry) iter.next();
-				attributes.addCDATAAttribute((String)entry.getKey(), (String)entry.getValue());
-			}
-            XMLUtils.startElement(handler, ITEM_STRING, attributes);
+        if ( config.itemTag ) {
+            Map parameters = item.getParameters();
+            if (parameters.size() == 0) {
+                XMLUtils.startElement(handler, config.itemTagName);
+            } else {
+                AttributesImpl attributes = new AttributesImpl();
+    
+    			Map.Entry entry;
+    			for (Iterator iter = parameters.entrySet().iterator(); iter.hasNext();) {
+    				entry = (Map.Entry) iter.next();
+    				attributes.addCDATAAttribute((String)entry.getKey(), (String)entry.getValue());
+    			}
+                XMLUtils.startElement(handler, config.itemTagName, attributes);
+            }
         }
         processLayout(layout, service, handler);
-        XMLUtils.endElement(handler, ITEM_STRING);
+        if ( config.itemTag ) {
+            XMLUtils.endElement(handler, config.itemTagName);
+        }
 	}
 
 	/**
 	 * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractCompositeAspect#processMaximizedItem(org.apache.cocoon.portal.layout.Item,
org.apache.cocoon.portal.layout.Layout, org.xml.sax.ContentHandler, org.apache.cocoon.portal.PortalService)
 	 */
-	protected void processMaximizedItem(Item item, Layout maximizedLayout, ContentHandler handler,
PortalService service) throws SAXException {
+	protected void processMaximizedItem(RendererAspectContext context,
+                                        Item                  item,
+                                        Layout                maximizedLayout,
+                                        ContentHandler        handler,
+                                        PortalService         service)
+    throws SAXException {
+        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
         Map parameters = item.getParameters();
-        if (parameters.size() == 0) {
-            XMLUtils.startElement(handler, ITEM_STRING);
-        } else {
-            AttributesImpl attributes = new AttributesImpl();
-
-			Map.Entry entry;
-			for (Iterator iter = parameters.entrySet().iterator(); iter.hasNext();) {
-				entry = (Map.Entry) iter.next();
-				attributes.addCDATAAttribute((String)entry.getKey(), (String)entry.getValue());
-			}
-            XMLUtils.startElement(handler, ITEM_STRING, attributes);
+        if ( config.itemTag ) {
+            if (parameters.size() == 0) {
+                XMLUtils.startElement(handler, config.itemTagName);
+            } else {
+                AttributesImpl attributes = new AttributesImpl();
+    
+    			Map.Entry entry;
+    			for (Iterator iter = parameters.entrySet().iterator(); iter.hasNext();) {
+    				entry = (Map.Entry) iter.next();
+    				attributes.addCDATAAttribute((String)entry.getKey(), (String)entry.getValue());
+    			}
+                XMLUtils.startElement(handler, config.itemTagName, attributes);
+            }
         }
         processLayout(maximizedLayout, service, handler);
-        XMLUtils.endElement(handler, ITEM_STRING);
+        if ( config.itemTag ) {
+            XMLUtils.endElement(handler, config.itemTagName);
+        }
 	}
 
 	protected class PreparedConfiguration {
         public String tagName;
         public boolean rootTag;
+        public boolean itemTag;
+        public String itemTagName;
+        public String rootTagId;
+        public String rootTagClass;
 
         public void takeValues(PreparedConfiguration from) {
             this.tagName = from.tagName;
             this.rootTag = from.rootTag;
+            this.itemTag = from.itemTag;
+            this.itemTagName = from.itemTagName;
+            this.rootTagId = from.rootTagId;
+            this.rootTagClass = from.rootTagClass;
         }
     }
 
@@ -148,6 +182,10 @@
         PreparedConfiguration pc = new PreparedConfiguration();
         pc.tagName = configuration.getParameter("tag-name", "composite");
         pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
+        pc.itemTag = configuration.getParameterAsBoolean("item-tag", true);
+        pc.itemTagName = configuration.getParameter("item-tag-name", ITEM_STRING);
+        pc.rootTagId = configuration.getParameter("root-tag-id", null);
+        pc.rootTagClass = configuration.getParameter("root-tag-class", null);
         return pc;
     }
 



Mime
View raw message