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

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"