June 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r1027 - trunk/sandbox/scrollable-grid/src/main/config/component.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-06-05 13:55:28 -0400 (Tue, 05 Jun 2007) New Revision: 1027 Modified: trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml Log: Modified: trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml =================================================================== --- trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-06-05 17:55:18 UTC (rev 1026) +++ trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-06-05 17:55:28 UTC (rev 1027) @@ -44,6 +44,14 @@ <defaultvalue>"700px"</defaultvalue> </property> + <property> + <name>defaultRows</name> + <classname>int</classname> + <description>Rows to render</description> + <defaultvalue>40</defaultvalue> + </property> + + <property attachedstate="true"> <name>sortOrder</name> <classname>org.richfaces.model.SortOrder</classname>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1026 - trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-06-05 13:55:18 -0400 (Tue, 05 Jun 2007) New Revision: 1026 Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 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/GridRendererState.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-06-05 15:33:33 UTC (rev 1025) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-06-05 17:55:18 UTC (rev 1026) @@ -39,8 +39,6 @@ private Integer sepOffset; - private int _loadedRowsCount; - private String _cell_id_prefix; private int sumWidth = 0; @@ -67,17 +65,11 @@ private GridRendererState _previousState = null; -// private AjaxContainer _region = null; - -// private boolean _rowSelected; - private Object rowKey; private static final long serialVersionUID = 2129605586975025578L; -// private Set _renderedAreas = null; - /** * Get current grid state from JSF context * @param context @@ -221,7 +213,7 @@ * @return Returns the rowIndex. */ public int getRowIndex() { - if(_rowIndex >= _loadedRowsCount){ + if(_rowIndex >= _grid.getRows()){ _rowIndex = 0; } return _rowIndex; @@ -360,14 +352,6 @@ this.sumWidth = sumWidth; } - public int getLoadedRowsCount() { - return _loadedRowsCount; - } - - public void setLoadedRowsCount(int loadedRowsCount) { - _loadedRowsCount = loadedRowsCount; - } - public Integer getSepOffset() { return sepOffset; } 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-05 15:33:33 UTC (rev 1025) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-05 17:55:18 UTC (rev 1026) @@ -45,6 +45,8 @@ private final String COLUMN_NORMAL_TYPE = "normal"; + private String CLIENT_ROW_KEY = "clientIndex"; + private RendererBase cellTemplate = null; private RendererBase headerCellTemplate = null; @@ -214,10 +216,16 @@ private final DataVisitor ajaxRowsRenderer = new DataVisitor(){ + public void process(FacesContext context, Object rowKey, Object argument) throws IOException { + int columnsCount = 0; + + boolean frozenTRRendered = false; + + boolean normalTRRendered = false; + GridRendererState state = (GridRendererState)argument; - AjaxContext ajaxContext = state.getAjaxContext(); ajaxContext.getResponseData(); @@ -229,14 +237,12 @@ String row_id = null; - int columnsCount = 0; - boolean frozenTRRendered = false; + + System.out.println("row data index: " + grid.getRowIndex()); + System.out.println("rows count " + grid.getRows()); + System.out.println("local rows " + state.getRowIndex()); - boolean normalTRRendered = false; - - //System.out.println("row index: " + grid.getRowIndex()); - for (Iterator iter = grid.getChildren().iterator(); iter.hasNext(); ) { UIComponent kid = (UIComponent) iter.next(); @@ -312,14 +318,13 @@ state.setColumType(COLUMN_NORMAL_TYPE); } - if (log.isDebugEnabled()) { - log.debug("ScrollableGridBaseRenderer.renderGridBody()"); - } + System.out.println(""); + System.out.println("ScrollableGridBaseRenderer.renderGridBody()"); + System.out.println(""); state.setFrozenColumnCount(((Integer)grid.getAttributes().get("frozenColCount")).intValue()); state.setFrozenPart(isFrozen); state.setClientId(grid.getClientId(context)); - state.setLoadedRowsCount(grid.getRows()); grid.walk(context, rowsRenderer, state); grid.setRowKey(null); } @@ -448,8 +453,8 @@ parameters.containsKey(clientId + ":sortOrder")){ int sortColumn = Integer.parseInt((String)parameters.get(clientId + ":sortColumn")); - int sortStartRow = Integer.parseInt((String)parameters.get(clientId + ":sortStartRow")); int sortDataIndex = Integer.parseInt((String)parameters.get(clientId + ":sortIndex")); + Integer sortStartRow = Integer.valueOf((String)parameters.get(clientId + ":sortStartRow")); String sortOrder = (String)parameters.get(clientId + ":sortOrder"); boolean asc = true; @@ -457,14 +462,21 @@ asc = false; } UIScrollableGridColumn column = (UIScrollableGridColumn)grid.getChildren().get(sortColumn); + if(column.isSortable()){ - grid.setDataIndex(new Integer(sortDataIndex)); - grid.setStartRow(new Integer(sortStartRow)); - grid.setRequestedRows(new Integer(grid.getRows())); + + grid.getAttributes().put(CLIENT_ROW_KEY,sortStartRow); + grid.setFirst(sortDataIndex); + grid.setRows(grid.getDefaultRows()); + + System.out.println("rows " + grid.getRows() ); + System.out.println("client start index" + grid.getAttributes().get(CLIENT_ROW_KEY)); + System.out.println("data index " + grid.getFirst()); + sorted = true; - - SortEvent sortEvent = new SortEvent(grid,sortColumn, sortStartRow, sortDataIndex, asc ); + SortEvent sortEvent = new SortEvent(grid,sortColumn, sortStartRow.intValue(), sortDataIndex, asc ); grid.queueEvent(sortEvent); + } } @@ -488,19 +500,19 @@ } if(!isEmpty){ - grid.setRequestedRows(new Integer(Integer.parseInt(values[0]))); - grid.setDataIndex(new Integer(Integer.parseInt(values[1]))); - grid.setStartRow(new Integer(Integer.parseInt(values[2]))); + + grid.setRows(Integer.parseInt(values[0])); + grid.setFirst(Integer.parseInt(values[1])); + grid.getAttributes().put(CLIENT_ROW_KEY,Integer.valueOf(values[2])); + }else{ - grid.setRequestedRows(new Integer(grid.getRows())); - grid.setDataIndex(new Integer(0)); - grid.setStartRow(new Integer(grid.getFirst())); + grid.getAttributes().put(CLIENT_ROW_KEY, new Integer(0)); } if (log.isDebugEnabled()) { log.debug(""); - log.debug("row count: " + grid.getRequestedRows()); - log.debug("data index: " + grid.getDataIndex()); - log.debug("start row: " + grid.getStartRow()); + log.debug("row count: " + grid.getRows()); + log.debug("data index: " + grid.getFirst()) ; + log.debug("start row: " + grid.getAttributes().get(CLIENT_ROW_KEY)); } } @@ -509,33 +521,33 @@ UIScrollableGrid grid = (UIScrollableGrid)component; GridRendererState state = GridRendererState.createState(context, grid); - grid.setFirst(grid.getDataIndex().intValue()); - int old = grid.getRows(); - state.setLoadedRowsCount(old); - grid.setRows(grid.getRequestedRows().intValue()); - - int start_row = grid.getStartRow().intValue(); - + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); String client_id = grid.getClientId(context); + state.setClientId(client_id); state.setAjaxContext(ajaxContext); - state.setRowIndex(start_row); + state.setRowIndex(((Integer)grid.getAttributes().get(CLIENT_ROW_KEY)).intValue()); if (log.isDebugEnabled()) { log.debug("ScrollableGridBaseRenderer.renderAjaxChildren()"); } grid.getResponseData().clear(); + ResponseWriter writer = context.getResponseWriter(); writer.startElement("table", grid); writer.startElement("tbody", grid); + grid.walk(context, ajaxRowsRenderer, state); + writer.endElement("tbody"); writer.endElement("table"); + ajaxContext.setResponseData(grid.getResponseData()); ajaxContext.getAjaxRenderedAreas().remove(grid.getClientId(context)); - grid.setRows(old); + + grid.setRows(grid.getDefaultRows()); } public void encodeChildren(FacesContext context, UIComponent component @@ -558,23 +570,20 @@ } AjaxContext ajaxContext = AjaxContext.getCurrentInstance(); - if(ajaxContext.isAjaxRequest()){ - }else{ + + if(!ajaxContext.isAjaxRequest()){ super.encodeBegin(context, component); - } - + } } public void encodeEnd(FacesContext context, UIComponent component) throws IOException { if(component instanceof UIScrollableGrid){ - UIScrollableGrid grid = (UIScrollableGrid)component; AjaxContext ajaxContext = AjaxContext.getCurrentInstance(); if(!ajaxContext.isAjaxRequest()){ super.encodeEnd(context, component); - } } } @@ -610,4 +619,5 @@ } return footerCellTemplate; } + }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1025 - in trunk: richfaces/dataTable/src/main/config/component and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: vkukharchuk Date: 2007-06-05 11:33:33 -0400 (Tue, 05 Jun 2007) New Revision: 1025 Modified: trunk/docs/userguide/en/included/dataTable.xml trunk/richfaces/dataTable/src/main/config/component/colgroup.xml trunk/richfaces/dataTable/src/main/config/component/dataGrid.xml trunk/richfaces/dataTable/src/main/config/component/dataTable.xml trunk/richfaces/datascroller/src/main/config/component/datascroller.xml trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml trunk/richfaces/suggestionbox/src/main/config/component/suggestionbox.xml Log: Modified: trunk/docs/userguide/en/included/dataTable.xml =================================================================== --- trunk/docs/userguide/en/included/dataTable.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/docs/userguide/en/included/dataTable.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -76,7 +76,7 @@ the <emphasis role="bold"><property><a4j:repeat></property></emphasis> outputs the standard HTML structure for table rendering.</para> <programlisting role="XML"><![CDATA[... <rich:dataTable value="#{capitalsBean.capitals}" var="capitals" - ajaxKeys="#{bean.ajaxSet}" binding="#{bean.table}" id="table"> + ajaxKeys="#{bean.ajaxSet}" binding="#{bean.table}" id="table">  </rich:dataTable> ... Modified: trunk/richfaces/dataTable/src/main/config/component/colgroup.xml =================================================================== --- trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -40,14 +40,14 @@ <description> Comma-delimited list of CSS style classes that are be applied to the columns of this table. A space separated list of classes may also be specified for any individual column. - If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the posisiton in the list after the value of the "columns" attribute are ignored. + If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the posisiton in the list after the value of the "columns" attribute are ignored </description> </property> <property> <name>rowClasses</name> <classname>java.lang.String</classname> <description> - A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. Thes styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again. + A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. Thes styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again </description> </property>  @@ -133,43 +133,43 @@ <name>onRowClick</name> <classname>java.lang.String</classname> <description> - HTML: a script expression; a pointer button is clicked on row. + HTML: a script expression; a pointer button is clicked on row </description> </property> <property> <name>onRowDblClick</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer button is double-clicked on row. + <description>HTML: a script expression; a pointer button is double-clicked on row </description> </property> <property> <name>onRowMouseUp</name> <classname>java.lang.String</classname> - <description>HTML: script expression; a pointer button is released on row. + <description>HTML: script expression; a pointer button is released on row </description> </property> <property> <name>onRowMouseDown</name> <classname>java.lang.String</classname> - <description>HTML: script expression; a pointer button is pressed down on row. + <description>HTML: script expression; a pointer button is pressed down on row </description> </property> <property> <name>onRowMouseOver</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved onto of row. + <description>HTML: a script expression; a pointer is moved onto of row </description> </property> <property> <name>onRowMouseOut</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved away of row. + <description>HTML: a script expression; a pointer is moved away of row </description> </property> <property> <name>onRowMouseMove</name> <classname>java.lang.String</classname> - <description>HTML: a script expression; a pointer is moved within of row. + <description>HTML: a script expression; a pointer is moved within of row </description> </property> <property> Modified: trunk/richfaces/dataTable/src/main/config/component/dataTable.xml =================================================================== --- trunk/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -58,7 +58,7 @@ <property> <name>cellspacing</name> <classname>java.lang.String</classname> - <description>This attribute specifies the amount of space between the border of the cell and its contents. The attribute also specifies the amount of space to leave between cells. + <description>This attribute specifies the amount of space between the border of the cell and its contents. The attribute also specifies the amount of space to leave between cells </description> <defaultvalue>"0"</defaultvalue> </property> @@ -93,7 +93,7 @@ <property> <name>footerClass</name> <classname>java.lang.String</classname> - <description>Space-separated list of CSS style class(es) that are be applied to footer for this component. + <description>Space-separated list of CSS style class(es) that are be applied to footer for this component </description> </property> Modified: trunk/richfaces/datascroller/src/main/config/component/datascroller.xml =================================================================== --- trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -59,7 +59,7 @@ <property> <name>id</name> <classname>java.lang.String</classname> - <description>Every component may have a unique id that is automatically created if omitted. + <description>Every component may have a unique id that is automatically created if omitted </description> </property> @@ -117,27 +117,27 @@ <property> <name>tableStyleClass</name> <classname>java.lang.String</classname> - <description>Space-separated list of CSS style class(es) that are be applied to outside table of this component. + <description>Space-separated list of CSS style class(es) that are be applied to outside table of this component </description> </property> <property> <name>tableStyle</name> <classname>java.lang.String</classname> - <description>CSS style(s) is/are to be applied to outside table when this component is rendered. + <description>CSS style(s) is/are to be applied to outside table when this component is rendered </description> </property> <property> <name>styleClass</name> <classname>java.lang.String</classname> - <description>Corresponds to the HTML class attribute. + <description>Corresponds to the HTML class attribute </description> </property> <property> <name>style</name> <classname>java.lang.String</classname> - <description>CSS style(s) is/are to be applied when this component is rendered. + <description>CSS style(s) is/are to be applied when this component is rendered </description> </property> @@ -211,7 +211,7 @@ <name>align</name> <classname>java.lang.String</classname> <description> - left|center|right [CI] Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: * left: The table is to the left of the document. * center: The table is to the center of the document. * right: The table is to the right of the document. + left|center|right [CI] Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: * left: The table is to the left of the document. * center: The table is to the center of the document. * right: The table is to the right of the document </description> <defaultvalue>"center"</defaultvalue> </property> @@ -242,7 +242,7 @@ <description> Possible values are: "show" - default mode. Controls are visible always. "hide" - controls are hidden. -"auto" - unnecessary controls are hidden. +"auto" - unnecessary controls are hidden </description> <defaultvalue><![CDATA["show"]]></defaultvalue> Modified: trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml =================================================================== --- trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -156,7 +156,7 @@ <name>disabledItemClass</name> <classname>java.lang.String</classname> <description> - Space-separated list of CSS style class(es) that are be applied to disabled item of this component. + Space-separated list of CSS style class(es) that are be applied to disabled item of this component </description> </property> @@ -172,7 +172,7 @@ <name>itemClass</name> <classname>java.lang.String</classname> <description> - Space-separated list of CSS style class(es) that are be applied to item of this component. + Space-separated list of CSS style class(es) that are be applied to item of this component </description> </property> Modified: trunk/richfaces/suggestionbox/src/main/config/component/suggestionbox.xml =================================================================== --- trunk/richfaces/suggestionbox/src/main/config/component/suggestionbox.xml 2007-06-05 14:50:05 UTC (rev 1024) +++ trunk/richfaces/suggestionbox/src/main/config/component/suggestionbox.xml 2007-06-05 15:33:33 UTC (rev 1025) @@ -111,7 +111,7 @@ <name>rowClasses</name> <classname>java.lang.String</classname> <description> - A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. Thes styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again. + A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. Thes styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again </description> </property>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1024 - trunk/richfaces-samples/richfaces-demo/src/main/webapp/images.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-06-05 10:50:05 -0400 (Tue, 05 Jun 2007) New Revision: 1024 Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_Calendar.gif trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_DropDownMenu.gif trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_PanelMenu.gif trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_Calendar.gif trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_dropDownMenu.gif trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_panelMenu.gif Log: images for new components Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_Calendar.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_Calendar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_DropDownMenu.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_DropDownMenu.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_PanelMenu.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/cn_PanelMenu.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_Calendar.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_Calendar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_dropDownMenu.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_dropDownMenu.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_panelMenu.gif =================================================================== (Binary files differ) Property changes on: trunk/richfaces-samples/richfaces-demo/src/main/webapp/images/ico_panelMenu.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1023 - in trunk: sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html and 8 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-06-05 10:46:05 -0400 (Tue, 05 Jun 2007) New Revision: 1023 Added: trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/my-logging.properties trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js Removed: trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Issue.java trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/commons-logging.properties trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/index.jsp trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml trunk/sandbox/scrollable-grid/generatescript.xml trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ArrayDataModel.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/DataModel.js trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx Log: rendering re-design. moved prinlns to logger Modified: trunk/sandbox/scrollable-grid/generatescript.xml =================================================================== --- trunk/sandbox/scrollable-grid/generatescript.xml 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox/scrollable-grid/generatescript.xml 2007-06-05 14:46:05 UTC (rev 1023) @@ -32,6 +32,7 @@ <file name="/ClientUI/common/box/ScrollableBox.js"/> <file name="/ClientUI/controls/grid/DataModel.js"/> <file name="/ClientUI/controls/grid/ArrayDataModel.js"/> + <file name="/ClientUI/controls/grid/FakeArrayDataModel.js"/> <file name="/ClientUI/layouts/LayoutManager.js"/> <file name="/ClientUI/common/box/Substrate.js"/> <file name="/ClientUI/layouts/VLayoutManager.js"/> 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-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-05 14:46:05 UTC (rev 1023) @@ -20,6 +20,8 @@ import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.javascript.JSFunction; import org.ajax4jsf.framework.util.javascript.JSReference; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.richfaces.component.UIScrollableGrid; import org.richfaces.component.UIScrollableGridColumn; import org.richfaces.event.sort.SortEvent; @@ -49,6 +51,8 @@ private RendererBase footerCellTemplate = null; + private final Log log = LogFactory.getLog(ScrollableGridBaseRenderer.class); + private final ColumnVisitor columnsWidthCounter = new ColumnVisitor(){ public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { @@ -145,7 +149,10 @@ public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { String cell_id = state.getRowIndex()+ "_" + state.getCellIndex(); - System.out.println("cell_index: " + cell_id); + if (log.isTraceEnabled()) { + log.trace("cell_index: " + cell_id); + } + String client_id = state.getClientId(); int cell_index = state.getCellIndex(); cellTemplate = getCellTemplate(); @@ -164,18 +171,20 @@ private final DataVisitor rowsRenderer = new DataVisitor(){ - public void process(FacesContext context, Object rowIndex, Object argument) throws IOException { + public void process(FacesContext context, Object rowKey, Object argument) throws IOException { GridRendererState state = (GridRendererState)argument; UIScrollableGrid grid = state.getGrid(); - grid.setRowKey(rowIndex); + grid.setRowKey(rowKey); if(grid.isRowAvailable()){ String row_id; - int index = ((Integer)rowIndex).intValue(); - state.setRowIndex(index); + int index = state.getRowIndex(); + + //state.setRowIndex(index); + String baseClientId = grid.getBaseClientId(context); if(state.isFrozenPart()){ @@ -190,11 +199,14 @@ getUtils().writeAttribute(writer, "id",row_id); getUtils().writeAttribute(writer, "class","ClientUI_Grid_BR"); - System.out.println("rowIndex : " + index); + if (log.isDebugEnabled()) { + log.debug("rowIndex : " + index); + } ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state); writer.endElement(HTML.TR_ELEMENT); state.nextRow(); + state.setCellIndex(0); } } @@ -300,9 +312,9 @@ state.setColumType(COLUMN_NORMAL_TYPE); } - System.out.println(""); - System.out.println("ScrollableGridBaseRenderer.renderGridBody()"); - System.out.println(""); + if (log.isDebugEnabled()) { + log.debug("ScrollableGridBaseRenderer.renderGridBody()"); + } state.setFrozenColumnCount(((Integer)grid.getAttributes().get("frozenColCount")).intValue()); state.setFrozenPart(isFrozen); @@ -484,11 +496,12 @@ grid.setDataIndex(new Integer(0)); grid.setStartRow(new Integer(grid.getFirst())); } - - System.out.println(""); - System.out.println("row count: " + grid.getRequestedRows()); - System.out.println("data index: " + grid.getDataIndex()); - System.out.println("start row: " + grid.getStartRow()); + if (log.isDebugEnabled()) { + log.debug(""); + log.debug("row count: " + grid.getRequestedRows()); + log.debug("data index: " + grid.getDataIndex()); + log.debug("start row: " + grid.getStartRow()); + } } @@ -509,9 +522,9 @@ state.setAjaxContext(ajaxContext); state.setRowIndex(start_row); - System.out.println(""); - System.out.println("ScrollableGridBaseRenderer.renderAjaxChildren()"); - System.out.println(""); + if (log.isDebugEnabled()) { + log.debug("ScrollableGridBaseRenderer.renderAjaxChildren()"); + } grid.getResponseData().clear(); ResponseWriter writer = context.getResponseWriter(); Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ArrayDataModel.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ArrayDataModel.js 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ArrayDataModel.js 2007-06-05 14:46:05 UTC (rev 1023) @@ -33,4 +33,4 @@ getRequestDelay: function() { return 50; } -}) \ No newline at end of file +}); \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/DataModel.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/DataModel.js 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/DataModel.js 2007-06-05 14:46:05 UTC (rev 1023) @@ -45,6 +45,6 @@ getRequestDelay: function() { return 1000; } -}) +}); Added: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js (rev 0) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js 2007-06-05 14:46:05 UTC (rev 1023) @@ -0,0 +1,62 @@ +ClientUILib.declarePackage("ClientUI.controls.grid.FakeArrayDataModel "); +ClientUI.controls.grid.FakeArrayDataModel = Class.create({ + CLASSDEF: { + name: 'ClientUI.controls.grid.FakeArrayDataModel', + parent: ClientUI.controls.grid.DataModel + } + }); + + Object.extend(ClientUI.controls.grid.FakeArrayDataModel.prototype, { + initialize: function(rows_count, columns_count, grid_id) { + ClientUI.controls.grid.FakeArrayDataModel.parentClass.constructor().call(this); + this.data = []; + this.count = rows_count; + this.columns = columns_count; + this.gridId = grid_id; + this.curr_options; + }, + + getRow: function(index) { + if(!this.data[index]) { + this.data[index] = []; + for (var index2 = 0; index2 < 7; index2++) { + this.data[index][index2] = index2 + " : " + index; + } + this.data[index][6] = index%2 ? "value 1" : "value 2"; + } + + return this.data[index]; + }, + getCount: function() { + return this.count; + }, + getRequestDelay: function() { + return 150; + }, + + getCurrentOptions: function() { + if(!this.curr_options) { + this.curr_options = { + count: grid.getBody().templFrozen.getElement().rows.length, + index: 0, + startRow: 0 + } + } + return this.curr_options; + }, + + loadRows: function(options) { + + var state_options = options; + var state_input = $(this.gridId + "_state_input"); + var submit_input = $(this.gridId + "_submit_input"); +// var options_input = $(this.gridId + "_options_input"); + var submit_values = state_options.count + "," + state_options.index + "," + state_options.startRow; + state_input.value = submit_values; +// options_input.value = options; + this.curr_options = options; + submit_input.click(); + + } + + }); Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx =================================================================== --- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-05 14:46:05 UTC (rev 1023) @@ -171,75 +171,6 @@ <f:call name="tearDownState"/> - <script id="#{clientId}_model_create_scripts" type="text/javascript"> - //<![CDATA[ - ClientUI.controls.grid.FakeArrayDataModel = Class.create({ - CLASSDEF: { - name: 'ClientUI.controls.grid.FakeArrayDataModel', - parent: ClientUI.controls.grid.DataModel - } - }); - - Object.extend(ClientUI.controls.grid.FakeArrayDataModel.prototype, { - initialize: function(rows_count, columns_count, grid_id) { - ClientUI.controls.grid.FakeArrayDataModel.parentClass.constructor().call(this); - this.data = []; - this.count = rows_count; - this.columns = columns_count; - this.gridId = grid_id; - this.curr_options; - }, - - getRow: function(index) { - if(!this.data[index]) { - this.data[index] = []; - for (var index2 = 0; index2 < 7; index2++) { - this.data[index][index2] = index2 + " : " + index; - } - this.data[index][6] = index%2 ? "value 1" : "value 2"; - } - - return this.data[index]; - }, - getCount: function() { - return this.count; - }, - getRequestDelay: function() { - return 150; - }, - - getCurrentOptions: function() { - if(!this.curr_options) { - this.curr_options = { - count: grid.getBody().templFrozen.getElement().rows.length, - index: 0, - startRow: 0 - } - } - return this.curr_options; - }, - - loadRows: function(options) { - - var state_options = options; - var state_input = $(this.gridId + "_state_input"); - var submit_input = $(this.gridId + "_submit_input"); -// var options_input = $(this.gridId + "_options_input"); - var submit_values = state_options.count + "," + state_options.index + "," + state_options.startRow; - state_input.value = submit_values; -// options_input.value = options; - this.curr_options = options; - submit_input.click(); - - } - - }); - - - - // ]]> - </script> - <jsp:scriptlet> if(component.getFacets().containsKey("splash")){ UIComponent splash = component.getFacet("splash"); Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-06-05 14:46:05 UTC (rev 1023) @@ -17,6 +17,8 @@ import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.richfaces.model.Entity; import org.richfaces.model.SortOrder; @@ -29,6 +31,8 @@ */ public class Channel { + private static final Log log = LogFactory.getLog(Channel.class); + private static final Comparator<Issue> byIdDesc = new Comparator<Issue>(){ public int compare(Issue o1, Issue o2) { return o2.getIndex() - o1.getIndex(); @@ -151,7 +155,7 @@ * @return */ public List <Issue> executeQuery(int startRow, int endRow, SortOrder sortOrder) { - System.out.println("Channel.executeQuery()"); + log.trace("Channel.executeQuery()"); List <Issue> copy = getIssues(); if (sortOrder != null) { copy = new ArrayList<Issue>(getIssues()); Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Issue.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Issue.java 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Issue.java 2007-06-05 14:46:05 UTC (rev 1023) @@ -379,7 +379,7 @@ public Serializable getId() { // TODO Auto-generated method stub - return getIndex(); + return getKey(); } } Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java 2007-06-05 14:46:05 UTC (rev 1023) @@ -10,11 +10,13 @@ package org.richfaces.demo.datagrid.model; +import java.io.Serializable; + /** * @author Maksim Kaszynski * */ -public class Key implements Comparable<Key>{ +public class Key implements Comparable<Key>, Serializable{ private int id; private String value; /** @@ -48,4 +50,12 @@ public int compareTo(Key o) { return id - o.id; } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Key) { + return ((Key) obj).id == id; + } + return super.equals(obj); + } } Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java 2007-06-05 14:46:05 UTC (rev 1023) @@ -17,6 +17,8 @@ import org.apache.commons.digester.Digester; import org.apache.commons.digester.ExtendedBaseRules; import org.apache.commons.digester.Rule; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.richfaces.demo.datagrid.model.Channel; import org.richfaces.demo.datagrid.model.Issue; import org.richfaces.demo.datagrid.model.JiraUser; @@ -36,6 +38,8 @@ private static final String KEY = "jiraService"; + private static final Log log = LogFactory.getLog(JiraService.class); + private static final JiraService instance = new JiraService(); /** @@ -43,7 +47,7 @@ */ public JiraService() { super(); - System.out.println("---> JiraService.JiraService()"); + log.trace("---> JiraService.JiraService()"); init(); } Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/commons-logging.properties =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/commons-logging.properties 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/commons-logging.properties 2007-06-05 14:46:05 UTC (rev 1023) @@ -1,10 +1,12 @@ org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -java.util.logging.config.file=logging.properties +java.util.logging.config.file=/WEB-INF/logging.properties +.level = ALL java.util.logging.config.file = logging.properties handlers = java.util.logging.ConsoleHandler java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - +java.util.logging.FileHandler.level = ALL +java.util.logging.Consolehandler.level = ALL # If you want to provide finer grained logging, restrict the level for the # specific package name. # For example: Deleted: trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties 2007-06-05 14:46:05 UTC (rev 1023) @@ -1,19 +0,0 @@ - # Specify the handlers to create in the root logger - # (all loggers are children of the root logger) - # The following creates two handlers - handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler - - # Set the default logging level for the root logger - .level = ALL - - # Set the default logging level for new ConsoleHandler instances - java.util.logging.ConsoleHandler.level = INFO - - # Set the default logging level for new FileHandler instances - java.util.logging.FileHandler.level = ALL - - # Set the default formatter for new ConsoleHandler instances - java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - # Set the default logging level for the logger named com.mycompany - com.mycompany.level = ALL \ No newline at end of file Added: trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties (rev 0) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties 2007-06-05 14:46:05 UTC (rev 1023) @@ -0,0 +1,55 @@ +############################################################ +# Default Logging Configuration File +# +# You can use a different file by specifying a filename +# with the java.util.logging.config.file system property. +# For example java -Djava.util.logging.config.file=myfile +############################################################ + +############################################################ +# Global properties +############################################################ + +# "handlers" specifies a comma separated list of log Handler +# classes. These handlers will be installed during VM startup. +# Note that these classes must be on the system classpath. +# By default we only configure a ConsoleHandler, which will only +# show messages at the INFO and above levels. +handlers= java.util.logging.ConsoleHandler + +# To also add the FileHandler, use the following line instead. +#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level= ALL + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +# default file output is in user's home directory. +java.util.logging.FileHandler.pattern = %h/java%u.log +java.util.logging.FileHandler.limit = 50000 +java.util.logging.FileHandler.count = 1 +java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter + +# Limit the message that are printed on the console to INFO and above. +java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +com.xyz.foo.level = SEVERE +org.richfaces.level = ALL Copied: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/my-logging.properties (from rev 1017, trunk/sandbox-samples/scrollable-grid-demo/src/main/resources/logging.properties) =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/my-logging.properties (rev 0) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/my-logging.properties 2007-06-05 14:46:05 UTC (rev 1023) @@ -0,0 +1,19 @@ + # Specify the handlers to create in the root logger + # (all loggers are children of the root logger) + # The following creates two handlers +handlers = java.util.logging.ConsoleHandler + + # Set the default logging level for the root logger +.level = ALL + + # Set the default logging level for new ConsoleHandler instances +java.util.logging.ConsoleHandler.level = ALL + + # Set the default logging level for new FileHandler instances +java.util.logging.FileHandler.level = ALL + + # Set the default formatter for new ConsoleHandler instances +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + # Set the default logging level for the logger named com.mycompany +org.level = ALL \ No newline at end of file Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/index.jsp 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/index.jsp 2007-06-05 14:46:05 UTC (rev 1023) @@ -1,4 +1,4 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<%@ page contentType="text/html; charset=ISO-8859-1" %> <html> <head></head> <body> Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-06-05 14:34:05 UTC (rev 1022) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-06-05 14:46:05 UTC (rev 1023) @@ -37,7 +37,7 @@ <h:form> <sg:scrollable-grid id="grid" - value="#{dataModel2}" + value="#{dataModel}" var="issues" frozenColCount="3" first="0"

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1022 - in trunk/richfaces-samples/richfaces-art-datatable/src/main: webapp/WEB-INF and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2007-06-05 10:34:05 -0400 (Tue, 05 Jun 2007) New Revision: 1022 Added: trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp Modified: trunk/richfaces-samples/richfaces-art-datatable/src/main/java/org/rf/datatable/ExpenseReport.java trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml.l4t trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/main.jsp Log: Modified: trunk/richfaces-samples/richfaces-art-datatable/src/main/java/org/rf/datatable/ExpenseReport.java =================================================================== --- trunk/richfaces-samples/richfaces-art-datatable/src/main/java/org/rf/datatable/ExpenseReport.java 2007-06-05 14:25:26 UTC (rev 1021) +++ trunk/richfaces-samples/richfaces-art-datatable/src/main/java/org/rf/datatable/ExpenseReport.java 2007-06-05 14:34:05 UTC (rev 1022) @@ -1,12 +1,60 @@ package org.rf.datatable; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; public class ExpenseReport { private List records = null; + + private boolean citySorted=true; + private boolean mealsSorted=true; + private boolean hotelsSorted=true; + private boolean totalsSorted=true; + private boolean transportSorted=true; + + public boolean isCitySorted() { + return citySorted; + } + public void setCitySorted(boolean citySorted) { + this.citySorted = citySorted; + } + + public boolean isHotelsSorted() { + return hotelsSorted; + } + + public void setHotelsSorted(boolean hotelsSorted) { + this.hotelsSorted = hotelsSorted; + } + + public boolean isMealsSorted() { + return mealsSorted; + } + + public void setMealsSorted(boolean mealsSorted) { + this.mealsSorted = mealsSorted; + } + + public boolean isTotalsSorted() { + return totalsSorted; + } + + public void setTotalsSorted(boolean totalsSorted) { + this.totalsSorted = totalsSorted; + } + + public boolean isTransportSorted() { + return transportSorted; + } + + public void setTransportSorted(boolean transportSorted) { + this.transportSorted = transportSorted; + } + public List getRecords() { if (records==null) { initRecords(); @@ -73,4 +121,122 @@ records.add(rec); } + public String sortCityNames(){ + Collections.sort(records, new Comparator(){ + public int compare(Object record, Object record2) { + if (isCitySorted()) return ((ExpenseReportRecord)record).getCity().compareTo(((ExpenseReportRecord)record2).getCity()); + else return -((ExpenseReportRecord)record).getCity().compareTo(((ExpenseReportRecord)record2).getCity()); + } + }); + setCitySorted(!isCitySorted()); + setHotelsSorted(true); + setMealsSorted(true); + setTotalsSorted(true); + setTransportSorted(true); + return null; + } + + public String sortMeals(){ + Collections.sort(records, new Comparator(){ + public int compare(Object record, Object record2) { + if ((((ExpenseReportRecord)record).getTotalMeals() > ((ExpenseReportRecord)record2).getTotalMeals())&& isMealsSorted()) + if (isMealsSorted()){ + return 1;} + else{ + return -1; + } + else if (((ExpenseReportRecord)record).getTotalMeals() < ((ExpenseReportRecord)record2).getTotalMeals()) + if (isMealsSorted()){ + return -1; + } + else{ + return 1; + } + else return 0; + } + + }); + setMealsSorted(!isMealsSorted()); + setHotelsSorted(true); + setTotalsSorted(true); + setTransportSorted(true); + setCitySorted(true); + return null; + } + + public String sortTransport(){ + Collections.sort(records, new Comparator(){ + public int compare(Object record, Object record2) { + if (((ExpenseReportRecord)record).getTotalTransport() > ((ExpenseReportRecord)record2).getTotalTransport()) + if (isTransportSorted()) + return 1; + else + return -1; + else if (((ExpenseReportRecord)record).getTotalTransport() < ((ExpenseReportRecord)record2).getTotalTransport()) + if (isTransportSorted()) + return -1; + else + return 1; + else return 0; + } + + }); + setTransportSorted(!isTransportSorted()); + setMealsSorted(true); + setHotelsSorted(true); + setTotalsSorted(true); + setCitySorted(true); + return null; + } + + public String sortHotels(){ + Collections.sort(records, new Comparator(){ + public int compare(Object record, Object record2) { + if (((ExpenseReportRecord)record).getTotalHotels() > ((ExpenseReportRecord)record2).getTotalHotels()) + if (isHotelsSorted()) + return 1; + else + return -1; + else if (((ExpenseReportRecord)record).getTotalHotels() < ((ExpenseReportRecord)record2).getTotalHotels()) + if (isHotelsSorted()) + return -1; + else + return 1; + else return 0; + } + + }); + setHotelsSorted(!isHotelsSorted()); + setMealsSorted(true); + setTotalsSorted(true); + setCitySorted(true); + setTransportSorted(true); + return null; + } + + public String sortTotal(){ + Collections.sort(records, new Comparator(){ + public int compare(Object record, Object record2) { + if (((ExpenseReportRecord)record).getTotal() > ((ExpenseReportRecord)record2).getTotal()) + if (isTotalsSorted()) + return 1; + else + return -1; + else if (((ExpenseReportRecord)record).getTotal() < ((ExpenseReportRecord)record2).getTotal() ) + if (isTotalsSorted()) + return -1; + else + return 1; + else return 0; + } + + }); + setTotalsSorted(!isTotalsSorted()); + setMealsSorted(true); + setCitySorted(true); + setTransportSorted(true); + setHotelsSorted(true); + return null; + } + } Modified: trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml 2007-06-05 14:25:26 UTC (rev 1021) +++ trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml 2007-06-05 14:34:05 UTC (rev 1022) @@ -54,6 +54,11 @@ <to-view-id>/pages/example10.jsp</to-view-id> <redirect/> </navigation-case> + <navigation-case> + <from-outcome>example5</from-outcome> + <to-view-id>/pages/columnsSorting.jsp</to-view-id> + <redirect/> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>*</from-view-id> Modified: trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml.l4t =================================================================== --- trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-06-05 14:25:26 UTC (rev 1021) +++ trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-06-05 14:34:05 UTC (rev 1022) @@ -19,6 +19,10 @@ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput" ID="example10::#pages#example10.jsp" NAME="output4" PATH="/pages/example10.jsp" TARGET="rules:#pages#example10.jsp" TITLE="example10"/> + <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput" + ID="example5::#pages#columnsSorting.jsp" NAME="output5" + PATH="/pages/columnsSorting.jsp" + TARGET="rules:#pages#columnsSorting.jsp" TITLE="example5"/> </PROCESS-ITEM> </PROCESS-ITEM> <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:*" PATH="*" SHAPE="32,17,0,0"> @@ -38,4 +42,7 @@ PATH="/pages/example4.jsp" SHAPE="512,481,0,0"/> <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#pages#example1.jsp" PATH="/pages/example1.jsp" SHAPE="512,17,0,0"/> + <PROCESS-ITEM ENTITY="JSFProcessGroup" + NAME="rules:#pages#columnsSorting.jsp" + PATH="/pages/columnsSorting.jsp" SHAPE="512,289,0,0"/> </PROCESS> Added: trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp =================================================================== --- trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp (rev 0) +++ trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp 2007-06-05 14:34:05 UTC (rev 1022) @@ -0,0 +1,70 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> + +<html> +<head> + <title>RichFaces dataTable Article. Example #6. Sorting Rows.</title> +</head> +<body> + <f:view> + <h:outputText value="RichFaces dataTable Article. Example #6. Sorting Rows."/> + <h:form> + <rich:dataTable value="#{expenseReport.records}" var="record" id="table"> + <h:column> + <f:facet name="header"> + <a4j:commandLink value="City Name" action="#{expenseReport.sortCityNames}" reRender="table" ajaxSingle="true"/> + </f:facet> + <h:outputText value="#{record.city}" /> + </h:column> + <h:column> + <f:facet name="header"> + <a4j:commandLink value="Meals" action="#{expenseReport.sortMeals}" reRender="table" ajaxSingle="true"/> + </f:facet> + <h:outputText value="#{record.totalMeals}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </h:column> + <h:column> + <f:facet name="header"> + <a4j:commandLink value="Transport" action="#{expenseReport.sortTransport}" reRender="table" ajaxSingle="true"/> + </f:facet> + <h:outputText value="#{record.totalTransport}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </h:column> + <h:column> + <f:facet name="header"> + <a4j:commandLink value="Hotels" action="#{expenseReport.sortHotels}" reRender="table" ajaxSingle="true"/> + </f:facet> + <h:outputText value="#{record.totalHotels}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </h:column> + <h:column> + <f:facet name="header"> + <a4j:commandLink value="Total" action="#{expenseReport.sortTotal}" reRender="table" ajaxSingle="true"/> + </f:facet> + <h:outputText value="#{record.total}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </h:column> + </rich:dataTable> + <a4j:status startText="Sorting in progress" stopText=" " startStyle="color:red"> + </a4j:status> + </h:form> + <h:form> + <rich:separator lineType="dashed" height="1" style="padding-top:20px" /> + <h:outputText value="Source Code:" /> + <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces-samples/richface..."> + <h:outputText value="Page" /> + </h:outputLink> + <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces-samples/richface..."> + <h:outputText value="Project" /> + </h:outputLink> + <rich:separator lineType="dashed" height="1" style="padding-top:20px" /> + <h:commandLink value="back to example list" action="main"></h:commandLink> + </h:form> </f:view> +</body> +</html> \ No newline at end of file Modified: trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/main.jsp =================================================================== --- trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/main.jsp 2007-06-05 14:25:26 UTC (rev 1021) +++ trunk/richfaces-samples/richfaces-art-datatable/src/main/webapp/pages/main.jsp 2007-06-05 14:34:05 UTC (rev 1022) @@ -12,6 +12,7 @@ <h:commandLink value="Example #2. Using rich:column and rich:columnGroup" action="example2" /> <h:commandLink value="Example #3. Look-n-Feel Customization with Predefined Classes" action="example3" /> <h:commandLink value="Example #4. Look-n-Feel Customization. Using Classes and Styles" action="example4" /> + <h:commandLink value="Example #5. Sorting Rows." action="example5"/> <h:commandLink value="Example #10. Ajax Update" action="example10" /> </h:panelGrid>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1021 - trunk/sandbox-samples/panelmenu-sample.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-05 10:25:26 -0400 (Tue, 05 Jun 2007) New Revision: 1021 Modified: trunk/sandbox-samples/panelmenu-sample/ Log: Eclipse service files svn:ignored Property changes on: trunk/sandbox-samples/panelmenu-sample ___________________________________________________________________ Name: svn:ignore - target + target .classpath .settings .project

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1020 - in trunk: sandbox-samples/panel2-sample and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-05 10:23:23 -0400 (Tue, 05 Jun 2007) New Revision: 1020 Modified: trunk/sandbox-samples/panel2-sample/ trunk/sandbox/panel2/ Log: Eclipse service files svn:ignored Property changes on: trunk/sandbox/panel2 ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Property changes on: trunk/sandbox-samples/panel2-sample ___________________________________________________________________ Name: svn:ignore - target + .settings target .classpath .project

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1019 - trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: a.izobov Date: 2007-06-05 10:18:24 -0400 (Tue, 05 Jun 2007) New Revision: 1019 Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js Log: http://jira.jboss.com/jira/browse/RF-130 fixed Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-06-05 13:53:38 UTC (rev 1018) +++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-06-05 14:18:24 UTC (rev 1019) @@ -407,8 +407,10 @@ } this.id.style.visibility = ""; - - if (this.eventOnShow) this.eventOnShow(); + + var event = {}; + event.parameters = opts || {}; + if (this.eventOnShow) this.eventOnShow(event); }, startDrag: function(border) { @@ -424,7 +426,7 @@ } }, - hide: function() { + hide: function(opts) { //this.enableDocumentFocusElements(); this.traverseSelects(true); @@ -454,7 +456,9 @@ this.floatedToBody = false; } - if (this.eventOnHide) this.eventOnHide(); + var event = {}; + event.parameters = opts || {}; + if (this.eventOnHide) this.eventOnHide(event); }, doResizeOrMove: function(diff) { @@ -614,10 +618,10 @@ panel.modalPanel.show(opts); } -Richfaces.hideModalPanel = function (id) { +Richfaces.hideModalPanel = function (id, opts) { var panel = $(id + "Container"); if (!panel) { panel = Richfaces.findModalPanel(id); } - panel.modalPanel.hide(); + panel.modalPanel.hide(opts); }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1018 - in trunk/richfaces: datascroller/src/main/config/component and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: vkukharchuk Date: 2007-06-05 09:53:38 -0400 (Tue, 05 Jun 2007) New Revision: 1018 Modified: trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml trunk/richfaces/datascroller/src/main/config/component/datascroller.xml Log: Modified: trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml =================================================================== --- trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-06-05 13:06:12 UTC (rev 1017) +++ trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-06-05 13:53:38 UTC (rev 1018) @@ -71,7 +71,7 @@ <name>styleClass</name> <classname>java.lang.String</classname> <description> - The styleClass for the container div surrounding the component. + The styleClass for the container div surrounding the component </description> </property> <property> @@ -93,7 +93,7 @@ <name>trailerStyleClass</name> <classname>java.lang.String</classname> <description> - The trailerStyleClass for a div following a handle. + The trailerStyleClass for a div following a handle </description> </property> <property> @@ -154,7 +154,7 @@ <name>sliderListener</name> <classname>javax.faces.el.MethodBinding</classname> <description> - MethodBinding representing an action listener method that will be notified afrer changing of slider control position. + MethodBinding representing an action listener method that will be notified afrer changing of slider control position </description> </property> <property> @@ -175,7 +175,7 @@ <name>storeResults</name> <classname>boolean</classname> <description> - Specifies if the component will store a UIData object (your table rows) in session. + Specifies if the component will store a UIData object (your table rows) in session </description> </property> <property hidden="true"> Modified: trunk/richfaces/datascroller/src/main/config/component/datascroller.xml =================================================================== --- trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-05 13:06:12 UTC (rev 1017) +++ trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-05 13:53:38 UTC (rev 1018) @@ -66,28 +66,28 @@ <property> <name>handleValue</name> <classname>java.lang.String</classname> - <description>Current handle value. + <description>Current handle value </description> </property> <property> <name>binding</name> <classname>java.lang.String</classname> - <description>The attribute takes a value-binding expression for a component property of a backing bean. + <description>The attribute takes a value-binding expression for a component property of a backing bean </description> </property> <property> <name>scrollerListener</name> <classname>javax.faces.el.MethodBinding</classname> - <description>MethodBinding representing an action listener method that will be notified afrer scrolling. + <description>MethodBinding representing an action listener method that will be notified afrer scrolling </description> </property> <property> <name>pageIndex</name> <classname>java.lang.String</classname> - <description>Attribute defines index of initial page when this component is rendered. + <description>Attribute defines index of initial page when this component is rendered </description> </property> @@ -99,19 +99,19 @@ <property> <name>for</name> <classname>java.lang.String</classname> - <description>ID of the table component whose data is scrollled. + <description>ID of the table component whose data is scrollled </description> </property> <property> <name>selectedStyle</name> <classname>java.lang.String</classname> - <description>Corresponds to the HTML style attribute for the selected cell on scroller. + <description>Corresponds to the HTML style attribute for the selected cell on scroller </description> </property> <property> <name>selectedStyleClass</name> <classname>java.lang.String</classname> - <description>Corresponds to the HTML class attribute for the selected cell on scroller. + <description>Corresponds to the HTML class attribute for the selected cell on scroller </description> </property> <property> @@ -154,7 +154,7 @@ <name>renderIfSinglePage</name> <classname>boolean</classname> <description> - If renderIfSinglePage=true then datascroller is displayed on condition that the data hold on one page. + If renderIfSinglePage=true then datascroller is displayed on condition that the data hold on one page </description> <defaultvalue>true</defaultvalue> </property> @@ -164,14 +164,14 @@ <description> Delay ( in ms. ) for send ajax request on JavaScript event. In conjunction with events queue can reduce - number of requests on keyboard or mouse move events. + number of requests on keyboard or mouse move events </description> </property> <property> <name>fastStep</name> <classname>int</classname> <description> - The attribute indicates pages quantity to switch onto when fast scrolling is used. + The attribute indicates pages quantity to switch onto when fast scrolling is used </description> <defaultvalue>0</defaultvalue> </property> @@ -179,7 +179,7 @@ <property> <name>immediate</name> <classname>boolean</classname> - <description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase. + <description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase </description> </property> @@ -189,21 +189,21 @@ <property> <name>ignoreDupResponses</name> <classname>boolean</classname> - <description>If true, unfinished request will be aborted on new event. + <description>If true, unfinished request will be aborted on new event </description> <defaultvalue>true</defaultvalue> </property> <property> <name>eventsQueue</name> <classname>java.lang.String</classname> - <description>Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.). + <description>Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.) </description> </property> <property> <name>ajaxSingle</name> <classname>boolean</classname> - <description>If "true", submits ONLY one field/link, instead of all form controls. + <description>If "true", submits ONLY one field/link, instead of all form controls </description> <defaultvalue>true</defaultvalue> </property> @@ -221,7 +221,7 @@ <description> Possible values are: "show" - default mode. Controls are visible always. "hide" - controls are hidden. -"auto" - unnecessary controls are hidden. +"auto" - unnecessary controls are hidden </description> <defaultvalue><![CDATA["show"]]></defaultvalue> </property> @@ -231,7 +231,7 @@ <description> Possible values are: "show" - default mode. Controls are visible always. "hide" - controls are hidden. -"auto" - unnecessary controls are hidden. +"auto" - unnecessary controls are hidden </description> <defaultvalue><![CDATA["show"]]></defaultvalue> </property>

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2007