[richfaces-svn-commits] JBoss Rich Faces SVN: r15809 - in root/ui-sandbox/trunk/components: core/src/main/java/org/richfaces/renderkit/html/gradientimages and 1 other directories.

Monday, 2 November 2009


Author: Alex.Kolonitsky
Date: 2009-11-02 07:14:26 -0500 (Mon, 02 Nov 2009)
New Revision: 15809

Modified:
  
root/ui-sandbox/trunk/components/common/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java
  
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java
  
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java
  
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java
  
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java
  
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java
  
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
  
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SimpleDataTableRendererBase.java
Log:
Code style policy
https://jira.jboss.org/jira/browse/RFPL-195

Modified:
root/ui-sandbox/trunk/components/common/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java
===================================================================
---
root/ui-sandbox/trunk/components/common/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/common/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -30,7 +30,7 @@
 public class ComboBoxButtonPressGradient extends BaseGradient{
 	
 	public ComboBoxButtonPressGradient() {
-		super(7,15 , 9, Skin.headerBackgroundColor, "headerGradientColor");
+		super(7,15 , 9, Skin.HEADER_BACKGROUND_COLOR, "headerGradientColor");
 	}
 
 }

Modified:
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java
===================================================================
---
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -27,7 +27,7 @@
 public class HeaderGradientImage extends BaseControlBackgroundImage {
 
     public HeaderGradientImage() {
-        super(Skin.headerGradientColor, Skin.headerBackgroundColor, 8);
+        super(Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR, 8);
     }
 
 }

Modified:
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java
===================================================================
---
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -27,7 +27,7 @@
 public class HeaderInverseGradientImage extends BaseControlBackgroundImage {
 
     public HeaderInverseGradientImage() {
-        super(Skin.headerBackgroundColor, Skin.headerGradientColor, 8);
+        super(Skin.HEADER_BACKGROUND_COLOR, Skin.HEADER_GRADIENT_COLOR, 8);
     }
 
 }

Modified:
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java
===================================================================
---
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -27,7 +27,7 @@
 public class InputGradientImage extends BaseControlBackgroundImage {
 
     public InputGradientImage() {
-        super(Skin.additionalBackgroundColor, Skin.controlBackgroundColor, 8);
+        super(Skin.additionalBackgroundColor, Skin.CONTROL_BACKGROUND_COLOR, 8);
     }
 
 }

Modified:
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java
===================================================================
---
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -27,7 +27,7 @@
 public class TabGradientImage extends BaseControlBackgroundImage {
 
     public TabGradientImage() {
-        super("tabBackgroundColor", Skin.generalBackgroundColor, 8);
+        super("tabBackgroundColor", Skin.GENERAL_BACKGROUND_COLOR, 8);
     }
 
 }

