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/12/12 16:53:20 UTC
cvs commit: cocoon-2.1/src/blocks/portal/samples/coplets/gallery gallery.xsl
cziegeler 2003/12/12 07:53:20
Modified: src/blocks/portal/conf portal.samplesxconf
src/blocks/portal/java/org/apache/cocoon/portal/transformation
CopletTransformer.java
src/blocks/portal/samples/coplets/gallery gallery.xsl
Log:
Fix stack bug
Revision Changes Path
1.11 +18 -0 cocoon-2.1/src/blocks/portal/conf/portal.samplesxconf
Index: portal.samplesxconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.samplesxconf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- portal.samplesxconf 12 Dec 2003 13:46:12 -0000 1.10
+++ portal.samplesxconf 12 Dec 2003 15:53:19 -0000 1.11
@@ -54,6 +54,18 @@
</aspect>
</aspects>
</renderer>
+ <renderer name="rawtab" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
+ <aspects>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="tab-layout"/>
+ </aspect>
+ <aspect type="history"/>
+ <aspect type="tab-content">
+ <parameter name="root-tag" value="false"/>
+ <parameter name="store" value="session"/>
+ </aspect>
+ </aspects>
+ </renderer>
<renderer name="linktab" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal">
<aspects>
<aspect type="xslt">
@@ -136,6 +148,12 @@
class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
<renderers default="tab">
<renderer name="tab"/>
+ </renderers>
+ </layout>
+ <layout name="rawtab"
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
+ <renderers default="rawtab">
+ <renderer name="rawtab"/>
</renderers>
</layout>
<layout name="linktab"
1.13 +7 -5 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
Index: CopletTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CopletTransformer.java 12 Dec 2003 14:42:34 -0000 1.12
+++ CopletTransformer.java 12 Dec 2003 15:53:19 -0000 1.13
@@ -239,10 +239,12 @@
*/
public void endTransformingElement(String uri, String name, String raw)
throws ProcessingException, IOException, SAXException {
- if ( name.equals(LINK_ELEM) || name.equals(LINKS_ELEM)) {
- String elem = (String)this.stack.pop();
- if ( elem.length() > 0 ) {
- this.sendEndElementEvent(elem);
+ if ( name.equals(LINK_ELEM) ) {
+ if ( !this.insideLinks ) {
+ String elem = (String)this.stack.pop();
+ if ( elem.length() > 0 ) {
+ this.sendEndElementEvent(elem);
+ }
}
} else if ( name.equals(LINKS_ELEM) ) {
this.insideLinks = false;
1.2 +3 -3 cocoon-2.1/src/blocks/portal/samples/coplets/gallery/gallery.xsl
Index: gallery.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/coplets/gallery/gallery.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gallery.xsl 12 Dec 2003 13:46:13 -0000 1.1
+++ gallery.xsl 12 Dec 2003 15:53:20 -0000 1.2
@@ -68,10 +68,10 @@
<p>Picture <xsl:value-of select="$showpicindex"/> of <xsl:value-of select="$maxp"/>
<xsl:if test="$showpicindex > 1">
- - <cl:link path="attributes/picture" value="{$picp}"><Previous></cl:link>
+ - <cl:link path="attributes/picture" value="{$picp}">« Previous</cl:link>
</xsl:if>
<xsl:if test="$showpicindex < $maxp">
- - <cl:link path="attributes/picture" value="{$picn}"><Next></cl:link>
+ - <cl:link path="attributes/picture" value="{$picn}">Next »</cl:link>
</xsl:if>
</p>
<p><cl:link path="attributes/picture" value="{picture[position()=$showpicindex]}" coplet="GalleryViewer-1">Push to Viewer</cl:link></p>