[richfaces-svn-commits] JBoss Rich Faces SVN: r17264 - in root/ui-sandbox/tables/trunk/ui/src/main: java/org/richfaces/renderkit and 2 other directories.

Author: abelevich Date: 2010-05-26 11:14:20 -0400 (Wed, 26 May 2010) New Revision: 17264 Added: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss Removed: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/table.css Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIColumnGroup.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTable.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTableBase.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIToggleControl.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 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/ColumnGroupRenderer.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/ExtendedDataTableRenderer.java 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/taglib/DataTableHandler.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java Log: skinning, prepare classes for the toggle/sorting/filtering events processing, remove @override annotations, checkstyle fixes Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/DataTableFixedChildrenIterator.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -35,7 +35,6 @@ super(dataTable); } - @Override protected UIComponent nextItem() { UIComponent next = null; Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -34,7 +34,6 @@ super(dataTable); } - @Override protected UIComponent getNextFacet() { return null; } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIColumnGroup.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -31,12 +31,6 @@ import org.ajax4jsf.model.DataVisitor; import org.richfaces.renderkit.RowHolderBase; -/** - * JSF component class - * - */ - - public abstract class UIColumnGroup extends UIPanel implements Row, Column { Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -22,68 +22,16 @@ package org.richfaces.component; -import javax.el.MethodExpression; import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; -import org.richfaces.event.SortingEvent; - /** * @author Anton Belevich * */ - public class UIDataTable extends UIDataTableBase { - - enum PropertyKeys { - sortingExpression - } - public void setSortingListener(MethodExpression sortingExpression) { - //TODO nick - use addToggleListener() & MethodExpression wrapper in tag - getStateHelper().put(PropertyKeys.sortingExpression, sortingExpression); - } - - public MethodExpression getSortingListener() { - return (MethodExpression) getStateHelper().eval(PropertyKeys.sortingExpression); - } - public UIComponent getCaption() { return getFacet("caption"); } - - @Override - public void broadcast(FacesEvent event) throws AbortProcessingException { - super.broadcast(event); - if(event instanceof SortingEvent) { - SortingEvent sortingEvent = (SortingEvent)event; - - FacesContext context = getFacesContext(); - - MethodExpression expression = getSortingListener(); - if (expression != null) { - expression.invoke(context.getELContext(), new Object[] { sortingEvent }); - } - - } - } - - @Override - public void queueEvent(FacesEvent event) { - if(event instanceof SortingEvent) { - //TODO immediate ??? - event.setPhaseId(PhaseId.INVOKE_APPLICATION); - } - super.queueEvent(event); - - } - - public String[] getHiddenInputId() { - return new String[]{getClientId() + ":sort"}; - } - } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -37,11 +37,17 @@ import javax.faces.component.visit.VisitContext; import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; +import javax.faces.event.FacesEvent; +import javax.faces.event.PhaseId; import javax.faces.event.PreRenderComponentEvent; import org.ajax4jsf.model.ExtendedDataModel; import org.richfaces.context.ExtendedVisitContext; import org.richfaces.context.ExtendedVisitContextMode; +import org.richfaces.event.FilteringEvent; +import org.richfaces.event.FilteringListener; +import org.richfaces.event.SortingEvent; +import org.richfaces.event.SortingListener; import org.richfaces.log.RichfacesLogger; import org.richfaces.model.Arrangeable; import org.richfaces.model.ArrangeableModel; @@ -77,12 +83,10 @@ return new DataTableColumnsIterator(this); } - @Override protected Iterator<UIComponent> fixedChildren() { return new DataTableFixedChildrenIterator(this); } - @Override protected Iterator<UIComponent> dataChildren() { return new DataTableDataIterator(this); } @@ -120,12 +124,10 @@ return result; } - @Override public boolean getRendersChildren() { return true; } - @Override protected ExtendedDataModel<?> createExtendedDataModel() { ExtendedDataModel<?> dataModel = super.createExtendedDataModel(); Arrangeable arrangeable = null; @@ -232,7 +234,6 @@ renderer.encodeMetaComponent(context, this, metaComponentId); } - @Override protected boolean visitFixedChildren(VisitContext visitContext, VisitCallback callback) { if (visitContext instanceof ExtendedVisitContext) { ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) visitContext; @@ -266,7 +267,6 @@ return super.visitFixedChildren(visitContext, callback); } - @Override protected boolean visitDataChildren(VisitContext visitContext, final VisitCallback callback, boolean visitRows) { if (visitContext instanceof ExtendedVisitContext && visitRows) { ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) visitContext; @@ -287,4 +287,41 @@ return super.visitDataChildren(visitContext, callback, visitRows); } + + public void addSortingListener(SortingListener listener) { + addFacesListener(listener); + } + + public void removeSortingListener(SortingListener listener) { + removeFacesListener(listener); + } + + + public void addFilteringListener(FilteringListener listener) { + addFacesListener(listener); + } + + public void removeFilteringListener(FilteringListener listener) { + removeFacesListener(listener); + } + + public FilteringListener[] getFilteringListeners() { + return (FilteringListener[])getFacesListeners(FilteringListener.class); + } + + public SortingListener[] getSortingListeners() { + return (SortingListener[])getFacesListeners(SortingListener.class); + } + + public void queueEvent(FacesEvent event) { + if(event instanceof SortingEvent) { + event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES); + } + + if(event instanceof FilteringEvent) { + event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES); + } + super.queueEvent(event); + } + } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -41,7 +41,7 @@ /** - * @author Anton Belevich + * @author Konstantin Mishin * */ public class UIExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder { @@ -49,6 +49,7 @@ public static final String SCROLL = "scroll"; public static final String SUBMITTED_CLIENT_FIRST = "submittedClientFirst"; + public static final String OLD_CLIENT_FIRST = "oldClientFirst"; private static final Logger RENDERKIT_LOG = RichfacesLogger.RENDERKIT.getLogger(); @@ -89,7 +90,6 @@ super.encodeMetaComponent(context, metaComponentId); } - @Override protected boolean visitDataChildren(VisitContext visitContext, final VisitCallback callback, boolean visitRows) { if (visitContext instanceof ExtendedVisitContext && visitRows) { ExtendedVisitContext extendedVisitContext = (ExtendedVisitContext) visitContext; @@ -160,7 +160,6 @@ updateState(); } - @Override public void setFirst(int first) { super.setFirst(first); setClientFirst(0); @@ -176,8 +175,6 @@ updateState(); } - @SuppressWarnings("deprecation") - @Override public void setValueBinding(String name, javax.faces.el.ValueBinding binding) { super.setValueBinding(name, binding); @@ -187,7 +184,6 @@ } } - @Override public void setValueExpression(String name, ValueExpression binding) { super.setValueExpression(name, binding); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -23,7 +23,6 @@ package org.richfaces.component; import javax.el.ELContext; -import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.application.ResourceDependency; import javax.faces.context.FacesContext; @@ -46,34 +45,26 @@ enum PropertyKeys { expandMode, expanded, toggleExpression } - - - @Override + + public void broadcast(FacesEvent event) throws AbortProcessingException { super.broadcast(event); if (event instanceof ToggleEvent) { ToggleEvent toggleEvent = (ToggleEvent) event; boolean newValue = toggleEvent.isExpanded(); + getStateHelper().put(PropertyKeys.expanded, newValue); FacesContext facesContext = getFacesContext(); ELContext elContext = facesContext.getELContext(); - - MethodExpression methodExpression = getToggleListener(); - if (methodExpression != null) { - methodExpression.invoke(elContext, new Object[]{newValue}); - } - - getStateHelper().put(PropertyKeys.expanded, newValue); - + ValueExpression valueExpression = getValueExpression(PropertyKeys.expanded.toString()); if (valueExpression != null && !valueExpression.isReadOnly(elContext)) { valueExpression.setValue(elContext, newValue); } - - facesContext.getPartialViewContext().getRenderIds().add(getClientId(facesContext)); } } + public boolean isExpanded() { return (Boolean) getStateHelper().eval(PropertyKeys.expanded, true); } @@ -99,19 +90,10 @@ throw new IllegalArgumentException("subtable is not sortable element"); } - public void setToggleListener(MethodExpression toggleExpression) { - //TODO nick - use addToggleListener() & MethodExpression wrapper in tag - getStateHelper().put(PropertyKeys.toggleExpression, toggleExpression); - } - - public MethodExpression getToggleListener() { - return (MethodExpression) getStateHelper().eval(PropertyKeys.toggleExpression); - } - public void addToggleListener(ToggleListener listener) { addFacesListener(listener); } - + public void removeToggleListener(ToggleListener listener) { removeFacesListener(listener); } @@ -128,7 +110,6 @@ getStateHelper().put(PropertyKeys.expandMode, expandMode); } - @Override public void setIterationState(Object stateObject) { Object[] state = (Object[]) stateObject; if (state != null) { @@ -140,7 +121,6 @@ } } - @Override public Object getIterationState() { Object [] state = new Object[2]; state[0] = super.getIterationState(); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIToggleControl.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIToggleControl.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIToggleControl.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -33,8 +33,6 @@ expandControl, collapseControl, forId, switchType, event } - - @Override public String getFamily() { return COMPONENT_FAMILY; } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -63,7 +63,6 @@ rowHolder.getRow().walk(facesContext, this, rowHolder); } - @Override protected void doEncodeChildren(ResponseWriter writer, FacesContext facesContext, UIComponent component) throws IOException { RowHolderBase rowHolder = createRowHolder(facesContext, component); encodeBeforeRows(writer, facesContext, rowHolder); 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 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -43,7 +43,6 @@ @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-event.js")}) public abstract class AbstractTableRenderer extends AbstractTableBaseRenderer implements MetaComponentRenderer { - @Override protected void doDecode(FacesContext context, UIComponent component) { decodeSortingFiltering(context, component); } @@ -108,14 +107,12 @@ saveRowStyles(context,id, firstClass, rowClass, cellClass); } - @Override protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIDataTableBase dataTable = (UIDataTableBase) component; encodeTableStart(writer, context, dataTable); encodeTableFacets(writer, context, dataTable); } - @Override protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { if(component instanceof UIDataTableBase) { @@ -131,7 +128,7 @@ writer.writeAttribute("colspan", columns, null); String styleClass = (String)dataTable.getAttributes().get("noDataStyleClass"); - styleClass = styleClass != null ? "rich-nodata-cell " + styleClass : "rich-nodata-cell"; + styleClass = styleClass != null ? getNoDataClass() + " " + styleClass : getNoDataClass(); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, styleClass, null); @@ -177,8 +174,7 @@ } public abstract void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException; - - + public void encodeTableBodyStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { writer.startElement(HTML.TBODY_ELEMENT, dataTable); @@ -512,6 +508,8 @@ public abstract String getColumnFooterFirstSkinClass(); public abstract String getCellSkinClass(); + + public abstract String getNoDataClass(); protected abstract void setupTableStartElement(FacesContext context, UIComponent component); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -40,7 +40,6 @@ */ public class ColumnGroupRenderer extends AbstractTableBaseRenderer { - @Override public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException { RowHolder rowHolder = (RowHolder) holder; @@ -54,7 +53,6 @@ } } - @Override public RowHolderBase createRowHolder(FacesContext context, UIComponent component) { UIComponent parent = component.getParent(); while(parent != null && !(parent instanceof UIDataTableBase)) { 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 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -49,7 +49,7 @@ @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name= "richfaces-event.js"),@ResourceDependency(name = "richfaces-base-component.js"), - @ResourceDependency(name = "datatable.js"), @ResourceDependency(name = "table.css") }) + @ResourceDependency(name = "datatable.js"), @ResourceDependency(name = "datatable.ecss") }) public class DataTableRenderer extends AbstractTableRenderer { public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) @@ -78,12 +78,10 @@ } } - @Override public RowHolder createRowHolder(FacesContext context, UIComponent component) { return new RowHolder(context, (UIDataTable)component); } - @Override public void encodeBeforeRows(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException { RowHolder rowHolder = (RowHolder)holder; Row row = rowHolder.getRow(); @@ -94,7 +92,6 @@ } } - @Override public void encodeAfterRows(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException { RowHolder rowHolder = (RowHolder)holder; if(rowHolder.isTbody()) { @@ -150,7 +147,6 @@ return false; } - @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { if (!shouldProceed(component)) { return; @@ -164,7 +160,6 @@ return (component instanceof UIDataTableBase); } - @Override protected Class<? extends UIComponent> getComponentClass() { return UIDataTable.class; } @@ -200,8 +195,6 @@ writer.endElement(HTML.CAPTION_ELEMENT); } - - @Override public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName) { return ((column instanceof org.richfaces.component.UIColumn && "header".equals(tableFacetName)) ? @@ -248,7 +241,6 @@ } } - @Override public boolean containsThead() { return true; } @@ -261,7 +253,6 @@ return false; } - @Override public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase dataTableBase) throws IOException { UIDataTable dataTable = (UIDataTable)dataTableBase; @@ -282,78 +273,76 @@ } public String getTableSkinClass() { - return "rich-table"; + return "rf-dt"; } public String getCaptionSkinClass() { - return "rich-table-caption"; + return "rf-dt-cap"; } - @Override - public String getFirstRowSkinClass() { - return "rich-table-first-row"; - } - - @Override public String getRowSkinClass() { - return "rich-table-row"; + return "rf-dt-r"; } + public String getFirstRowSkinClass() { + return "rf-dt-f-r"; + } + public String getCellSkinClass() { - return "rich-table-cell"; + return "rf-dt-c"; } public String getHeaderSkinClass() { - return "rich-table-header"; + return "rf-dt-h"; } - @Override public String getHeaderFirstSkinClass() { - return "rich-table-header-first"; + return "rf-dt-h-f"; } public String getHeaderCellSkinClass() { - return "rich-table-header-cell"; + return "rf-dt-h-c"; } public String getColumnHeaderSkinClass() { - return "rich-table-subheader"; + return "rf-dt-sh"; } - @Override public String getColumnHeaderFirstSkinClass() { - return "rich-table-subheader-first"; + return "rf-dt-sh-f"; } public String getColumnHeaderCellSkinClass() { - return "rich-table-subheader-cell"; + return "rf-dt-sh-c"; } public String getColumnFooterSkinClass() { - return "rich-table-subfooter"; + return "rf-dt-sf"; } - @Override public String getColumnFooterFirstSkinClass() { - return "rich-table-subfooter-first"; + return "rf-dt-sf-f"; } public String getColumnFooterCellSkinClass() { - return "rich-table-subfooter-cell"; + return "rf-dt-sf-c"; } public String getFooterSkinClass() { - return "rich-table-footer"; + return "rf-dt-f"; } - @Override public String getFooterFirstSkinClass() { - return "rich-table-footer-first"; + return "rf-dt-f-f"; } public String getFooterCellSkinClass() { - return "rich-table-footer-cell"; + return "rf-dt-f-c"; } + + public String getNoDataClass() { + return "rf-dt-nd-c"; + } protected void setupTableStartElement(FacesContext context, UIComponent component) { put(context, component.getClientId(context), CELL_ELEMENT_KEY, HTML.TH_ELEM); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -166,12 +166,10 @@ private enum EncoderVariance { full { - @Override public void encodeStartUpdate(FacesContext context, String targetId) throws IOException { //do nothing } - @Override public void encodeEndUpdate(FacesContext context) throws IOException { //do nothing } @@ -184,14 +182,12 @@ ((OnOffResponseWriter) writer).setSwitchedOn(writerState); } - @Override public void encodeStartUpdate(FacesContext context, String targetId) throws IOException { switchResponseWriter(context, true); context.getPartialViewContext().getPartialResponseWriter().startUpdate(targetId); } - @Override public void encodeEndUpdate(FacesContext context) throws IOException { context.getPartialViewContext().getPartialResponseWriter().endUpdate(); @@ -571,7 +567,6 @@ } } - @Override protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { Map<String, Object> attributes = component.getAttributes(); @@ -581,12 +576,10 @@ getUtils().writeAttribute(writer, HTML.STYLE_ATTRIBUTE, attributes.get("style")); } - @Override public RendererState createRowHolder(FacesContext context, UIComponent component) { return new RendererState(context, (UIDataTableBase) component); } - @Override protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { @@ -603,7 +596,6 @@ table.restoreOrigValue(context); } - @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); @@ -691,7 +683,6 @@ writer.endElement("style"); } - @Override public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase rowHolder) throws IOException { RendererState state = (RendererState) rowHolder; UIDataTableBase table = state.getRow(); @@ -719,8 +710,6 @@ writer.endElement(HTML.TR_ELEMENT); } - - @Override protected void doDecode(FacesContext context, UIComponent component) { super.doDecode(context, component); Map<String, String> map = context.getExternalContext().getRequestParameterMap(); 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 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -49,8 +49,7 @@ private static final String STATE = ":state"; - - @Override + protected void doDecode(FacesContext facesContext, UIComponent component) { UISubTable subTable = (UISubTable)component; @@ -74,7 +73,6 @@ } - @Override public void encodeTableFacets(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { UISubTable subTable = (UISubTable)dataTable; @@ -91,14 +89,12 @@ saveRowStyles(context, subTable.getClientId(context), firstClass, rowClass, cellClass); } - @Override public void encodeTableStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { setupTableStartElement(context, dataTable); UISubTable subTable = (UISubTable)dataTable; encodeTableBodyStart(writer, context, subTable); } - @Override public void encodeTableBodyStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { @@ -111,12 +107,10 @@ encodeStyle(writer, context, dataTable, predefinedStyles); } - @Override public RowHolderBase createRowHolder(FacesContext context, UIComponent component) { return new RowHolder(context, (UISubTable)component); } - @Override public void encodeRow(ResponseWriter writer, FacesContext context, RowHolderBase holder) throws IOException { RowHolder rowHolder = (RowHolder)holder; Row row = rowHolder.getRow(); @@ -129,7 +123,6 @@ encodeRowEnd(writer); } - @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext facesContext, UIComponent component) throws IOException { UISubTable subTable = (UISubTable)component; @@ -161,19 +154,16 @@ writer.endElement(HTML.INPUT_ELEM); } - @Override public boolean containsThead() { return false; } - @Override public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName) { // TODO: implement column header facet return null; } - @Override public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase component) throws IOException { UISubTable subTable = (UISubTable)component; String id = subTable.getClientId(facesContext); @@ -196,90 +186,87 @@ writer.writeText(jsFunction.toScript(), null); writer.endElement(HTML.SCRIPT_ELEM); } + + public String getTableSkinClass() { + return "rf-st"; + } - @Override public String getRowSkinClass() { - return "rich-subtable-row"; + return "rf-st-r"; } - @Override public String getFirstRowSkinClass() { - return "rich-subtable-first-row"; + return "rf-st-f-r"; } public String getHeaderRowSkinClass() { - return "rich-subtable-header-row"; + return "rf-st-h-r"; } public String getHeaderFirstRowSkinClass() { - return "rich-subtable-header-first"; + return "rf-st-h-f-r"; } public String getCellSkinClass() { - return "rich-subtable-cell"; + return "rf-st-c"; } public String getHeaderCellSkinClass() { - return "rich-subtable-header-cell"; + return "rf-st-h-c"; } public String getColumnHeaderCellSkinClass() { - return "rich-subtable-subheader-cell"; + return "rf-st-sh-c"; } public String getColumnHeaderSkinClass() { - return "rich-subtable-subheader"; + return "rf-st-sh"; } + public String getFooterSkinClass() { + return "rf-st-f"; + } + public String getFooterCellSkinClass() { - return "rich-subtable-footer-cell"; + return "rf-st-f-c"; } - public String getFooterSkinClass() { - return "rich-subtable-footer"; - } - public String getFooterFirstRowSkinClass() { - return "rich-subtable-footer-first"; + return "rf-st-f-f"; } public String getColumnFooterCellSkinClass() { - return "rich-subtable-subfooter-cell"; + return "rf-st-sf-c"; } public String getColumnFooterSkinClass() { - return "rich-subtable-subfooter-cell"; + return "rf-st-sf"; } - - public String getTableSkinClass() { - return "rich-subtable"; - } - @Override public String getColumnFooterFirstSkinClass() { - return "rich-subtable-subfooter-first"; + return "rf-st-sf-f"; } - @Override public String getColumnHeaderFirstSkinClass() { - return "rich-subtable-subheader-first"; + return "rf-st-sh-f"; } - @Override public String getFooterFirstSkinClass() { - return "rich-subtable-footer-first"; + return "rf-st-f-f"; } - @Override public String getHeaderFirstSkinClass() { - return "rich-subtable-header-first"; + return "rf-st-h-f"; } - @Override public String getHeaderSkinClass() { - return "rich-subtable-header"; + return "rf-st-h"; } + + public String getNoDataClass() { + return "rf-st-nd-c"; + } protected void setupTableStartElement(FacesContext context, UIComponent component) { put(context, component.getClientId(context), CELL_ELEMENT_KEY, HTML.TD_ELEM); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -23,7 +23,6 @@ package org.richfaces.taglib; -import javax.el.MethodExpression; import javax.faces.view.facelets.ComponentConfig; import javax.faces.view.facelets.ComponentHandler; import javax.faces.view.facelets.FaceletContext; @@ -41,45 +40,63 @@ */ public class DataTableHandler extends ComponentHandler { - private static final DataTableHandlerMetaRule METARULE = new DataTableHandlerMetaRule(); + private static final SortingFilteringRule METARULE = new SortingFilteringRule(); public DataTableHandler(ComponentConfig config) { super(config); } - @Override protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset m = super.createMetaRuleset(type); m.addRule(METARULE); return m; } - static class DataTableHandlerMetaRule extends MetaRule { + static class SortingFilteringRule extends MetaRule { - @Override public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { - if (meta.isTargetInstanceOf(UIDataTable.class) && "sortingListener".equals(name)) { - return new DataTableMapper(attribute); + if(meta.isTargetInstanceOf(UIDataTable.class)) { + + if("sortingListener".equals(name)) { + return new SortingListenerMapper(attribute); + } + + if("filteringListener".equals(name)) { + return new FilteringListenerMapper(attribute); + } } + return null; } - } - static class DataTableMapper extends Metadata { + static final class SortingListenerMapper extends Metadata { private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.SortingEvent.class }; private final TagAttribute attribute; - public DataTableMapper(TagAttribute attribute) { + public SortingListenerMapper(TagAttribute attribute) { this.attribute = attribute; } - @Override public void applyMetadata(FaceletContext ctx, Object instance) { - MethodExpression methodExpression = attribute.getMethodExpression(ctx, null, SIGNATURE); - ((UIDataTable) instance).setSortingListener(methodExpression); + ((UIDataTable) instance).addSortingListener(new MethodExpressionSortingListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE))); } } + + static final class FilteringListenerMapper extends Metadata { + + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.FilteringEvent.class }; + + private final TagAttribute attribute; + + public FilteringListenerMapper(TagAttribute attribute) { + this.attribute = attribute; + } + + public void applyMetadata(FaceletContext ctx, Object instance) { + ((UIDataTable) instance).addFilteringListener(new MethodExpressionFilteringListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE))); + } + } } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java 2010-05-26 15:14:20 UTC (rev 17264) @@ -23,7 +23,6 @@ package org.richfaces.taglib; -import javax.el.MethodExpression; import javax.faces.view.facelets.ComponentConfig; import javax.faces.view.facelets.ComponentHandler; import javax.faces.view.facelets.FaceletContext; @@ -43,11 +42,11 @@ private static final SubTableHandlerMetaRule METARULE = new SubTableHandlerMetaRule(); + public SubTableHandler(ComponentConfig config) { super(config); } - @Override protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset m = super.createMetaRuleset(type); m.addRule(METARULE); @@ -56,7 +55,6 @@ static class SubTableHandlerMetaRule extends MetaRule { - @Override public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { if (meta.isTargetInstanceOf(UISubTable.class) && "toggleListener".equals(name)) { return new SubTableMapper(attribute); @@ -76,10 +74,8 @@ this.attribute = attribute; } - @Override public void applyMetadata(FaceletContext ctx, Object instance) { - MethodExpression methodExpression = attribute.getMethodExpression(ctx, null, SIGNATURE); - ((UISubTable) instance).setToggleListener(methodExpression); + ((UISubTable) instance).addToggleListener((new MethodExpressionToggleListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE)))); } } } Added: 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 (rev 0) +++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss 2010-05-26 15:14:20 UTC (rev 17264) @@ -0,0 +1,227 @@ +.rf-dt{ + background-color:'#{richSkin.tableBackgroundColor}'; + border-collapse:collapse; + border-left-width:'#{richSkin.tableBorderWidth}'; + border-left-style:solid; + border-left-color:'#{richSkin.tableBorderColor}'; + border-top-width:'#{richSkin.tableBorderWidth}'; + border-top-style:solid; + border-top-color:'#{richSkin.tableBorderColor}'; + empty-cells:show; +} + +.rf-dt-cap{ +} + +.rf-dt-r{ +} + +.rf-dt-f-r{ +} + +.rf-dt-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}'; + color:'#{richSkin.generalTextColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + padding:4px; +} + +.rf-dt-nd-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}'; + color:'#{richSkin.generalTextColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + padding:4px; +} + +.rf-dt-h{ +} + +.rf-dt-h-f{ +} + +.rf-dt-h-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.tableHeaderBackgroundColor}'; + color:'#{richSkin.generalTextColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + font-weight:bold; + padding:4px; + text-align:center; +} + +.rf-dt-sh { +} + +.rf-dt-sh-f { +} + +.rf-dt-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-dt-sf{ +} + +.rf-dt-sf-f{ +} + +.rf-dt-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.tableSubfooterBackgroundColor}'; + color:'#{richSkin.generalTextColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + padding:4px; +} + +.rf-dt-th{ + border-bottom-width:'#{richSkin.tableBorderWidth}'; + border-bottom-style:solid; + border-bottom-color:'#{richSkin.tableBorderColor}'; +} + +.rf-dt-f { +} + +.rf-dt-f-f{ +} + +.rf-dt-f-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}'; + color:'#{richSkin.generalTextColor}'; + background-color:'#{richSkin.tableSubfooterBackgroundColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + font-weight:bold; + padding:4px; + text-align:left; +} + +.rf-st{ +} + +.rf-st-r{ +} + +.rf-st-f-r{ +} + +.rf-st-h-r{ +} + +.rf-st-h-f-r{ +} + +.rf-st-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}'; + color:'#{richSkin.generalTextColor}'; + background-color:'#{richSkin.tableBackgroundColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + padding:4px; +} + +.rf-st-h-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}'; + color:'#{richSkin.generalTextColor}'; + background-color:'#{richSkin.tableSubHeaderBackgroundColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + font-weight:bold; + padding:4px; + text-align:left; +} + +.rf-st-sh-c{ +} + +.rf-st-sh{ +} + +.rf-st-f { +} + +.rf-st-f-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.tableSubfooterBackgroundColor}'; + color:'#{richSkin.generalTextColor}'; + font-family:'#{richSkin.generalFamilyFont}'; + font-size:'#{richSkin.generalSizeFont}'; + font-weight:bold; + padding:4px; + text-align:left; +} + +.rf-st-sf-c{ +} + +.rf-st-sf{ +} + +.rf-st-sf-f{ +} + +.rf-st-sh-f{ +} + +.rf-st-f-f{ +} + +.rf-st-h-f{ +} + +.rf-st-h{ +} Deleted: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/table.css =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/table.css 2010-05-26 15:13:39 UTC (rev 17263) +++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/table.css 2010-05-26 15:14:20 UTC (rev 17264) @@ -1,378 +0,0 @@ -.rich-table{ - background-color:#FFFFFF; - border-collapse:collapse; - border-left:1px solid #C0C0C0; - border-top:1px solid #C0C0C0; - empty-cells:show; -} - -.rich-table-row{ -} - -.rich-table-first-row{ -} - -.rich-table-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - padding:4px; -} - -.rich-nodata-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - padding:4px; -} - -.rich-subtable-row{ -} - -.rich-subtable-first-row{ -} - -.rich-subtable-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - background-color: #F0F0F0; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - padding:4px; -} - -.rich-table-header{ -} - -.rich-table-header-first { -} - -.rich-table-header-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - font-weight:bold; - padding:4px; - text-align:center; -} - -.rich-table-subheader{ -} - -.rich-table-subheader-first { -} - -.rich-table-subheader-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#00000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - padding:4px; -} - -.rich-table-subfooter { -} - -.rich-table-subfooter-first { -} - -.rich-table-subfooter-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#00000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - padding:4px; -} - -.rich-table-thead{ - border-bottom:1px solid #C0C0C0; -} - -.rich-table-footer{ -} - -.rich-table-footer-first{ -} - -.rich-table-footer-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - font-weight:bold; - padding:4px; - text-align:left; -} - -/*--------------------------------------------*/ -.rich-subtable-footer { - background-color: #7878B4; -} - -.rich-subtable-footer-cell{ - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - font-weight:bold; - padding:4px; - text-align:left; -} - -.rich-subtable-header-row { - background-color: grey; -} - -.rich-subtable-header-cell { - border-bottom:1px solid #C0C0C0; - border-right:1px solid #C0C0C0; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - font-weight:bold; - padding:4px; - text-align:left; -} - - -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml" > -<u:selector name=".rich-table" > - <u:style name="border-top" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-left" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="background-color" skin="tableBackgroundColor" /> <!--tableBackgroundColor--> - <!-- <u:style name="border-collapse" value="inherit" /> fix RF-535 --> - <u:style name="empty-cells" value="show" /> - <u:style name="border-collapse" value="collapse" /> -</u:selector> - -<u:selector name=".rich-table-cell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="color" skin="generalTextColor"/> <!--generalTextColor--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - -<u:selector name=".rich-subtable-cell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="color" skin="generalTextColor"/> <!--generalTextColor--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - -<u:selector name=".rich-table-header" > - <u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor--> - <u:style name="background-image" > <!--from headerGradientColor to headerBackgroundColor--> - <f:resource f:key="org.richfaces.renderkit.html.GradientA"/> - </u:style> - <u:style name="background-position" value="top left"/> - <u:style name="background-repeat" value="repeat-x"/> -</u:selector> - -<u:selector name=".rich-table-header-continue" > - <u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor--> -</u:selector> - -<u:selector name=".rich-table-headercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="color" skin="headerTextColor"/> <!--headerTextColor--> - <u:style name="text-align" value="center"/> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - -<u:selector name=".rich-table-subheader" > - <u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor--> -</u:selector> - -<u:selector name=".rich-table-thead" > - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> -</u:selector> - -<u:selector name=".rich-table-subheadercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="text-align" value="center"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="color" skin="generalTextColor"/> <!--generalTextColor--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> - <u:style name="white-space" value="nowrap"/> -</u:selector> - -<f:verbatim> - .rich-table-sortable-header { - background-position: right center; - background-repeat: no-repeat; - white-space : nowrap; - } - - .rich-table-cursor-pointer { - cursor: pointer; - } - - .rich-inplace-edit, .rich-inplace-view { - cursor: default; - } - - .rich-sort-icon { - vertical-align: middle; - } -</f:verbatim> - -<u:selector name=".rich-table-footer" > - <u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor--> -</u:selector> - - -<u:selector name=".rich-table-footer-continue" > - <u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor--> -</u:selector> - -<u:selector name=".rich-table-footercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="color" skin="generalTextColor"/> <!--headerTextColor--> - <u:style name="text-align" value="left"/> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - -<u:selector name=".rich-table-subfooter" > - <u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor--> -</u:selector> - -<u:selector name=".rich-table-subfootercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="text-align" value="left"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="color" skin="generalTextColor"/> <!--generalTextColor--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - -<u:selector name=".rich-table-firstrow .rich-table-cell" > -<!-- <u:style name="border-top" value="2px solid"> - <f:verbatim skin="tableBorderColor" /> - </u:style> --> -</u:selector> - -<u:selector name=".rich-subtable-firstrow .rich-subtable-cell" > - <!-- <u:style name="border" value="2px solid #c0c0c0"/>--> -</u:selector> - -<u:selector name=".rich-subtable-header" > - <u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor--> -</u:selector> - -<u:selector name=".rich-subtable-headercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="text-align" value="center"/> - <u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont--> - <u:style name="color" skin="generalTextColor"/> <!--generalTextColor--> - <u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont--> -</u:selector> - - -<u:selector name=".rich-subtable-footer" > - <u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor--> -</u:selector> - -<u:selector name=".rich-subtable-footercell" > - <u:style name="border-right" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="border-bottom" value="solid"> <!--tableBorderColor--> - <f:verbatim skin="tableBorderWidth" /> - <f:verbatim skin="tableBorderColor" /> - </u:style> - <u:style name="padding" value="4px 4px 4px 4px"/> - <u:style name="text-align" value="left"/> -</u:selector> - -<u:selector name=".rich-sort-asc"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc"/> - </u:style> -</u:selector> -<u:selector name=".rich-sort-desc"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortDesc"/> - </u:style> -</u:selector> - - -</f:template>