cvs diff (in directory D:\ADF\adfgen\displaytag\)
cvs.exe diff: Diffing .
cvs.exe diff: Diffing lib
cvs.exe diff: Diffing src
cvs.exe diff: Diffing src/java
cvs.exe diff: Diffing src/java/org
cvs.exe diff: Diffing src/java/org/apache
cvs.exe diff: Diffing src/java/org/apache/taglibs
cvs.exe diff: Diffing src/java/org/apache/taglibs/display
cvs.exe diff: Diffing src/java/org/displaytag
cvs.exe diff: Diffing src/java/org/displaytag/decorator
Index: src/java/org/displaytag/decorator/TableDecorator.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/decorator/TableDecorator.java,v
retrieving revision 1.2
diff -r1.2 TableDecorator.java
88a89,98
>      * Called just within the TR tag. Can be subclassed to provide specific data to customize TR tag such as style, jscript events, etc...
>      * @param defaultContent generally the style associated to the Row. Can be retained or throwed to provide a custom logic also for css style.
>      * @return decorated content for the TR tag, defaultContent in the default implementation
>      */
>     public String decorateRowTag(String defaultContent)
>     {
>         return defaultContent;
>     }
> 
>     /**
cvs.exe diff: Diffing src/java/org/displaytag/exception
cvs.exe diff: Diffing src/java/org/displaytag/export
cvs.exe diff: Diffing src/java/org/displaytag/filter
cvs.exe diff: Diffing src/java/org/displaytag/localization
cvs.exe diff: Diffing src/java/org/displaytag/model
Index: src/java/org/displaytag/model/Column.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/model/Column.java,v
retrieving revision 1.2
diff -r1.2 Column.java
17a18
> import org.displaytag.decorator.ColumnDecoratorHandler;
27a29,31
> import org.displaytag.tags.TableTag;
> 
> import javax.servlet.jsp.PageContext;
115a120,124
>             //If column decorator is instanceof ColumnDecoratorHandler call setPageContext method
>             if (this.header.getColumnDecorator() instanceof ColumnDecoratorHandler) {
>                 PageContext pageContext = this.row.getParentTable().getTableTag().getPageContext();
>                 ((ColumnDecoratorHandler)this.header.getColumnDecorator()).setPageContext(pageContext);
>             }
Index: src/java/org/displaytag/model/Row.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/model/Row.java,v
retrieving revision 1.2
diff -r1.2 Row.java
151a152,153
>         //Implement the new callback decorator method called "decorateRowTag"
>         String decorateRow = "";
154c156
<             return TagConstants.TAG_OPEN + TagConstants.TAGNAME_ROW + " " //$NON-NLS-1$
---
>             decorateRow += " "
156,157c158
<                 + css + "\"" //$NON-NLS-1$
<                 + TagConstants.TAG_CLOSE;
---
>                 + css + "\""; //$NON-NLS-1$
160c161,164
<         return TagConstants.TAG_OPEN + TagConstants.TAGNAME_ROW + TagConstants.TAG_CLOSE;
---
>         if (this.tableModel.getTableDecorator() != null)
>         {
>             decorateRow = this.tableModel.getTableDecorator().decorateRowTag(decorateRow);
>         }
161a166,169
>         if (decorateRow == null || decorateRow.equals(""))
>             return TagConstants.TAG_OPEN + TagConstants.TAGNAME_ROW + TagConstants.TAG_CLOSE;
>         else
>             return TagConstants.TAG_OPEN + TagConstants.TAGNAME_ROW + " " + decorateRow + TagConstants.TAG_CLOSE;
Index: src/java/org/displaytag/model/TableModel.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/model/TableModel.java,v
retrieving revision 1.2
diff -r1.2 TableModel.java
23a24
> import org.displaytag.tags.TableTag;
92a94,114
> 
>     /**
>      * TableTag reference.
>      */
>     private TableTag tableTag;
> 
>     /**
>      * getter for tableTag.
>      * @return reference to TableTag instance
>      */
>     public TableTag getTableTag() {
>         return tableTag;
>     }
> 
>     /**
>      * setter for tableTag.
>      * @param tableTag TableTag instance to store
>      */
>     public void setTableTag(TableTag tableTag) {
>         this.tableTag = tableTag;
>     }
cvs.exe diff: Diffing src/java/org/displaytag/pagination
cvs.exe diff: Diffing src/java/org/displaytag/properties
Index: src/java/org/displaytag/properties/TableProperties.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/properties/TableProperties.java,v
retrieving revision 1.2
diff -r1.2 TableProperties.java
196a197,202
>      * property <code>paging.banner.page.layout</code>.
>      * new property to control pagebanner and pagelinks sections.
>      */
>     public static final String PROPERTY_STRING_PAGING_LAYOUT = "paging.banner.page.layout"; //$NON-NLS-1$
> 
>     /**
747a754,762
>     }
> 
>     /**
>      * Getter for the <code>PROPERTY_STRING_PAGING_LAYOUT</code> property.
>      * @return String
>      */
>     public String getPagingPageLayout()
>     {
>         return getProperty(PROPERTY_STRING_PAGING_LAYOUT);
Index: src/java/org/displaytag/properties/TableTag.properties
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/properties/TableTag.properties,v
retrieving revision 1.2
diff -r1.2 TableTag.properties
82a83
> paging.banner.page.layout={0}{1}
cvs.exe diff: Diffing src/java/org/displaytag/sample
Index: src/java/org/displaytag/sample/Wrapper.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/sample/Wrapper.java,v
retrieving revision 1.2
diff -r1.2 Wrapper.java
110a111,121
> 
>     /**
>      * Sample TableDecorator that implement new decorateRowTag.
>      * Called just within the TR tag. Can be subclassed to provide specific data to customize TR tag such as style, jscript events, etc...
>      *
>      * @param defaultContent generally the style associated to the Row. Can be retained or throwed to provide a custom logic also for css style.
>      * @return decorated content for the TR tag, defaultContent in the default implementation
>      */
>     public String decorateRowTag(String defaultContent) {
>         return defaultContent + " onclick=\"alert('selected row number " + this.getListIndex() + "')\"";  //$NON-NLS-1$
>     }
cvs.exe diff: Diffing src/java/org/displaytag/tags
Index: src/java/org/displaytag/tags/TableTag.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/tags/TableTag.java,v
retrieving revision 1.1
diff -r1.1 TableTag.java
80c80
<  * @version $Revision: 1.1 $ ($Author: zzy9v4 $)
---
>  * @version $Revision: 1.99 $ ($Author: fgiust $)
183a184,188
>      * jScriptName to be called instead of a direct URI for jscript based requestURI.
>      */
>     private String jScriptName;
> 
>     /**
354a360,369
>      * setter for the "jScriptName" attribute. If set all link will point to the specified jscript function
>      * by passing URI as parameter.
>      * @param value jscript function name to be called
>      */
>     public void setJScriptName(String value)
>     {
>         this.jScriptName = value;
>     }
> 
>     /**
619a635,637
>         //Put tabletag instance into tableModel
>         this.tableModel.setTableTag(this);
> 
962a981,984
>         //set jscript function name if jScriptName is set
>         if (this.jScriptName != null) {
>             this.baseHref.setJscriptFunction(this.jScriptName);
>         }
1655c1677,1683
<                 write(value, out);
---
>                 //avoid very empty TD tag but put &nbsp; instead (useful when table border is set)
>                 if (value.equals("")) {
>                     write(TagConstants.BLANK_STRING, out);
>                 } else {
>                     write(value, out);
>                 }
> 
1719,1720c1747,1750
<             write(this.listHelper.getSearchResultsSummary());
<             write(this.listHelper.getPageNavigationBar(
---
>             //aggregate two span into master div
>             String mainBannerFormat = this.properties.getPagingPageLayout();
>             String searchResultsSummary = this.listHelper.getSearchResultsSummary();
>             String pageNavigationBar = this.listHelper.getPageNavigationBar(
1722c1752,1755
<                 encodeParameter(TableTagParameters.PARAMETER_PAGE)));
---
>                 encodeParameter(TableTagParameters.PARAMETER_PAGE));
>             Object[] pageObjects = {searchResultsSummary, pageNavigationBar};
> 
>             write(MessageFormat.format(mainBannerFormat, pageObjects));
1792a1826
>         this.jScriptName = null;
Index: src/java/org/displaytag/tags/TableTagBeanInfo.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/tags/TableTagBeanInfo.java,v
retrieving revision 1.1
diff -r1.1 TableTagBeanInfo.java
25c25
<  * @version $Revision: 1.1 $ ($Author: zzy9v4 $)
---
>  * @version $Revision: 1.11 $ ($Author: fgiust $)
62a63,64
>             proplist.add(new PropertyDescriptor("jScriptName", //$NON-NLS-1$
>                 TableTag.class, null, "setJScriptName")); //$NON-NLS-1$
cvs.exe diff: Diffing src/java/org/displaytag/tags/el
Index: src/java/org/displaytag/tags/el/ELTableTag.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/tags/el/ELTableTag.java,v
retrieving revision 1.1
diff -r1.1 ELTableTag.java
21c21
<  * @version $Revision: 1.1 $ ($Author: zzy9v4 $)
---
>  * @version $Revision: 1.14 $ ($Author: fgiust $)
96a97,101
>      * Expression for the "jScriptName" tag attribute.
>      */
>     private String jScriptNameExpr;
> 
>     /**
261a267,275
>      * @see org.displaytag.tags.TableTag#setJScriptName(java.lang.String)
>      * @param value EL expression for attribute value
>      */
>     public void setJScriptName(String value)
>     {
>         jScriptNameExpr = value;
>     }
> 
>     /**
405a420,423
>         if (jScriptNameExpr != null)
>         {
>             super.setJScriptName(eval.evalString("jScriptName", jScriptNameExpr)); //$NON-NLS-1$
>         }
446a465
>         this.jScriptNameExpr = null;
Index: src/java/org/displaytag/tags/el/ELTableTagBeanInfo.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/tags/el/ELTableTagBeanInfo.java,v
retrieving revision 1.1
diff -r1.1 ELTableTagBeanInfo.java
67c67,69
<                 ELTableTag.class, null, "setRequestURI")); //$NON-NLS-1$ 
---
>                 ELTableTag.class, null, "setRequestURI")); //$NON-NLS-1$
>             proplist.add(new PropertyDescriptor("jScriptName", //$NON-NLS-1$
>                 ELTableTag.class, null, "setJScriptName")); //$NON-NLS-1$
cvs.exe diff: Diffing src/java/org/displaytag/util
Index: src/java/org/displaytag/util/Href.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/util/Href.java,v
retrieving revision 1.2
diff -r1.2 Href.java
56a57,83
>      * JavaScript function name.
>      * new jscriptFunction that hold jscript function name to be called.
>      */
>     private String jscriptFunction;
> 
>     /**
>      * get jscript function name.
>      */
>     public String getJscriptFunction() {
>         return jscriptFunction;
>     }
> 
>     /**
>      * There is a jscript function name ?
>      */
>     public boolean isJscriptFunction() {
>         return (jscriptFunction != null);
>     }
> 
>     /**
>      * set jscript function name.
>      */
>     public void setJscriptFunction(String jscriptFunction) {
>         this.jscriptFunction = jscriptFunction;
>     }
> 
>     /**
160a188,189
>         //initialize jscriptFunction in the constructor
>         this.jscriptFunction = href.getJscriptFunction();
353a383,387
>         //if jscript function must be call then call them instead of direct URI
>         if (isJscriptFunction()) {
>             return TagConstants.JAVASCRIPT_TOKEN + getJscriptFunction() + "('" + buffer.toString() + "');";
>         }
> 
389c423
<             rhs.anchor).isEquals();
---
>             rhs.anchor).append(this.jscriptFunction, rhs.jscriptFunction).isEquals();
400a435
>             .append(this.jscriptFunction)
Index: src/java/org/displaytag/util/TagConstants.java
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/java/org/displaytag/util/TagConstants.java,v
retrieving revision 1.2
diff -r1.2 TagConstants.java
258a259,268
>      * String used to build jscript function call.
>      */
>     public static final String JAVASCRIPT_TOKEN = "javascript:"; //$NON-NLS-1$
> 
>     /**
>      * String used as value for nulls column, where "nulls" property is false.
>      */
>     public static final String BLANK_STRING = "&nbsp;"; //$NON-NLS-1$
> 
>     /**
cvs.exe diff: Diffing src/test
cvs.exe diff: Diffing src/test/com
cvs.exe diff: Diffing src/test/com/meterware
cvs.exe diff: Diffing src/test/com/meterware/servletunit
cvs.exe diff: Diffing src/test/org
cvs.exe diff: Diffing src/test/org/displaytag
cvs.exe diff: Diffing src/test/org/displaytag/decorator
cvs.exe diff: Diffing src/test/org/displaytag/filter
cvs.exe diff: Diffing src/test/org/displaytag/jsptests
cvs.exe diff: Diffing src/test/org/displaytag/properties
cvs.exe diff: Diffing src/test/org/displaytag/tags
cvs.exe diff: Diffing src/test/org/displaytag/test
cvs.exe diff: Diffing src/test/org/displaytag/tld
cvs.exe diff: Diffing src/test/org/displaytag/util
cvs.exe diff: Diffing src/test-resources
cvs.exe diff: Diffing src/test-resources/WEB-INF
cvs.exe diff: Diffing src/test-resources/WEB-INF/tld
cvs.exe diff: Diffing src/test-resources/el
cvs.exe diff: Diffing src/test-resources/tld11
cvs.exe diff: Diffing src/tld
Index: src/tld/displaytag-12.tld
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/tld/displaytag-12.tld,v
retrieving revision 1.3
diff -r1.3 displaytag-12.tld
110a111,120
>             <name>jScriptName</name>
>             <required>false</required>
>             <rtexprvalue>true</rtexprvalue>
>             <type>java.lang.String</type>
>             <description>
>                 When the present, links for sorting, exports, and paging are formed by adding javascript: jScriptName() and then,
>                 by calling a jscript function instead of directly request an URI. Useful to manage request or by submit action form.
>             </description>
>         </attribute>
>         <attribute>
Index: src/tld/displaytag-el-12.tld
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/tld/displaytag-el-12.tld,v
retrieving revision 1.3
diff -r1.3 displaytag-el-12.tld
74a75,83
>             <name>jScriptName</name>
>             <required>false</required>
>             <rtexprvalue>true</rtexprvalue>
>             <description>
>                 When the present, links for sorting, exports, and paging are formed by adding javascript: jScriptName() and then,
>                 by calling a jscript function instead of directly request an URI. Useful to manage request or by submit action form.
>             </description>
>         </attribute>
>         <attribute>
cvs.exe diff: Diffing src/webapp
cvs.exe diff: Diffing src/webapp/WEB-INF
Index: src/webapp/WEB-INF/displaytag-11.tld
===================================================================
RCS file: D:/CVS_Repo/displaytag/src/webapp/WEB-INF/displaytag-11.tld,v
retrieving revision 1.3
diff -r1.3 displaytag-11.tld
79c79
< <!--When the present, links for sorting, exports, and paging are formed by adding any tag generated 
---
> <!--When the present, links for sorting, exports, and paging are formed by adding any tag generated
81a82,88
> <required>false</required>
> <rtexprvalue>true</rtexprvalue>
> </attribute>
> <attribute>
> <!--When the present, links for sorting, exports, and paging are formed by adding javascript: jScriptName() and then,
>     by calling a jscript function instead of directly request an URI. Useful to manage request or by submit action form.-->
> <name>jScriptName</name>
cvs.exe diff: Diffing src/webapp/WEB-INF/classes
cvs.exe diff: Diffing src/webapp/css
cvs.exe diff: Diffing src/webapp/img
cvs.exe diff: Diffing src/webapp/inc
cvs.exe diff: Diffing xdocs
cvs.exe diff: Diffing xdocs/images
cvs.exe diff: Diffing xdocs/images/logos
cvs.exe diff: Diffing xdocs/nightly
cvs.exe diff: Diffing xdocs/style

***** CVS exited normally with code 1 *****