[richfaces-svn-commits] JBoss Rich Faces SVN: r19687 - in branches/RF-7817/ui/iteration: ui and 4 other directories.

Author: nbelaevski Date: 2010-10-27 10:47:25 -0400 (Wed, 27 Oct 2010) New Revision: 19687 Modified: branches/RF-7817/ui/iteration/api/pom.xml branches/RF-7817/ui/iteration/ui/pom.xml branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss branches/RF-7817/ui/iteration/ui/src/main/templates/datascroller.template.xml branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java Log: Merged revisions 19156-19157,19159-19160,19176,19186-19187,19190,19194,19196,19199,19203-19204,19231-19234,19248-19249,19255-19256,19258-19262,19276,19279-19281,19283,19285,19291-19299,19307,19312,19315,19318-19319,19325,19341-19342,19345-19351,19353-19355,19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430-19431,19434-19441,19443-19444,19446,19468,19470,19477,19491,19498-19499,19501,19504,19506-19507,19517-19519,19525,19542-19543,19548,19550,19555,19557,19560-19561,19565-19566,19571-19573,19582-19585,19592-19593,19599,19601-19602,19613,19646,19657-19659,19665,19671-19674 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk Modified: branches/RF-7817/ui/iteration/api/pom.xml =================================================================== --- branches/RF-7817/ui/iteration/api/pom.xml 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/api/pom.xml 2010-10-27 14:47:25 UTC (rev 19687) @@ -34,6 +34,14 @@ <name>Richfaces UI Components: Iteration API</name> <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.richfaces.ui.core</groupId> Modified: branches/RF-7817/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-7817/ui/iteration/ui/pom.xml 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/pom.xml 2010-10-27 14:47:25 UTC (rev 19687) @@ -53,9 +53,12 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> </plugin> - </plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> </build> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/i... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -54,16 +54,13 @@ public void begin(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) throws IOException { - AbstractDataGrid dataGrid = (AbstractDataGrid)component; - String clientId = dataGrid.getClientId(context) + ":h"; + String clientId = component.getClientId(context) + ":h"; boolean partial = (Boolean)(Boolean)params[0]; if(partial) { context.getPartialViewContext().getPartialResponseWriter().startUpdate(clientId); } - int columns = dataGrid.getColumns(); - writer.startElement(HtmlConstants.THEAD_ELEMENT, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId , null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-thead", null); @@ -71,7 +68,11 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-h", null); writer.startElement(HtmlConstants.TH_ELEM, component); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-h-c", null); - writer.writeAttribute(HtmlConstants.COLSPAN_ATTRIBUTE, columns, null); + + int columns = (Integer)component.getAttributes().get("columns"); + if(columns != Integer.MIN_VALUE) { + writer.writeAttribute(HtmlConstants.COLSPAN_ATTRIBUTE, columns, null); + } } public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) @@ -92,10 +93,8 @@ public void begin(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) throws IOException { - AbstractDataGrid dataGrid = (AbstractDataGrid)component; - String clientId = dataGrid.getClientId(context) + ":f"; - - int columns = dataGrid.getColumns(); + String clientId = component.getClientId(context) + ":f"; + boolean partial = (Boolean)(Boolean)params[0]; if(partial) { context.getPartialViewContext().getPartialResponseWriter().startUpdate(clientId); @@ -108,7 +107,11 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-f", null); writer.startElement(HtmlConstants.TD_ELEM, component); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-f-c", null); - writer.writeAttribute(HtmlConstants.COLSPAN_ATTRIBUTE, columns, null); + + int columns = (Integer)component.getAttributes().get("columns"); + if(columns != Integer.MIN_VALUE) { + writer.writeAttribute(HtmlConstants.COLSPAN_ATTRIBUTE, columns, null); + } } public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) @@ -144,6 +147,11 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-nd", null); writer.startElement(HtmlConstants.TD_ELEM, component); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-nd-c", null); + + int columns = (Integer)component.getAttributes().get("columns"); + if(columns != Integer.MIN_VALUE) { + writer.writeAttribute(HtmlConstants.COLSPAN_ATTRIBUTE, columns, null); + } } public void end(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) @@ -165,10 +173,10 @@ if (processCell != 0) { writer.endElement(HtmlConstants.TR_ELEMENT); rowHolder.resetProcessCell(); - rowHolder.nextRow(); } writer.startElement(HtmlConstants.TR_ELEMENT, dataGrid); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-r", null); + rowHolder.nextRow(); } writer.startElement(HtmlConstants.TD_ELEM, dataGrid); @@ -283,10 +291,8 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg-c", null); writer.endElement(HtmlConstants.TD_ELEM); } + writer.endElement(HtmlConstants.TR_ELEMENT); } - - writer.endElement(HtmlConstants.TR_ELEMENT); - } public DataVisitResult process(FacesContext facesContext, Object rowKey, Object argument) { Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -217,10 +217,10 @@ if (isCurrentPage) { out.startElement(HtmlConstants.SPAN_ELEM, component); - out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl rf-ds-cur " + styleClass, null); + out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn rf-ds-act " + styleClass, null); } else { out.startElement(HtmlConstants.A_ELEMENT, component); - out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl " + styleClass, null); + out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn " + styleClass, null); out.writeAttribute(HtmlConstants.HREF_ATTR, "javascript:void(0);", null); } Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -322,7 +322,7 @@ } public String getFirstRowSkinClass() { - return "rf-dt-f-r"; + return "rf-dt-fst-r"; } public String getCellSkinClass() { @@ -330,55 +330,55 @@ } public String getHeaderSkinClass() { - return "rf-dt-h"; + return "rf-dt-hdr"; } public String getHeaderFirstSkinClass() { - return "rf-dt-h-f"; + return "rf-dt-hdr-fst"; } public String getHeaderCellSkinClass() { - return "rf-dt-h-c"; + return "rf-dt-hdr-c"; } public String getColumnHeaderSkinClass() { - return "rf-dt-sh"; + return "rf-dt-shdr"; } public String getColumnHeaderFirstSkinClass() { - return "rf-dt-sh-f"; + return "rf-dt-shdr-fst"; } public String getColumnHeaderCellSkinClass() { - return "rf-dt-sh-c"; + return "rf-dt-shdr-c"; } public String getColumnFooterSkinClass() { - return "rf-dt-sf"; + return "rf-dt-sftr"; } public String getColumnFooterFirstSkinClass() { - return "rf-dt-sf-f"; + return "rf-dt-sftr-fst"; } public String getColumnFooterCellSkinClass() { - return "rf-dt-sf-c"; + return "rf-dt-sftr-c"; } public String getFooterSkinClass() { - return "rf-dt-f"; + return "rf-dt-ftr"; } public String getFooterFirstSkinClass() { - return "rf-dt-f-f"; + return "rf-dt-ftr-fst"; } public String getFooterCellSkinClass() { - return "rf-dt-f-c"; + return "rf-dt-ftr-c"; } public String getNoDataClass() { - return "rf-dt-nd-c"; + return "rf-dt-ndt"; } protected void setupTableStartElement(FacesContext context, UIComponent component) { Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -21,6 +21,8 @@ */ package org.richfaces.renderkit; +import static org.richfaces.renderkit.RenderKitUtils.addToScriptHash; +import static org.richfaces.renderkit.RenderKitUtils.renderAttribute; import static org.richfaces.renderkit.util.AjaxRendererUtils.AJAX_FUNCTION_NAME; import static org.richfaces.renderkit.util.AjaxRendererUtils.buildAjaxFunction; import static org.richfaces.renderkit.util.AjaxRendererUtils.buildEventOptions; @@ -56,8 +58,7 @@ import org.richfaces.component.util.HtmlUtil; import org.richfaces.context.OnOffResponseWriter; import org.richfaces.model.SelectionMode; -import org.richfaces.renderkit.util.RendererUtils; -import org.richfaces.renderkit.util.RendererUtils.ScriptHashVariableWrapper; +import org.richfaces.renderkit.RenderKitUtils.ScriptHashVariableWrapper; /** * @author Konstantin Mishin @@ -221,7 +222,7 @@ if (column.isRendered()) { writer.startElement(HtmlConstants.TD_ELEM, column); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-efc rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ftr-c-emp rf-edt-c-" + column.getId(), null); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.TD_ELEM); @@ -236,20 +237,21 @@ writer.startElement(HtmlConstants.TD_ELEM, column); if ("header".equals(facetName)) { writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsh rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-cntr rf-edt-c-" + column.getId(), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rs", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.DIV_ELEM); } writer.startElement(HtmlConstants.DIV_ELEM, column); - writer - .writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + "c", - "rf-edt-cw-" + column.getId(), (String) column.getAttributes().get(classAttribute)), - null); + writer.writeAttribute( + HtmlConstants.CLASS_ATTRIBUTE, + HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + facetName.charAt(3) + "r-c", "rf-edt-c-" + + column.getId(), (String) column.getAttributes().get(classAttribute)), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + "cc", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + facetName.charAt(3) + + "r-c-cnt", null); UIComponent facet = column.getFacet(facetName); if (facet != null && facet.isRendered()) { facet.encodeAll(context); @@ -267,8 +269,8 @@ boolean columnFacetPresent = table.isColumnFacetPresent(name); if (columnFacetPresent || "footer".equals(name)) { writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0), - (String) table.getAttributes().get(name + "Class")), null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0) + + name.charAt(3) + "r", (String) table.getAttributes().get(name + "Class")), null); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); @@ -281,7 +283,7 @@ if (columns.hasNext()) { writer.startElement(HtmlConstants.TD_ELEM, table); if (PartName.frozen.equals(partName) && "footer".equals(name)) { - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-fa", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ftr-fzn", null); } writer.startElement(HtmlConstants.DIV_ELEM, table); if (PartName.frozen.equals(partName)) { @@ -291,8 +293,8 @@ } } else { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" - + ("footer".equals(name) ? "f" : "") + "p rf-edt-pw", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt" + + ("footer".equals(name) ? " rf-edt-ftr-cnt" : ""), null); } String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0); @@ -343,7 +345,7 @@ writer.startElement(HtmlConstants.DIV_ELEM, table); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-th", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tbl-hdr", null); header.encodeAll(context); writer.endElement(HtmlConstants.DIV_ELEM); @@ -377,7 +379,7 @@ table.getAttributes().put("clientFirst", 0); writer.startElement(HtmlConstants.DIV_ELEM, table); writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-s", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-spcr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); @@ -390,7 +392,7 @@ PartName partName = state.nextPart().getName(); if (PartName.normal.equals(partName)) { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":body", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-p rf-edt-pw", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt", null); } String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); @@ -432,7 +434,7 @@ writer.startElement(HtmlConstants.DIV_ELEM, table); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tf", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tbl-ftr", null); footer.encodeAll(context); writer.endElement(HtmlConstants.DIV_ELEM); @@ -580,7 +582,7 @@ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context), null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt", (String) attributes.get("styleClass")), null); - getUtils().writeAttribute(writer, HtmlConstants.STYLE_ATTRIBUTE, attributes.get("style")); + renderAttribute(context, HtmlConstants.STYLE_ATTRIBUTE, attributes.get("style")); } public RendererState createRowHolder(FacesContext context, UIComponent component, Object[] options) { @@ -605,13 +607,9 @@ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - writer.startElement(HtmlConstants.DIV_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-d", null); - writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ro", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord", null); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HtmlConstants.TR_ELEMENT, component); @@ -628,8 +626,12 @@ } writer.endElement(HtmlConstants.TABLE_ELEMENT); writer.startElement(HtmlConstants.DIV_ELEM, component); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); + writer.endElement(HtmlConstants.DIV_ELEM); + writer.startElement(HtmlConstants.DIV_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rom", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.INPUT_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null); @@ -644,14 +646,13 @@ ajaxFunction.addParameter(eventOptions); Map<String, Object> attributes = component.getAttributes(); Map<String, Object> options = new HashMap<String, Object>(); - RendererUtils utils = getUtils(); - utils.addToScriptHash(options, "parameters", parameters); - utils.addToScriptHash(options, "selectionMode", attributes.get("selectionMode"), - SelectionMode.multiple.toString()); - utils.addToScriptHash(options, "onbeforeselectionchange", RenderKitUtils.getAttributeAndBehaviorsValue(context, - component, EVENT_ATTRIBUTES.get("onbeforeselectionchange")), null, ScriptHashVariableWrapper.EVENT_HANDLER); - utils.addToScriptHash(options, "onselectionchange", RenderKitUtils.getAttributeAndBehaviorsValue(context, - component, EVENT_ATTRIBUTES.get("onselectionchange")), null, ScriptHashVariableWrapper.EVENT_HANDLER); + addToScriptHash(options, "parameters", parameters); + addToScriptHash(options, "selectionMode", attributes.get("selectionMode"), + SelectionMode.multiple); + addToScriptHash(options, "onbeforeselectionchange", RenderKitUtils.getAttributeAndBehaviorsValue(context, + component, EVENT_ATTRIBUTES.get("onbeforeselectionchange")), null, ScriptHashVariableWrapper.eventHandler); + addToScriptHash(options, "onselectionchange", RenderKitUtils.getAttributeAndBehaviorsValue(context, + component, EVENT_ATTRIBUTES.get("onselectionchange")), null, ScriptHashVariableWrapper.eventHandler); StringBuilder builder = new StringBuilder("new RichFaces.ExtendedDataTable('"); builder.append(component.getClientId(context)).append("', ").append(getRowCount(component)) .append(", function(event, parameters) {").append(ajaxFunction.toScript()).append(";}"); @@ -659,7 +660,7 @@ builder.append(",").append(ScriptUtils.toScript(options)); } builder.append(");"); - utils.writeScript(context, component, builder.toString()); + getUtils().writeScript(context, component, builder.toString()); writer.endElement(HtmlConstants.DIV_ELEM); } @@ -682,7 +683,7 @@ UIDataTableBase table = state.getRow(); writer.startElement("style", table); writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/css", null); - writer.writeText(".rf-edt-pw {", null); // TODO getNormalizedId(context, state.getGrid()) + writer.writeText("div.rf-edt-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) writer.writeText("width: 100%;", "width"); writer.writeText("}", null); Iterator<UIComponent> columns = table.columns(); @@ -694,7 +695,7 @@ id = column.getId(); } String width = getColumnWidth(column); - writer.writeText(".rf-edt-cw-" + id + " {", "width"); // TODO getNormalizedId(context, + writer.writeText(".rf-edt-c-" + id + " {", "width"); // TODO getNormalizedId(context, writer.writeText("width: " + width + ";", "width"); writer.writeText("}", "width"); } @@ -709,19 +710,19 @@ StringBuilder builder = new StringBuilder(); Collection<Object> selection = table.getSelection(); if (selection != null && selection.contains(table.getRowKey())) { - builder.append("rf-edt-r-s"); + builder.append("rf-edt-r-sel"); } if (table.getRowKey().equals(table.getAttributes().get("activeRowKey"))) { if (builder.length() > 0) { builder.append(' '); } - builder.append("rf-edt-r-a"); + builder.append("rf-edt-r-act"); } if (table.getRowKey().equals(table.getAttributes().get("shiftRowKey"))) { if (builder.length() > 0) { builder.append(' '); } - builder.append("rf-edt-r-t"); + builder.append("rf-edt-r-sht"); } if (builder.length() > 0) { writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, builder.toString(), null); @@ -736,10 +737,10 @@ if (column.isRendered()) { writer.startElement(HtmlConstants.TD_ELEM, table); writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-c-" + column.getId(), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cc", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c-cnt", null); renderChildren(facesContext, column); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.DIV_ELEM); Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -96,11 +96,11 @@ writer.startElement(HtmlConstants.LI_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - rendererUtils.writeAttribute(writer, HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context)); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context), null); } - rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), itemClass)); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), itemClass), null); renderHandlers(context, sequence); rendererUtils.encodeChildren(context, sequence); writer.endElement(HtmlConstants.LI_ELEMENT); @@ -129,11 +129,11 @@ writer.startElement(HtmlConstants.DT_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - rendererUtils.writeAttribute(writer, HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context) + ".dt"); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context) + ".dt", null); } - rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-t")); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-trm"), null); termFacet.encodeAll(context); writer.endElement(HtmlConstants.DT_ELEMENT); } @@ -141,11 +141,11 @@ writer.startElement(HtmlConstants.DD_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - rendererUtils.writeAttribute(writer, HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context)); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context), null); } - rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-d")); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-dfn"), null); renderHandlers(context, sequence); rendererUtils.encodeChildren(context, sequence); writer.endElement(HtmlConstants.DD_ELEMENT); @@ -191,9 +191,9 @@ } - private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-i"); + private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-itm"); - private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-i"); + private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-itm"); private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder(); Modified: branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -298,15 +298,15 @@ } public String getFirstRowSkinClass() { - return "rf-st-f-r"; + return "rf-st-fst-r"; } public String getHeaderRowSkinClass() { - return "rf-st-h-r"; + return "rf-st-hdr-r"; } public String getHeaderFirstRowSkinClass() { - return "rf-st-h-f-r"; + return "rf-st-hdr-fst-r"; } public String getCellSkinClass() { @@ -314,55 +314,55 @@ } public String getHeaderCellSkinClass() { - return "rf-st-h-c"; + return "rf-st-hdr-c"; } public String getColumnHeaderCellSkinClass() { - return "rf-st-sh-c"; + return "rf-st-shdr-c"; } public String getColumnHeaderSkinClass() { - return "rf-st-sh"; + return "rf-st-shdr"; } public String getFooterSkinClass() { - return "rf-st-f"; + return "rf-st-ftr"; } public String getFooterCellSkinClass() { - return "rf-st-f-c"; + return "rf-st-ftr-c"; } public String getFooterFirstRowSkinClass() { - return "rf-st-f-f"; + return "rf-st-ftr-fst"; } public String getColumnFooterCellSkinClass() { - return "rf-st-sf-c"; + return "rf-st-sftr-c"; } public String getColumnFooterSkinClass() { - return "rf-st-sf"; + return "rf-st-sftr"; } public String getColumnFooterFirstSkinClass() { - return "rf-st-sf-f"; + return "rf-st-sftr-fst"; } public String getColumnHeaderFirstSkinClass() { - return "rf-st-sh-f"; + return "rf-st-shdr-fst"; } public String getFooterFirstSkinClass() { - return "rf-st-f-f"; + return "rf-st-ftr-fst"; } public String getHeaderFirstSkinClass() { - return "rf-st-h-f"; + return "rf-st-hdr-fst"; } public String getHeaderSkinClass() { - return "rf-st-h"; + return "rf-st-hdr"; } public String getNoDataClass() { Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-10-27 14:47:25 UTC (rev 19687) @@ -7,7 +7,7 @@ background:'#{richSkin.tableBackgroundColor}'; } -a.rf-ds-dtl { +a.rf-ds-nmb-btn { color: '#{richSkin.generalTextColor}'; } @@ -50,15 +50,15 @@ font-weight: normal; } -.rf-ds-l { +.rf-ds-lft { margin-right: 1px; } -.rf-ds-r { +.rf-ds-rgh { margin-left: 1px; } -.rf-ds-dtl { +.rf-ds-nmb-btn { cursor: pointer; width: 2em; text-align: center; @@ -88,7 +88,7 @@ } -.rf-ds-over { +.rf-ds-hov { border-width : 1px; border-style: solid; border-color: '#{richSkin.tableBorderColor}'; @@ -105,7 +105,7 @@ background: '#{richSkin.additionalBackgroundColor}'; } -.rf-ds-cur { +.rf-ds-act { cursor: default; font-weight: bold; border-width: 1px; Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-10-27 14:47:25 UTC (rev 19687) @@ -69,25 +69,25 @@ if(buttons) { var leftButtons = buttons.left; - css.mouseover = "rf-ds-btn rf-ds-l"; - css.mouseup = "rf-ds-btn rf-ds-l"; - css.mouseout = "rf-ds-btn rf-ds-l"; - css.mousedown = "rf-ds-btn rf-ds-l rf-ds-over"; + css.mouseover = "rf-ds-btn rf-ds-lft"; + css.mouseup = "rf-ds-btn rf-ds-lft"; + css.mouseout = "rf-ds-btn rf-ds-lft"; + css.mousedown = "rf-ds-btn rf-ds-lft rf-ds-hov"; initButtons(leftButtons,css, this); var rightButtons = buttons.right; - css.mouseover = "rf-ds-btn rf-ds-r"; - css.mouseup = "rf-ds-btn rf-ds-r"; - css.mouseout = "rf-ds-btn rf-ds-r"; - css.mousedown = "rf-ds-btn rf-ds-r rf-ds-over"; + css.mouseover = "rf-ds-btn rf-ds-rgh"; + css.mouseup = "rf-ds-btn rf-ds-rgh"; + css.mouseout = "rf-ds-btn rf-ds-rgh"; + css.mousedown = "rf-ds-btn rf-ds-rgh rf-ds-hov"; initButtons(rightButtons,css, this); } if(digitals) { - css.mouseover= "rf-ds-dtl rf-ds-over"; - css.mouseup= "rf-ds-dtl rf-ds-over"; - css.mouseout = "rf-ds-dtl"; - css.mousedown="rf-ds-dtl rf-ds-press"; + css.mouseover= "rf-ds-nmb-btn rf-ds-hov"; + css.mouseup= "rf-ds-nmb-btn rf-ds-hov"; + css.mouseout = "rf-ds-nmb-btn"; + css.mousedown="rf-ds-nmb-btn rf-ds-press"; initButtons(digitals, css,this); } }; Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss 2010-10-27 14:47:25 UTC (rev 19687) @@ -16,7 +16,7 @@ .rf-dt-r{ } -.rf-dt-f-r{ +.rf-dt-fst-r{ } .rf-dt-c{ @@ -32,7 +32,7 @@ padding:4px; } -.rf-dt-nd-c{ +.rf-dt-ndt{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -45,13 +45,13 @@ padding:4px; } -.rf-dt-h{ +.rf-dt-hdr{ } -.rf-dt-h-f{ +.rf-dt-hdr-fst{ } -.rf-dt-h-c{ +.rf-dt-hdr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -69,13 +69,13 @@ text-align:center; } -.rf-dt-sh { +.rf-dt-shdr { } -.rf-dt-sh-f { +.rf-dt-shdr-fst { } -.rf-dt-sh-c{ +.rf-dt-shdr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -93,13 +93,13 @@ text-align:center; } -.rf-dt-sf{ +.rf-dt-sftr{ } -.rf-dt-sf-f{ +.rf-dt-sftr-fst{ } -.rf-dt-sf-c{ +.rf-dt-sftr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -123,14 +123,14 @@ border-bottom-color:'#{richSkin.tableBorderColor}'; } -.rf-dt-f { +.rf-dt-ftr { } -.rf-dt-f-f{ +.rf-dt-ftr-fst{ } -.rf-dt-f-c{ +.rf-dt-ftr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -152,13 +152,13 @@ .rf-st-r{ } -.rf-st-f-r{ +.rf-st-fst-r{ } -.rf-st-h-r{ +.rf-st-hdr-r{ } -.rf-st-h-f-r{ +.rf-st-hdr-fst-r{ } .rf-st-c{ @@ -175,7 +175,7 @@ padding:4px; } -.rf-st-h-c{ +.rf-st-hdr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -191,7 +191,7 @@ text-align:left; } -.rf-st-sh-c{ +.rf-st-shdr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -206,13 +206,13 @@ padding:4px; } -.rf-st-sh{ +.rf-st-shdr{ } -.rf-st-f { +.rf-st-ftr { } -.rf-st-f-c{ +.rf-st-ftr-c{ border-bottom-width:3px; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -228,7 +228,7 @@ text-align:left; } -.rf-st-sf-c{ +.rf-st-sftr-c{ border-bottom-width:'#{richSkin.tableBorderWidth}'; border-bottom-style:solid; border-bottom-color:'#{richSkin.tableBorderColor}'; @@ -242,22 +242,22 @@ padding:4px; } -.rf-st-sf{ +.rf-st-sftr{ } -.rf-st-sf-f{ +.rf-st-sftr-fst{ } -.rf-st-sh-f{ +.rf-st-shdr-fst{ } -.rf-st-f-f{ +.rf-st-ftr-fst{ } -.rf-st-h-f{ +.rf-st-hdr-fst{ } -.rf-st-h{ +.rf-st-hdr{ } Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-10-27 14:47:25 UTC (rev 19687) @@ -25,11 +25,11 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-h, .rf-edt-th { +.rf-edt-hdr, .rf-edt-tbl-hdr { background-image : "url(#{resource['org.richfaces.images:colHdrGrad.png']})"; } -.rf-edt-th { +.rf-edt-tbl-hdr { border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } @@ -39,36 +39,36 @@ width: 100%; } -.rf-edt-s { +.rf-edt-spcr { height: 0px; font-size: 0px; /*for IE7 only*/ } -.rf-edt-f, .rf-edt-tf { +.rf-edt-ftr, .rf-edt-tbl-ftr { border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; background-color: '#{richSkin.tableFooterBackgroundColor}'; } -.rf-edt-fa { +.rf-edt-ftr-fzn { vertical-align: top; } -.rf-edt-p { +.rf-edt-cnt { overflow: hidden; } -.rf-edt-fp { +div.rf-edt-ftr-cnt { overflow-x: auto; overflow-y: visible; } -.rf-edt-rsh { +.rf-edt-rsz-cntr { left : 0px; position: relative; height: 0px; } -.rf-edt-rs { +.rf-edt-rsz { background-image: url("#{resource['spacer.gif']}"); cursor: e-resize; height: 20px; /*TODO*/ @@ -78,7 +78,7 @@ width: 6px; } -.rf-edt-d { +.rf-edt-rsz-mkr { cursor: e-resize; position: absolute; border-left: '1px dotted #{richSkin.generalTextColor}'; @@ -87,13 +87,13 @@ display: none; } -.rf-edt-ro { +.rf-edt-rord { position: absolute; border-collapse: collapse; display: none; } -.rf-edt-ro th { +.rf-edt-rord th { width: 20px; height: 5px; font-size: 1px; @@ -101,7 +101,7 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-ro td { +.rf-edt-rord td { width: 20px; height: 5px; font-size: 1px; @@ -109,39 +109,39 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-c, .rf-edt-hc, .rf-edt-fc { +.rf-edt-c, .rf-edt-hdr-c, .rf-edt-ftr-c { height: 20px; overflow: hidden; border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-efc { +.rf-edt-ftr-c-emp { border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; height: 1px; } -.rf-edt-cc, .rf-edt-hcc, .rf-edt-fcc, .rf-edt-th, .rf-edt-tf { +.rf-edt-c-cnt, .rf-edt-hdr-c-cnt, .rf-edt-ftr-c-cnt, .rf-edt-tbl-hdr, .rf-edt-tbl-ftr { padding: 3px 7px; white-space: nowrap; font-family: '#{richSkin.generalFamilyFont}'; font-size: '#{richSkin.generalSizeFont}'; } -.rf-edt-hcc, .rf-edt-th, .rf-edt-fcc, .rf-edt-tf { +.rf-edt-hdr-c-cnt, .rf-edt-tbl-hdr, .rf-edt-ftr-c-cnt, .rf-edt-tbl-ftr { font-weight: bold; text-align: center; } -.rf-edt-hcc, .rf-edt-th { +.rf-edt-hdr-c-cnt, .rf-edt-tbl-hdr { color: '#{richSkin.tableHeaderTextColor}'; } -.rf-edt-cc, .rf-edt-fcc, .rf-edt-tf { +.rf-edt-c-cnt, .rf-edt-ftr-c-cnt, .rf-edt-tbl-ftr { color: '#{richSkin.generalTextColor}'; } -.rf-edt-rom { +.rf-edt-rord-mkr { position: absolute; height: 9px; font-size: 9px; @@ -150,10 +150,10 @@ display: none; } -.rf-edt-r-s { +.rf-edt-r-sel { background-color: '#{richSkin.additionalBackgroundColor}'; /*TODO Probably use other skin property.*/ } -.rf-edt-r-a { +.rf-edt-r-act { font-weight: bold; /*TODO Probably use other property.*/ } \ No newline at end of file Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-10-27 14:47:25 UTC (rev 19687) @@ -122,22 +122,21 @@ }; richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, options) { - var WIDTH_CLASS_NAME_BASE = "rf-edt-cw-"; + var WIDTH_CLASS_NAME_BASE = "rf-edt-c-"; var MIN_WIDTH = 20; options = options || {}; var ranges = new richfaces.utils.Ranges(); var element = document.getElementById(id); - var bodyElement, contentElement, spacerElement, dataTableElement, rows, rowHeight, parts, tbodies, shiftIndex, - activeIndex, selectionFlag; + var bodyElement, contentElement, spacerElement, dataTableElement, normalPartStyle, rows, rowHeight, parts, tbodies, + shiftIndex, activeIndex, selectionFlag; var dragElement = document.getElementById(id + ":d"); var reorderElement = document.getElementById(id + ":r"); var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); var selectionInput = document.getElementById(id + ":si"); - var normalPartStyle = richfaces.utils.getCSSRule(".rf-edt-pw").style; - var header = jQuery(element).children(".rf-edt-h"); - var resizerHolders = header.find(".rf-edt-rsh"); + var header = jQuery(element).children(".rf-edt-hdr"); + var resizerHolders = header.find(".rf-edt-rsz-cntr"); var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader"); var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant; @@ -168,11 +167,10 @@ normalPartStyle.width = width + "px"; } normalPartStyle.display = "block"; + scrollElement.style.overflowX = ""; if (scrollElement.clientWidth < scrollElement.scrollWidth && scrollElement.scrollHeight == scrollElement.offsetHeight) { scrollElement.style.overflowX = "scroll"; - } else { - scrollElement.style.overflowX = ""; } var delta = scrollElement.firstChild.offsetHeight - scrollElement.clientHeight; if (delta) { @@ -183,7 +181,7 @@ } var height = element.clientHeight; var el = element.firstChild; - while (el) { + while (el && (!el.nodeName || el.nodeName.toUpperCase() != "TABLE")) { if(el.nodeName && el.nodeName.toUpperCase() == "DIV" && el != bodyElement) { height -= el.offsetHeight; } @@ -244,6 +242,7 @@ var initialize = function() { bodyElement = document.getElementById(id + ":b"); bodyElement.tabIndex = -1; //TODO don't use tabIndex. + normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var bodyJQuery = jQuery(bodyElement); contentElement = bodyJQuery.children("div:first")[0]; if (contentElement) { @@ -265,7 +264,7 @@ spacerElement = null; dataTableElement = null; } - parts = jQuery(element).find(".rf-edt-p"); + parts = jQuery(element).find(".rf-edt-cnt, .rf-edt-ftr-cnt"); updateLayout(); updateScrollPosition(); //TODO Restore horizontal scroll position }; @@ -319,7 +318,7 @@ var beginReorder = function(event) { idOfReorderingColumn = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; jQuery(document).bind("mousemove", reorder); - header.find(".rf-edt-hc").bind("mouseover", overReorder); + header.find(".rf-edt-hdr-c").bind("mouseover", overReorder); jQuery(document).one("mouseup", cancelReorder); return false; }; @@ -345,7 +344,7 @@ jQuery(this).unbind("mouseout", outReorder); var id = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; var colunmsOrder = ""; - header.find(".rf-edt-hc").each(function() { + header.find(".rf-edt-hdr-c").each(function() { var i = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == id) { colunmsOrder += idOfReorderingColumn + "," + id + ","; @@ -358,7 +357,7 @@ var cancelReorder = function(event) { jQuery(document).unbind("mousemove", reorder); - header.find(".rf-edt-hc").unbind("mouseover", overReorder); + header.find(".rf-edt-hdr-c").unbind("mouseover", overReorder); reorderElement.style.display = "none"; }; @@ -395,34 +394,34 @@ var selectRow = function(index) { ranges.add(index); for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[index]).addClass("rf-edt-r-s"); + jQuery(tbodies[i].rows[index]).addClass("rf-edt-r-sel"); } } var deselectRow = function (index) { ranges.remove(index); for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[index]).removeClass("rf-edt-r-s"); + jQuery(tbodies[i].rows[index]).removeClass("rf-edt-r-sel"); } } var setActiveRow = function (index) { if(typeof activeIndex == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[activeIndex]).removeClass("rf-edt-r-a"); + jQuery(tbodies[i].rows[activeIndex]).removeClass("rf-edt-r-act"); } } activeIndex = index; for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[activeIndex]).addClass("rf-edt-r-a"); + jQuery(tbodies[i].rows[activeIndex]).addClass("rf-edt-r-act"); } } var resetShiftRow = function () { if(typeof shiftIndex == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[shiftIndex]).removeClass("rf-edt-r-t"); + jQuery(tbodies[i].rows[shiftIndex]).removeClass("rf-edt-r-sht"); } } @@ -434,7 +433,7 @@ shiftIndex = index; if(typeof index == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[shiftIndex]).addClass("rf-edt-r-t"); + jQuery(tbodies[i].rows[shiftIndex]).addClass("rf-edt-r-sht"); } } } @@ -448,13 +447,13 @@ var rows = tbodies[0].rows; for (var i = 0; i < rows.length; i++) { var row = jQuery(rows[i]); - if (row.hasClass("rf-edt-r-s")) { + if (row.hasClass("rf-edt-r-sel")) { ranges.add(row[0].rowIndex) } - if (row.hasClass("rf-edt-r-a")) { + if (row.hasClass("rf-edt-r-act")) { activeIndex = row[0].rowIndex; } - if (row.hasClass("rf-edt-r-t")) { + if (row.hasClass("rf-edt-r-sht")) { shiftIndex = row[0].rowIndex; } } @@ -616,8 +615,8 @@ jQuery(window).bind("resize", updateLayout); jQuery(scrollElement).bind("scroll", updateScrollPosition); var bindHeaderHandlers = function () { - header.find(".rf-edt-rs").bind("mousedown", beginResize); - header.find(".rf-edt-hc").bind("mousedown", beginReorder); + header.find(".rf-edt-rsz").bind("mousedown", beginResize); + header.find(".rf-edt-hdr-c").bind("mousedown", beginReorder); } bindHeaderHandlers(); jQuery(element).bind("rich:onajaxcomplete", ajaxComplete); @@ -625,10 +624,14 @@ //JS API element["richfaces"] = element["richfaces"] || {}; // TODO ExtendedDataTable should extend richfaces.BaseComponent instead of using it. element.richfaces.component = this; + this.destroy = function() { + element.richfaces.component = null; + jQuery(window).unbind("resize", updateLayout); + } this.getColumnPosition = function(id) { var position; - var headers = header.find(".rf-edt-hc"); + var headers = header.find(".rf-edt-hdr-c"); for (var i = 0; i < headers.length; i++) { if (id == headers[i].className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]) { position = i; @@ -640,7 +643,7 @@ this.setColumnPosition = function(id, position) { var colunmsOrder = ""; var before; - var headers = header.find(".rf-edt-hc"); + var headers = header.find(".rf-edt-hdr-c"); for (var i = 0; i < headers.length; i++) { var current = headers[i].className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == position) { Modified: branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-10-27 14:47:25 UTC (rev 19687) @@ -1,4 +1,4 @@ -.rf-ulst-i, .rf-olst-i, .rf-dlst-t, .rf-dlst-d { +.rf-ulst-itm, .rf-olst-itm, .rf-dlst-trm, .rf-dlst-dfn { font-size: '#{richSkin.generalSizeFont}'; font-family: '#{richSkin.generalFamilyFont}'; color: '#{richSkin.generalTextColor}'; Modified: branches/RF-7817/ui/iteration/ui/src/main/templates/datascroller.template.xml =================================================================== --- branches/RF-7817/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-10-27 14:47:25 UTC (rev 19687) @@ -44,8 +44,8 @@ <c:if test="#{controlsState.firstRendered}"> <cdk:object type="boolean" name="isEnabled" value="#{controlsState.firstEnabled}"/> <cdk:object type="UIComponent" name="facet" value="#{component.getFacet('first')}"/> - <cdk:object type="String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object type="String" name="id" value="#{clientId}_ds_f"/> <cdk:object type="String" name="defaultText" value="&#171;&#171;&#171;&#171;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -54,8 +54,8 @@ <c:if test="#{controlsState.fastRewindRendered}"> <cdk:object type="boolean" name="isEnabled" value="#{controlsState.fastRewindEnabled}"/> <cdk:object type="UIComponent" name="facet" value="#{component.getFacet('fastRewind')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object type="java.lang.String" name="id" value="#{clientId}_ds_fr"/> <cdk:object type="java.lang.String" name="defaultText" value="&#171;&#171;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -64,8 +64,8 @@ <c:if test="#{controlsState.previousRendered}"> <cdk:object name="isEnabled" value="#{controlsState.previousEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('previous')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_prev"/> <cdk:object name="defaultText" value="&#171;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -76,8 +76,8 @@ <c:if test="#{controlsState.nextRendered}"> <cdk:object name="isEnabled" value="#{controlsState.nextEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('next')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_next"/> <cdk:object name="defaultText" value="&#187;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -86,8 +86,8 @@ <c:if test="#{controlsState.fastForwardRendered}"> <cdk:object name="isEnabled" value="#{controlsState.fastForwardEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('fastForward')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_ff"/> <cdk:object name="defaultText" value="&#187;&#187;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -96,8 +96,8 @@ <c:if test="#{controlsState.lastRendered}"> <cdk:object name="isEnabled" value="#{controlsState.lastEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('last')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_l"/> <cdk:object name="defaultText" value="&#187;&#187;&#187;&#187;"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> Modified: branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -49,56 +49,56 @@ // first/fastRewind/previous buttons with arrows HtmlElement first = getFirstButton(page, scrollerId); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); HtmlElement fastRewind = getFastRewindButton(page, scrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); HtmlElement previous = getPreviousButton(page, scrollerId); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // currently selected digital button HtmlElement dc1 = getDigitalButton(page, scrollerId, 1); assertEquals("span", dc1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // digital buttons HtmlElement d2 = getDigitalButton(page, scrollerId, 2); assertEquals("a", d2.getNodeName()); - assertEquals("rf-ds-dtl", d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d2.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d3 = getDigitalButton(page, scrollerId, 3); assertEquals("a", d3.getNodeName()); - assertEquals("rf-ds-dtl", d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d3.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d4 = getDigitalButton(page, scrollerId, 4); assertEquals("a", d4.getNodeName()); - assertEquals("rf-ds-dtl", d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d4.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d5 = getDigitalButton(page, scrollerId, 5); assertEquals("a", d5.getNodeName()); - assertEquals("rf-ds-dtl", d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d5.getAttribute(HtmlConstants.HREF_ATTR)); // next/fastForward/last buttons with arrows HtmlElement next = getNextButton(page, scrollerId); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", next.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement fastForward = getFastForwardButton(page, scrollerId); assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", fastForward.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement last = getLastButton(page, scrollerId); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", last.getAttribute(HtmlConstants.HREF_ATTR)); } @@ -151,12 +151,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -171,12 +171,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -198,12 +198,12 @@ next.click(); HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -218,12 +218,12 @@ HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -247,12 +247,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -267,12 +267,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -294,12 +294,12 @@ ff.click(); HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -314,12 +314,12 @@ HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -342,12 +342,12 @@ currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -362,12 +362,12 @@ currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -390,12 +390,12 @@ currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -410,12 +410,12 @@ currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -437,26 +437,26 @@ //check right buttons assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastForward = getFastForwardButton(page, secondScrollerId); last = getFastForwardButton(page, secondScrollerId); next = getNextButton(page, secondScrollerId); assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); //check if left buttons is disabled HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId); @@ -464,26 +464,26 @@ HtmlElement previous = getPreviousButton(page, firstScrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastRewind = getFastRewindButton(page, secondScrollerId); first = getFirstButton(page, secondScrollerId); next = getNextButton(page, secondScrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); } private void checkLastPageButtons(HtmlPage page, String firstScrollerId, String secondScrollerId) throws Exception { @@ -493,13 +493,13 @@ HtmlElement next = getNextButton(page, firstScrollerId); assertEquals("span", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastForward = getFastForwardButton(page, secondScrollerId); @@ -507,13 +507,13 @@ next = getNextButton(page, secondScrollerId); assertEquals("span", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); //check if left buttons is enabled HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId); @@ -521,26 +521,26 @@ HtmlElement previous = getPreviousButton(page, firstScrollerId); assertEquals("a", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastRewind = getFastRewindButton(page, secondScrollerId); first = getFirstButton(page, secondScrollerId); previous = getPreviousButton(page, secondScrollerId); assertEquals("a", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); } private String getCurrentPageContent(HtmlPage page, int i) throws Exception { Modified: branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -121,36 +121,36 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); String text = table.getElementsByTagName("style").get(0).getTextContent(); - assertTrue(text.contains("rf-edt-pw")); - assertTrue(text.contains("rf-edt-cw")); - HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-h']"); + assertTrue(text.contains(".rf-edt-cnt")); + assertTrue(text.contains("rf-edt-c")); + HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-hdr']"); HtmlElement frozenHeader = header.getElementById("table:frozenHeader"); HtmlElement normalHeader = header.getElementById("table:header"); - assertTrue(normalHeader.getAttribute("class").contains("rf-edt-pw")); - assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); - assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); + assertTrue(normalHeader.getAttribute("class").contains("rf-edt-cnt")); + assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rsz']")); + assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rsz']")); assertEquals("headerColumnFacet1", ((HtmlElement) frozenHeader - .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet1']")) + .getFirstByXPath("//*[@class='rf-edt-hdr-c-cnt']//*[@id='table:headerColumnFacet1']")) .getTextContent()); assertEquals("headerColumnFacet2", ((HtmlElement) normalHeader - .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet2']")) + .getFirstByXPath("//*[@class='rf-edt-hdr-c-cnt']//*[@id='table:headerColumnFacet2']")) .getTextContent()); HtmlElement body = table.getElementById("table:b"); assertEquals("rf-edt-b", body.getAttribute("class")); - assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-s']")); + assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-spcr']")); assertNotNull(body - .getFirstByXPath("descendant::*[@class='rf-edt-p rf-edt-pw']//*[@id='table:tbn']")); + .getFirstByXPath("descendant::*[@class='rf-edt-cnt']//*[@id='table:tbn']")); assertEquals("noDataFacet", ((HtmlElement) page .getFirstByXPath("//*[@id='table2']//*[@id='table2:b']//*[@id='table2:noDataFacet']")).getTextContent()); - HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-f']"); - HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-fa']/div"); + HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-ftr']"); + HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-ftr-fzn']/div"); HtmlElement normalFooter = footer.getElementById("table:footer"); - assertTrue(normalFooter.getAttribute("class").contains("rf-edt-pw")); + assertTrue(normalFooter.getAttribute("class").contains("rf-edt-ftr-cnt")); assertEquals("footerColumnFacet1", ((HtmlElement) frozenFooter - .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet1']")) + .getFirstByXPath("descendant::*[@class='rf-edt-ftr-c-cnt']//*[@id='table:footerColumnFacet1']")) .getTextContent()); assertEquals("footerColumnFacet2", ((HtmlElement) normalFooter - .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet2']")) + .getFirstByXPath("descendant::*[@class='rf-edt-ftr-c-cnt']//*[@id='table:footerColumnFacet2']")) .getTextContent()); } @@ -166,9 +166,9 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); assertEquals("footerFacet", table.getElementById("table:footerFacet").getTextContent()); - assertEquals("rf-edt-d", table.getElementById("table:d").getAttribute("class")); - assertEquals("rf-edt-ro", table.getElementById("table:r").getAttribute("class")); - assertEquals("rf-edt-rom", table.getElementById("table:rm").getAttribute("class")); + assertEquals("rf-edt-rsz-mkr", table.getElementById("table:d").getAttribute("class")); + assertEquals("rf-edt-rord", table.getElementById("table:r").getAttribute("class")); + assertEquals("rf-edt-rord-mkr", table.getElementById("table:rm").getAttribute("class")); assertEquals("table:wi", table.getElementById("table:wi").getAttribute("name")); assertTrue(table.getElementsByTagName("script").get(0).getTextContent() .contains("RichFaces.ExtendedDataTable")); @@ -187,7 +187,7 @@ HtmlElement cell = table.getElementById("table:0:f").getElementsByTagName("div").get(0); assertTrue(cell.getAttribute("class").contains("rf-edt-c")); HtmlElement cellContent = cell.getElementsByTagName("div").get(0); - assertEquals("rf-edt-cc", cellContent.getAttribute("class")); + assertEquals("rf-edt-c-cnt", cellContent.getAttribute("class")); assertEquals("value", cellContent.getElementById("table:0:outputText").getTextContent()); } Modified: branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java =================================================================== --- branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-10-27 14:34:46 UTC (rev 19686) +++ branches/RF-7817/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-10-27 14:47:25 UTC (rev 19687) @@ -73,7 +73,7 @@ HtmlElement list = (HtmlElement) nodes.get(0); assertEquals("ol", list.getNodeName()); assertEquals("rf-olst", list.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - verifySimpleListItems(list, "rf-olst-i"); + verifySimpleListItems(list, "rf-olst-itm"); } @Test @@ -86,7 +86,7 @@ assertEquals("ul", list.getNodeName()); assertEquals("rf-ulst", list.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - verifySimpleListItems((HtmlElement) list, "rf-ulst-i"); + verifySimpleListItems((HtmlElement) list, "rf-ulst-itm"); } @Test @@ -140,7 +140,7 @@ HtmlElement item = (HtmlElement) termItems.get(i); assertEquals("dt", item.getNodeName()); - assertEquals("rf-dlst-t", item.getAttribute("class")); + assertEquals("rf-dlst-trm", item.getAttribute("class")); assertEquals(data.getTerm(), item.asText()); } @@ -149,7 +149,7 @@ HtmlElement item = (HtmlElement) definitionItems.get(i); assertEquals("dd", item.getNodeName()); - assertEquals("rf-dlst-d", item.getAttribute("class")); + assertEquals("rf-dlst-dfn", item.getAttribute("class")); assertEquals(data.getDefinition(), item.asText()); } }