Author: abelevich
Date: 2010-05-26 12:24:37 -0400 (Wed, 26 May 2010)
New Revision: 17277
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss
Log:
fix subTable column facets encoding, fix dataTable caption encoding
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-05-26
16:24:12 UTC (rev 17276)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-05-26
16:24:37 UTC (rev 17277)
@@ -46,6 +46,20 @@
protected void doDecode(FacesContext context, UIComponent component) {
decodeSortingFiltering(context, component);
}
+
+ protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {
+
+ public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent
column, String facetName)
+ throws IOException {
+
+ }
+
+ public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent
column, String facetName)
+ throws IOException {
+ }
+ }
+
+
/**
* Returns true if specified attribute (when present on the column) should generate
header even if it is not
* specified on the table
@@ -81,13 +95,19 @@
: getColumnsCount(table.columns());
return count;
}
-
+
+ public void encodeTableStructure(ResponseWriter writer, FacesContext context,
UIDataTableBase dataTable) throws IOException {
+ //DataTableRenderer override this method
+ }
+
public void encodeTableFacets(ResponseWriter writer, FacesContext context,
UIDataTableBase dataTable) throws IOException {
Object key = dataTable.getRowKey();
dataTable.captureOrigValue(context);
dataTable.setRowKey(context, null);
+ encodeTableStructure(writer, context, dataTable);
+
String id = dataTable.getClientId(context);
setupTableStartElement(context, dataTable);
encodeHeaderFacet(writer, context, dataTable, false);
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-26
16:24:12 UTC (rev 17276)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-26
16:24:37 UTC (rev 17277)
@@ -228,19 +228,7 @@
}
}
-
- protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {
- public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent
column, String facetName)
- throws IOException {
-
- }
-
- public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent
column, String facetName)
- throws IOException {
- }
- }
-
public boolean containsThead() {
return true;
}
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-05-26
16:24:12 UTC (rev 17276)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-05-26
16:24:37 UTC (rev 17277)
@@ -159,8 +159,8 @@
}
public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String
tableFacetName) {
- // TODO: implement column header facet
- return null;
+ //TODO: anton -> use RichHeaderEncodeStrategy for our columns ???
+ return new SimpleHeaderEncodeStrategy();
}
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss 2010-05-26
16:24:12 UTC (rev 17276)
+++
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss 2010-05-26
16:24:37 UTC (rev 17277)
@@ -181,6 +181,17 @@
}
.rf-st-sh-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ background-color:'#{richSkin.tableSubHeaderBackgroundColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
}
.rf-st-sh{
@@ -206,6 +217,17 @@
}
.rf-st-sf-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ background-color:'#{richSkin.tableSubHeaderBackgroundColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
}
.rf-st-sf{
Show replies by date