Modified:
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java
===================================================================
---
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -27,7 +27,7 @@
 public class TabInverseGradientImage extends BaseControlBackgroundImage {
 
     public TabInverseGradientImage() {
-        super(Skin.generalBackgroundColor, "tabBackgroundColor", 8);
+        super(Skin.GENERAL_BACKGROUND_COLOR, "tabBackgroundColor", 8);
     }
 
 }

Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -182,7 +182,7 @@
 			styleClass.append(custom);
 		}
 		if (styleClass.length() > 0) {
-			writer.writeAttribute(HTML.class_ATTRIBUTE, styleClass, "styleClass");
+			writer.writeAttribute(HTML.CLASS_ATTRIBUTE, styleClass, "styleClass");
 		}
 	}
 	

Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SimpleDataTableRendererBase.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SimpleDataTableRendererBase.java	2009-11-02
12:12:01 UTC (rev 15808)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SimpleDataTableRendererBase.java	2009-11-02
12:14:26 UTC (rev 15809)
@@ -16,124 +16,124 @@
 import org.richfaces.component.UISubTable;
 
 @ResourceDependencies({
-	@ResourceDependency(name = "simple-datatable.js"),
-	@ResourceDependency(name = "simple-table.css")
+        @ResourceDependency(name = "simple-datatable.js"),
+        @ResourceDependency(name = "simple-table.css")
 })
 public abstract class SimpleDataTableRendererBase extends AbstractTableRenderer {
-	
-	public void encodeRowStart(RowEncodeEvent event) throws IOException {
-		ResponseWriter writer = event.getContext().getResponseWriter();
-		writer.startElement(HTML.TR_ELEMENT, event.getSource());
-	}
-	
-	public void encodeRowEnd(RowEncodeEvent event) throws IOException {
-		ResponseWriter writer = event.getContext().getResponseWriter();
-		writer.endElement(HTML.TR_ELEMENT);
-	}
-	
-	public void encodeFirstRow(RowEncodeEvent event)throws IOException {
-		ResponseWriter writer = event.getContext().getResponseWriter();
-		writer.startElement(HTML.TR_ELEMENT, event.getSource());
-	}
-	
-	public void encodeCell(CellEncodeEvent event) throws IOException {
-		ResponseWriter writer = event.getContext().getResponseWriter();
-		FacesContext context = event.getContext();	
-		UIColumn column = event.getSource();
-				
-		writer.startElement(HTML.td_ELEM, column);
-		getUtils().encodeId(context, column);
-		getCellStyleClasses(context, column);
-		renderChildren(context, column);
-		
-		writer.endElement(HTML.td_ELEM);
-	}
-	
-	public void encodeHeaderCell(CellEncodeEvent event) throws IOException {
-		ResponseWriter writer = event.getContext().getResponseWriter();
-		FacesContext context = event.getContext();	
-		UIColumn column = event.getSource();
-		
-		writer.startElement(HTML.th_ELEM, column);
-		//TODO ---  move to the separate method 
-		getUtils().encodeId(context, column);
-		getCellStyleClasses(context, column);
-		renderChildren(context, column);
-		//------
-		writer.endElement(HTML.th_ELEM);
-	}
-	
-	@Override
-	public RowEncoder getRowEncoder(TableHolder holder) {
-		RowEncoder encoder = new RowEncoder();
-		encoder.setListener(this);
-		return encoder;
-	}
-	
-	public void encodeSubTable(FacesContext context, UISubTable subTable) throws IOException
{
-		encodeRows(context, subTable);
-	}
-	
-	//
---------------------------------------------------------------------------------------
-	
-	public void encodeTableStructure(FacesContext context, UIDataTable table) throws
IOException{
-		
-		Object key = table.getRowKey();
-		table.captureOrigValue(context);
-		table.setRowKey(context, null);
-		
-		encodeCaption(context, table);
-		
-		// Encode colgroup definition.
-		ResponseWriter writer = context.getResponseWriter();
-		writer.startElement("colgroup", table);
-		
-		int columns = getColumnsCount(table);
-		
-		writer.writeAttribute("span", String.valueOf(columns), null);
-		String columnsWidth = (String) table.getAttributes().get("columnsWidth");
-		
-		if (null != columnsWidth) {
-			String[] widths = columnsWidth.split(",");
-			for (int i = 0; i < widths.length; i++) {
-				writer.startElement("col", table);
-				writer.writeAttribute("width", widths[i], null);
-				writer.endElement("col");
-			}
-		}
-		writer.endElement("colgroup");
 
-		encodeHeader(context, table, columns);
-		encodeFooter(context, table, columns);
-		
-		table.setRowKey(context,key);
-		table.restoreOrigValue(context);
-	}
-	
-	public void encodeCaption(FacesContext context, UIDataTable table) throws IOException {
-		
-		UIComponent caption = table.getCaption();
-		if (caption == null) {
-		    return;
-		}
+    public void encodeRowStart(RowEncodeEvent event) throws IOException {
+        ResponseWriter writer = event.getContext().getResponseWriter();
+        writer.startElement(HTML.TR_ELEMENT, event.getSource());
+    }
 
+    public void encodeRowEnd(RowEncodeEvent event) throws IOException {
+        ResponseWriter writer = event.getContext().getResponseWriter();
+        writer.endElement(HTML.TR_ELEMENT);
+    }
+
+    public void encodeFirstRow(RowEncodeEvent event) throws IOException {
+        ResponseWriter writer = event.getContext().getResponseWriter();
+        writer.startElement(HTML.TR_ELEMENT, event.getSource());
+    }
+
+    public void encodeCell(CellEncodeEvent event) throws IOException {
+        ResponseWriter writer = event.getContext().getResponseWriter();
+        FacesContext context = event.getContext();
+        UIColumn column = event.getSource();
+
+        writer.startElement(HTML.TD_ELEM, column);
+        getUtils().encodeId(context, column);
+        getCellStyleClasses(context, column);
+        renderChildren(context, column);
+
+        writer.endElement(HTML.TD_ELEM);
+    }
+
+    public void encodeHeaderCell(CellEncodeEvent event) throws IOException {
+        ResponseWriter writer = event.getContext().getResponseWriter();
+        FacesContext context = event.getContext();
+        UIColumn column = event.getSource();
+
+        writer.startElement(HTML.TH_ELEM, column);
+        //TODO ---  move to the separate method
+        getUtils().encodeId(context, column);
+        getCellStyleClasses(context, column);
+        renderChildren(context, column);
+        //------
+        writer.endElement(HTML.TH_ELEM);
+    }
+
+    @Override
+    public RowEncoder getRowEncoder(TableHolder holder) {
+        RowEncoder encoder = new RowEncoder();
+        encoder.setListener(this);
+        return encoder;
+    }
+
+    public void encodeSubTable(FacesContext context, UISubTable subTable) throws
IOException {
+        encodeRows(context, subTable);
+    }
+
+    //
---------------------------------------------------------------------------------------
+
+    public void encodeTableStructure(FacesContext context, UIDataTable table) throws
IOException {
+
+        Object key = table.getRowKey();
+        table.captureOrigValue(context);
+        table.setRowKey(context, null);
+
+        encodeCaption(context, table);
+
+        // Encode colgroup definition.
         ResponseWriter writer = context.getResponseWriter();
-		writer.startElement("caption", table);
+        writer.startElement("colgroup", table);
 
-	    String captionClass = (String) table.getAttributes().get("captionClass");
-	    captionClass = captionClass != null ? "rich-table-caption " + captionClass
: "rich-table-caption";  
-		writer.writeAttribute("class", captionClass, "captionClass");
-		
+        int columns = getColumnsCount(table);
+
+        writer.writeAttribute("span", String.valueOf(columns), null);
+        String columnsWidth = (String)
table.getAttributes().get("columnsWidth");
+
+        if (null != columnsWidth) {
+            String[] widths = columnsWidth.split(",");
+            for (int i = 0; i < widths.length; i++) {
+                writer.startElement("col", table);
+                writer.writeAttribute("width", widths[i], null);
+                writer.endElement("col");
+            }
+        }
+        writer.endElement("colgroup");
+
+        encodeHeader(context, table, columns);
+        encodeFooter(context, table, columns);
+
+        table.setRowKey(context, key);
+        table.restoreOrigValue(context);
+    }
+
+    public void encodeCaption(FacesContext context, UIDataTable table) throws IOException
{
+
+        UIComponent caption = table.getCaption();
+        if (caption == null) {
+            return;
+        }
+
+        ResponseWriter writer = context.getResponseWriter();
+        writer.startElement("caption", table);
+
+        String captionClass = (String)
table.getAttributes().get("captionClass");
+        captionClass = captionClass != null ? "rich-table-caption " +
captionClass : "rich-table-caption";
+        writer.writeAttribute("class", captionClass,
"captionClass");
+
         String captionStyle = (String)
table.getAttributes().get("captionStyle");
-		if (captionStyle != null) {
-			writer.writeAttribute("style", captionStyle, "captionStyle");
-		}
-		
-		renderChild(context, caption);
-		
-		writer.endElement("caption");
-		
-	}
+        if (captionStyle != null) {
+            writer.writeAttribute("style", captionStyle,
"captionStyle");
+        }
+
+        renderChild(context, caption);
+
+        writer.endElement("caption");
+
+    }
 /*
 	@Override
 	public void encodeCell(FacesContext context,  UIComponent component) throws IOException
{
@@ -145,185 +145,191 @@
 	}
 	
 	 */
-	
-	public void encodeHeader(FacesContext context, UIDataTable table, int columns) throws
IOException {
-		UIComponent header = table.getHeader();
-		boolean isEncodeHeaders = isEncodeHeaders(table);
 
-		if (header != null || isEncodeHeaders) {
-		    
-		    ResponseWriter writer = context.getResponseWriter();
-			writer.startElement("thead", table);
-			writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-table-thead", null);
-			String headerClass = (String) table.getAttributes().get("headerClass");
-			
-			if (header != null) {
-				encodeTableHeaderFacet(context, columns, writer, header,
-										"rich-table-header",
-										"rich-table-header-continue",
-										"rich-table-headercell",
-										headerClass, "th");
-			}
+    public void encodeHeader(FacesContext context, UIDataTable table, int columns) throws
IOException {
+        UIComponent header = table.getHeader();
+        boolean isEncodeHeaders = isEncodeHeaders(table);
 
-			if (isEncodeHeaders) {
-				writer.startElement("tr", table);
-				encodeStyleClass(writer, null, "rich-table-subheader", null, headerClass);
-				encodeHeaderFacets(context, writer, table.columns(),
"rich-table-subheadercell", headerClass, "header", "th",
columns);
-				writer.endElement("tr");
-			}
-			
-			writer.endElement("thead");
-		}
-	}
-	
-	public void encodeFooter(FacesContext context, UIDataTable table, int columns) throws
IOException {
-		ResponseWriter writer = context.getResponseWriter();
-		Iterator<UIComponent> tableColumns = table.columns();
+        if (header != null || isEncodeHeaders) {
 
-		UIComponent footer = table.getFooter();
-		boolean columnFacetPresent = isColumnFacetPresent(table,"footer");
-	
-		if (footer != null || columnFacetPresent) {
-			writer.startElement("tfoot", table);
-			String footerClass = (String) table.getAttributes().get("footerClass");
+            ResponseWriter writer = context.getResponseWriter();
+            writer.startElement("thead", table);
+            writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-table-thead",
null);
+            String headerClass = (String)
table.getAttributes().get("headerClass");
 
-			if (columnFacetPresent) {
-				writer.startElement("tr", table);
-				encodeStyleClass(writer, null, "rich-table-subfooter", null, footerClass);
-				encodeHeaderFacets(context, writer, tableColumns,
"rich-table-subfootercell", footerClass, "footer",
"td",columns);
-				writer.endElement("tr");
-			}
-			
-			if (footer != null) {
-				encodeTableHeaderFacet(context, columns, writer, footer,
-						"rich-table-footer",
-						"rich-table-footer-continue",
-						"rich-table-footercell",
-						footerClass, "td");
-			}
-			writer.endElement("tfoot");
-		}
-	}
-	
-	protected void encodeTableHeaderFacet(FacesContext context, int columns, ResponseWriter
writer, UIComponent footer, String skinFirstRowClass, String skinRowClass, String
skinCellClass, String footerClass, String element) throws IOException {
-		boolean isColgroup = footer instanceof Row;
-		
-		if (!isColgroup) {
-			writer.startElement("tr", footer);
-			encodeStyleClass(writer, null, skinFirstRowClass, footerClass, null);
-			writer.startElement(element, footer);
-			encodeStyleClass(writer, null, skinCellClass, footerClass, null);
-			
-			if (columns > 0) {
-				writer.writeAttribute("colspan", String.valueOf(columns), null);
-			}
-			
-			writer.writeAttribute("scope", "colgroup", null);
-		}
-		
-		if(isColgroup) {
-			RowEncoder encoder = getRowEncoder(null);
-			encoder.setHeader(true);
-			encoder.encodeRows(context, footer);
-		} else {
-			renderChild(context, footer);
-		}
-	
-		if (!isColgroup) {
-			writer.endElement(element);
-			writer.endElement("tr");
-		}
-	}
-	
-	protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer,
Iterator<UIComponent> headers,
-										String skinCellClass, String headerClass, String facetName, String element, int
colCount) throws IOException {
-		int t_colCount = 0;
+            if (header != null) {
+                encodeTableHeaderFacet(context, columns, writer, header,
+                        "rich-table-header",
+                        "rich-table-header-continue",
+                        "rich-table-headercell",
+                        headerClass, "th");
+            }
 
-		// HeaderEncodeStrategy richEncodeStrategy = new
-		// RichHeaderEncodeStrategy();
-		// HeaderEncodeStrategy simpleEncodeStrategy = new
-		// SimpleHeaderEncodeStrategy();
+            if (isEncodeHeaders) {
+                writer.startElement("tr", table);
+                encodeStyleClass(writer, null, "rich-table-subheader", null,
headerClass);
+                encodeHeaderFacets(context, writer, table.columns(),
"rich-table-subheadercell", headerClass, "header",
+                        "th", columns);
+                writer.endElement("tr");
+            }
 
-		while (headers.hasNext()) {
-			UIComponent column = headers.next();
-			if (!column.isRendered()) {
-				continue;
-			}
+            writer.endElement("thead");
+        }
+    }
 
-			Integer colspan = (Integer) column.getAttributes().get("colspan");
-			if (colspan != null && colspan.intValue() > 0) {
-				t_colCount += colspan.intValue();
-			} else {
-				t_colCount++;
-			}
+    public void encodeFooter(FacesContext context, UIDataTable table, int columns) throws
IOException {
+        ResponseWriter writer = context.getResponseWriter();
+        Iterator<UIComponent> tableColumns = table.columns();
 
-			if (t_colCount > colCount) {
-				break;
-			}
+        UIComponent footer = table.getFooter();
+        boolean columnFacetPresent = isColumnFacetPresent(table, "footer");
 
-			String classAttribute = facetName + "Class";
-			String columnHeaderClass = (String) column.getAttributes().get(classAttribute);
+        if (footer != null || columnFacetPresent) {
+            writer.startElement("tfoot", table);
+            String footerClass = (String)
table.getAttributes().get("footerClass");
 
-			writer.startElement(element, column);
-			encodeStyleClass(writer, null, skinCellClass, headerClass,columnHeaderClass);
-			writer.writeAttribute("scope", "col", null);
-			getUtils().encodeAttribute(context, column, "colspan");
+            if (columnFacetPresent) {
+                writer.startElement("tr", table);
+                encodeStyleClass(writer, null, "rich-table-subfooter", null,
footerClass);
+                encodeHeaderFacets(context, writer, tableColumns,
"rich-table-subfootercell", footerClass, "footer",
+                        "td", columns);
+                writer.endElement("tr");
+            }
 
-			UIComponent facet = column.getFacet(facetName);
-			if (facet != null && facet.isRendered()) {
-				renderChild(context, facet);
-			}
+            if (footer != null) {
+                encodeTableHeaderFacet(context, columns, writer, footer,
+                        "rich-table-footer",
+                        "rich-table-footer-continue",
+                        "rich-table-footercell",
+                        footerClass, "td");
+            }
+            writer.endElement("tfoot");
+        }
+    }
 
-			writer.endElement(element);
-		}
-	}
-	
-	@Override
-	public void encodeBodyBegin(FacesContext context, UIDataTable table) throws IOException
{
-	    String clientId = table.getClientId(context);
-	    ResponseWriter writer = context.getResponseWriter();
-	    writer.startElement("tbody", table);
-	    writer.writeAttribute("id", clientId + ":tb", null);
-	}
-	
-	@Override
-	public void encodeBodyEnd(FacesContext context, UIDataTable table) throws IOException {
-		ResponseWriter writer = context.getResponseWriter();
-		writer.endElement("tbody");
-	}	
-	
-	protected String getRowSkinClasses(boolean firstColumn) {
-		String rowSkinClass = getRowSkinClass();
-		if (firstColumn) {
-			String firstRowSkinClass = getFirstRowSkinClass();
-			if (firstRowSkinClass != null && firstRowSkinClass.length() != 0) {
-				rowSkinClass = (rowSkinClass != null && rowSkinClass.trim().length() != 0) ?
-							rowSkinClass + " " + firstRowSkinClass : firstRowSkinClass;	
-			}
-		}
-		
-		return rowSkinClass;
-	}
+    protected void encodeTableHeaderFacet(FacesContext context, int columns,
ResponseWriter writer, UIComponent footer,
+        String skinFirstRowClass, String skinRowClass, String skinCellClass, String
footerClass, String element)
+        throws IOException {
+        
+        boolean isColgroup = footer instanceof Row;
 
-	/**
-	 * @return
-	 */
-	protected String getRowSkinClass() {
-		return "rich-table-row";
-	}
+        if (!isColgroup) {
+            writer.startElement("tr", footer);
+            encodeStyleClass(writer, null, skinFirstRowClass, footerClass, null);
+            writer.startElement(element, footer);
+            encodeStyleClass(writer, null, skinCellClass, footerClass, null);
 
-	/**
-	 * @return
-	 */
-	protected String getFirstRowSkinClass() {
-		return "rich-table-firstrow";
-	}
+            if (columns > 0) {
+                writer.writeAttribute("colspan", String.valueOf(columns),
null);
+            }
 
-	/**
-	 * @return
-	 */
-	protected String getCellSkinClass() {
-		return "rich-table-cell";
-	}
-	
+            writer.writeAttribute("scope", "colgroup", null);
+        }
+
+        if (isColgroup) {
+            RowEncoder encoder = getRowEncoder(null);
+            encoder.setHeader(true);
+            encoder.encodeRows(context, footer);
+        } else {
+            renderChild(context, footer);
+        }
+
+        if (!isColgroup) {
+            writer.endElement(element);
+            writer.endElement("tr");
+        }
+    }
+
+    protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer,
Iterator<UIComponent> headers,
+        String skinCellClass, String headerClass, String facetName, String element, int
colCount) throws IOException {
+        
+        int tColCount = 0;
+
+        // HeaderEncodeStrategy richEncodeStrategy = new
+        // RichHeaderEncodeStrategy();
+        // HeaderEncodeStrategy simpleEncodeStrategy = new
+        // SimpleHeaderEncodeStrategy();
+
+        while (headers.hasNext()) {
+            UIComponent column = headers.next();
+            if (!column.isRendered()) {
+                continue;
+            }
+
+            Integer colspan = (Integer) column.getAttributes().get("colspan");
+            if (colspan != null && colspan.intValue() > 0) {
+                tColCount += colspan.intValue();
+            } else {
+                tColCount++;
+            }
+
+            if (tColCount > colCount) {
+                break;
+            }
+
+            String classAttribute = facetName + "Class";
+            String columnHeaderClass = (String)
column.getAttributes().get(classAttribute);
+
+            writer.startElement(element, column);
+            encodeStyleClass(writer, null, skinCellClass, headerClass,
columnHeaderClass);
+            writer.writeAttribute("scope", "col", null);
+            getUtils().encodeAttribute(context, column, "colspan");
+
+            UIComponent facet = column.getFacet(facetName);
+            if (facet != null && facet.isRendered()) {
+                renderChild(context, facet);
+            }
+
+            writer.endElement(element);
+        }
+    }
+
+    @Override
+    public void encodeBodyBegin(FacesContext context, UIDataTable table) throws
IOException {
+        String clientId = table.getClientId(context);
+        ResponseWriter writer = context.getResponseWriter();
+        writer.startElement("tbody", table);
+        writer.writeAttribute("id", clientId + ":tb", null);
+    }
+
+    @Override
+    public void encodeBodyEnd(FacesContext context, UIDataTable table) throws IOException
{
+        ResponseWriter writer = context.getResponseWriter();
+        writer.endElement("tbody");
+    }
+
+    protected String getRowSkinClasses(boolean firstColumn) {
+        String rowSkinClass = getRowSkinClass();
+        if (firstColumn) {
+            String firstRowSkinClass = getFirstRowSkinClass();
+            if (firstRowSkinClass != null && firstRowSkinClass.length() != 0) {
+                rowSkinClass = (rowSkinClass != null &&
rowSkinClass.trim().length() != 0)
+                        ? rowSkinClass + " " + firstRowSkinClass :
firstRowSkinClass;
+            }
+        }
+
+        return rowSkinClass;
+    }
+
+    /**
+     * @return
+     */
+    protected String getRowSkinClass() {
+        return "rich-table-row";
+    }
+
+    /**
+     * @return
+     */
+    protected String getFirstRowSkinClass() {
+        return "rich-table-firstrow";
+    }
+
+    /**
+     * @return
+     */
+    protected String getCellSkinClass() {
+        return "rich-table-cell";
+    }
+
 }


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r15809 - in root/ui-sandbox/trunk/components: core/src/main/java/org/richfaces/renderkit/html/gradientimages and 1 other directories.