You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/05/19 15:16:35 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl LayoutAspectDataHandler.java
cziegeler 2003/05/19 06:16:34
Modified: src/blocks/portal/java/org/apache/cocoon/portal/aspect
AspectDataHandler.java
src/blocks/portal/java/org/apache/cocoon/portal/layout
AbstractLayout.java
src/blocks/portal/samples/profiles/mapping layout.xml
src/blocks/portal/samples/profiles/layout portal.xml
src/blocks/portal/java/org/apache/cocoon/portal/layout/impl
LayoutAspectDataHandler.java
Log:
Avoid the need of a local renderer name for each layout and
thereby give the layout factory at least one simple use
Revision Changes Path
1.3 +3 -1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/AspectDataHandler.java
Index: AspectDataHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/AspectDataHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AspectDataHandler.java 19 May 2003 12:51:00 -0000 1.2
+++ AspectDataHandler.java 19 May 2003 13:16:33 -0000 1.3
@@ -70,4 +70,6 @@
List getAspectDatas(Aspectalizable owner);
+ Object getDescription();
+
}
1.5 +8 -5 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java
Index: AbstractLayout.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractLayout.java 19 May 2003 12:50:59 -0000 1.4
+++ AbstractLayout.java 19 May 2003 13:16:34 -0000 1.5
@@ -82,10 +82,14 @@
* @see org.apache.cocoon.portal.layout.Layout#getRendererName()
*/
public String getRendererName() {
- return rendererName;
+ if ( this.rendererName == null ) {
+ LayoutDescription desc = (LayoutDescription)this.aspectDataHandler.getDescription();
+ return desc.getRendererName();
+ }
+ return this.rendererName;
}
- public void setRendererName(String value) {
+ public void setLayoutRendererName(String value) {
this.rendererName = value;
}
@@ -164,8 +168,7 @@
* @see org.apache.cocoon.portal.layout.Layout#getLayoutRendererName()
*/
public String getLayoutRendererName() {
- // TODO Auto-generated method stub
- return null;
+ return this.rendererName;
}
}
1.5 +2 -2 cocoon-2.1/src/blocks/portal/samples/profiles/mapping/layout.xml
Index: layout.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/layout.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- layout.xml 19 May 2003 13:06:06 -0000 1.4
+++ layout.xml 19 May 2003 13:16:34 -0000 1.5
@@ -10,8 +10,8 @@
<class name="org.apache.cocoon.portal.layout.AbstractLayout"
extends="org.apache.cocoon.portal.layout.AbstractParameters">
- <field name="rendererName" type="java.lang.String">
- <bind-xml name="renderer-name" node="attribute" />
+ <field name="layoutRendererName" type="java.lang.String">
+ <bind-xml name="layout-renderer-name" node="attribute" />
</field>
<field name="name" type="java.lang.String">
<bind-xml name="name" node="attribute" />
1.5 +26 -26 cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal.xml
Index: portal.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/layout/portal.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- portal.xml 19 May 2003 13:06:06 -0000 1.4
+++ portal.xml 19 May 2003 13:16:34 -0000 1.5
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<composite-layout renderer-name="tab" static="true" name="tab">
+<composite-layout static="true" name="tab">
<named-item name="News">
- <composite-layout renderer-name="column" name="column">
+ <composite-layout name="column">
<item>
<parameter name="width" value="350" />
- <composite-layout renderer-name="row" static="true" name="row">
+ <composite-layout static="true" name="row">
<item>
- <coplet-layout renderer-name="window" static="true" name="coplet">
+ <coplet-layout static="true" name="coplet">
<id>1</id>
<parameter name="title" value="Newsweek"/>
<coplet-instance-data>Newsweek-1</coplet-instance-data>
</coplet-layout>
</item>
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>2</id>
<parameter name="title" value="NYT Business"/>
<coplet-instance-data>NYTBusiness-1</coplet-instance-data>
@@ -22,24 +22,24 @@
</composite-layout>
</item>
<item>
- <composite-layout renderer-name="row" static="false" name="row">
+ <composite-layout static="false" name="row">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>3</id>
<parameter name="title" value="BBC News"/>
<coplet-instance-data>BBCNews-1</coplet-instance-data>
</coplet-layout>
</item>
<item>
- <composite-layout renderer-name="column" name="column">
+ <composite-layout name="column">
<item>
- <frame-layout renderer-name="frame" name="frame">
+ <frame-layout name="frame">
<id>a</id>
<source>cocoon://samples/portal/news/NYTSport.rss</source>
</frame-layout>
</item>
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>4</id>
<parameter name="title" value="CNET News" />
<coplet-instance-data>CNET News-1</coplet-instance-data>
@@ -48,9 +48,9 @@
</composite-layout>
</item>
<item>
- <composite-layout renderer-name="column" name="column">
+ <composite-layout name="column">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>5</id>
<parameter name="title" value="CNET Business News" />
<coplet-instance-data>CNET Business-1</coplet-instance-data>
@@ -58,7 +58,7 @@
</item>
<item>
<parameter name="bgcolor" value="grey" />
- <frame-layout renderer-name="frame" name="frame">
+ <frame-layout name="frame">
<id>b</id>
<source>cocoon://samples/portal/news/CNNEurope.rss</source>
</frame-layout>
@@ -68,16 +68,16 @@
</composite-layout>
</item>
<item>
- <composite-layout renderer-name="row" static="false" name="row">
+ <composite-layout static="false" name="row">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>6</id>
<parameter name="title" value="Chicago Sunday Times" />
<coplet-instance-data>CSTNews-1</coplet-instance-data>
</coplet-layout>
</item>
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>7</id>
<parameter name="title" value="CNN Europe" />
<coplet-instance-data>CNNEurope-1</coplet-instance-data>
@@ -88,11 +88,11 @@
</composite-layout>
</named-item>
<named-item name="Weblogs">
- <composite-layout renderer-name="column" name="column">
+ <composite-layout name="column">
<item>
- <composite-layout renderer-name="row" name="row">
+ <composite-layout name="row">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>8</id>
<parameter name="title" value="ML's Weblog" />
<parameter name="bgcolor" value="#ffff00" />
@@ -100,7 +100,7 @@
</coplet-layout>
</item>
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>9</id>
<parameter name="title" value="CZ's Weblog" />
<parameter name="bgcolor" value="#ffff00" />
@@ -110,9 +110,9 @@
</composite-layout>
</item>
<item>
- <composite-layout renderer-name="row" name="row">
+ <composite-layout name="row">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>10</id>
<parameter name="title" value="Another Weblog" />
<parameter name="bgcolor" value="#ffff00" />
@@ -124,18 +124,18 @@
</composite-layout>
</named-item>
<named-item name="Cocoon">
- <composite-layout renderer-name="row" name="row">
+ <composite-layout name="row">
<item>
- <composite-layout renderer-name="column" name="column">
+ <composite-layout name="column">
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>11</id>
<parameter name="title" value="Cocoon Introduction" />
<coplet-instance-data>Introduction-1</coplet-instance-data>
</coplet-layout>
</item>
<item>
- <coplet-layout renderer-name="window" name="coplet">
+ <coplet-layout name="coplet">
<id>12</id>
<parameter name="title" value="Cocoon Overview" />
<coplet-instance-data>Overview-1</coplet-instance-data>
1.2 +8 -1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/LayoutAspectDataHandler.java
Index: LayoutAspectDataHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/LayoutAspectDataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LayoutAspectDataHandler.java 19 May 2003 12:50:58 -0000 1.1
+++ LayoutAspectDataHandler.java 19 May 2003 13:16:34 -0000 1.2
@@ -128,4 +128,11 @@
}
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.aspect.AspectDataHandler#getDescription()
+ */
+ public Object getDescription() {
+ return this.description;
+ }
+
}