Author: abelevich Date: 2007-06-06 11:01:23 -0400 (Wed, 06 Jun 2007) New Revision: 1050 Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java Log: Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-06 14:46:49 UTC (rev 1049) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-06 15:01:23 UTC (rev 1050) @@ -32,7 +32,7 @@ import org.richfaces.model.selection.Selection; import org.richfaces.model.selection.SimpleSelection; import org.richfaces.renderkit.CompositeRenderer; -import org.richfaces.renderkit.html.response.Options; +import org.richfaces.renderkit.html.response.GridScrollSettings; import org.richfaces.utils.TemplateLoader; @@ -199,9 +199,9 @@ String baseClientId = grid.getBaseClientId(context); if(state.isFrozenPart()){ - row_id = baseClientId + ":f:row_" + index; + row_id = baseClientId + ":f:" + index; }else{ - row_id = baseClientId + ":n:row_" + index; + row_id = baseClientId + ":n:" + index; } ResponseWriter writer = context.getResponseWriter(); @@ -262,7 +262,7 @@ state.setFrozenPart(true); frozenTRRendered = true; - row_id = baseClientId + ":f:row_" + state.getRowIndex(); + row_id = baseClientId + ":f:" + state.getRowIndex(); writer.startElement("tr", grid); getUtils().writeAttribute(writer,"id",row_id); getUtils().writeAttribute(writer,"class", "ClientUI_Grid_BR"); @@ -275,7 +275,7 @@ } state.setFrozenPart(false); - row_id = baseClientId + ":n:row_" + state.getRowIndex(); + row_id = baseClientId + ":n:" + state.getRowIndex(); writer.startElement("tr", grid); getUtils().writeAttribute(writer,"id",row_id); @@ -674,18 +674,18 @@ ajaxContext.setResponseData(grid.getResponseData()); ajaxContext.getAjaxRenderedAreas().remove(grid.getClientId(context)); - Options options = createOptions(grid); + GridScrollSettings options = createOptions(grid); ajaxContext.getResponseDataMap().put("options", options); grid.setRows(grid.getDefaultRows()); } - private Options createOptions(UIScrollableGrid grid){ + private GridScrollSettings createOptions(UIScrollableGrid grid){ int index = grid.getRowIndex(); int startRow = ((Integer)grid.getAttributes().get(CLIENT_ROW_KEY)).intValue(); int count = grid.getRows(); - Options options = new Options(index, startRow, count); + GridScrollSettings options = new GridScrollSettings(index, startRow, count); return options; }