[Salto-framework-devs] SF.net SVN: salto-framework: [315] salto-framework/trunk/src-fwk/salto/fwk/ mvc/taglib/table

[<de...@us...>]

Revision: 315
          http://svn.sourceforge.net/salto-framework/?rev=315&view=rev
Author:   denolfj
Date:     2006-12-20 02:13:32 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------


Modified Paths:
--------------
    salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java
    salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollColumnTag.java
    salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollDataTableTag.java

Modified: salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java
===================================================================
--- salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java	2006-12-18 11:07:02 UTC (rev 314)
+++ salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java	2006-12-20 10:13:32 UTC (rev 315)
@@ -185,7 +185,7 @@
 //			/* prevent Mozilla scrollbar from hiding cell content */ //Integer.parseInt(getHeaderHeight())
 //			sb.append("<div class='tableContainer' id='" + getTableContainerId() + "' style='height: " + (Integer.parseInt(maxHeight) + 40) + "px;"+width+" overflow-x: hidden;'>");
 			
-			sb.append("<style>table#" + id + ">tbody.datatable	{ overflow-x: hidden;height: " + maxHeight + "px;overflow-y: auto;}"); 
+			sb.append("<style>table#" + id + ">tbody.datatable	{ overflow-x: hidden;height: " + maxHeight + "px;"+width+" overflow-y: auto;}"); 
 			// pour  mozilla
 			sb.append("td:last-child {padding-right: 20px;}</style>"); 
 			/* prevent Mozilla scrollbar from hiding cell content */

Modified: salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollColumnTag.java
===================================================================
--- salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollColumnTag.java	2006-12-18 11:07:02 UTC (rev 314)
+++ salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollColumnTag.java	2006-12-20 10:13:32 UTC (rev 315)
@@ -78,6 +78,10 @@
 	
 	private String width=null;
 	
+	/* (non-Javadoc)
+	 * @see javax.servlet.jsp.tagext.TagSupport#doAfterBody()
+	 */
+
 	/**
 	 * @return the bundle
 	 */
@@ -238,16 +242,8 @@
 	 * @see javax.servlet.jsp.tagext.BodyTagSupport#doEndTag()
 	 */
 	public int doEndTag() throws JspException {
-		try {
+		try {String content = "";
 			
-			BodyContent theBodyContent = getBodyContent();
-			String content = "";
-			if (bodyContent != null) {
-				content = theBodyContent.getString();
-				theBodyContent.clearBody();
-			}
-			getScrollTableTag().addRowContent(content);
-
 			if (getScrollTableTag().isFirstRow()) {
 				// objet resultat
 				ScrollColumnInfos col = new ScrollColumnInfos(property,customFormat,formatter,pattern,content);
@@ -256,6 +252,14 @@
 				col.setHtmlAttributes(htmlAttributes);
 				col.setWidth(width);
 				getScrollTableTag().addColumn(col);				
+			} else {
+				BodyContent theBodyContent = getBodyContent();
+				
+				if (theBodyContent != null) {
+					content = theBodyContent.getString();
+					theBodyContent.clearBody();
+				}
+				getScrollTableTag().addRowContent(content);	
 			}
 			
 			return SKIP_BODY;
@@ -313,4 +317,16 @@
 		this.width = width;
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
+	 */
+	public int doStartTag() throws JspException {
+			
+			if (getScrollTableTag().isFirstRow()) {
+				return SKIP_BODY;
+			}
+		
+		return super.doStartTag();
+	}
+
 }

Modified: salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollDataTableTag.java
===================================================================
--- salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollDataTableTag.java	2006-12-18 11:07:02 UTC (rev 314)
+++ salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ScrollDataTableTag.java	2006-12-20 10:13:32 UTC (rev 315)
@@ -14,6 +14,7 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.TagSupport;
 
 import org.apache.commons.collections.IteratorUtils;
 
@@ -138,7 +139,7 @@
 			//
 		}
 
-		columns = new ArrayList();
+		this.release();
 		
 		return SKIP_BODY;
 	}
@@ -148,7 +149,9 @@
 	}
 	
 	public void addRowsContent() {
-		rowsContent.add(rowContent);
+		if (rowContent.size() > 0) {
+			rowsContent.add(rowContent);
+		}
 		rowContent = new ArrayList();
 	}
 	
@@ -176,10 +179,10 @@
 		}
 		
 		
-		if (getExportedObjectName() != null)
-			if (dataIterator.hasNext()) {
-				exportObject();
-			}
+//		if (getExportedObjectName() != null)
+//			if (dataIterator.hasNext()) {
+//				exportObject();
+//			}
 		
 		return EVAL_BODY_INCLUDE;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.