[richfaces-svn-commits] JBoss Rich Faces SVN: r2083 - in trunk: ui/scrollable-grid/src/main/java/org/richfaces/component and 2 other directories.

Author: maksimkaszynski Date: 2007-08-06 12:56:37 -0400 (Mon, 06 Aug 2007) New Revision: 2083 Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java Log: removed system.out calls from classes Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid&qu... <ui:composition> <sg:column width="200px"> Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid&qu... <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model1}" var="issues" Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid&qu... <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model2}" var="issues" Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid&qu... <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model3}" var="issues" Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-08-06 16:56:37 UTC (rev 2083) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid" xmlns:a4j="http://richfaces.org/a4j"> <body> <f:view> Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-06 16:56:37 UTC (rev 2083) @@ -51,10 +51,11 @@ public static final String COMPONENT_TYPE = "org.richfaces.component.ScrollableGrid"; public static final String SORT_SINGLE = "single"; public static final String SORT_MULTI = "multi"; + + private final static Log log = LogFactory.getLog(UIScrollableGrid.class); private boolean MODEL_RANGE = false; - private final static Log log = LogFactory.getLog(UIScrollableGrid.class); private transient Collection partialUpdateChildren; @@ -127,25 +128,37 @@ public void processDecodes(FacesContext faces) { MODEL_RANGE = true; - System.out.println("UIScrollableGrid.processDecodes()"); + if (log.isTraceEnabled()) { + log.trace("UIScrollableGrid.processDecodes(faces)"); + } super.processDecodes(faces); } public void processValidators(FacesContext faces) { MODEL_RANGE = false; - System.out.println("UIScrollableGrid.processValidators()"); + if (log.isTraceEnabled()) { + log.trace("UIScrollableGrid.processValidators(faces)"); + } super.processValidators(faces); } public void processUpdates(FacesContext faces) { MODEL_RANGE = false; - System.out.println("UIScrollableGrid.processUpdates()"); + + if (log.isTraceEnabled()) { + log.trace("UIScrollableGrid.processUpdates(faces)"); + } + super.processUpdates(faces); ranges.clear(); } public void encodeBegin(FacesContext context) throws IOException { - System.out.println("UIScrollableGrid.encodeBegin()"); + + if (log.isTraceEnabled()) { + log.trace("UIScrollableGrid.encodeBegin(context)"); + } + MODEL_RANGE = true; super.encodeBegin(context); } @@ -323,7 +336,12 @@ for (Iterator iter = ranges.iterator(); iter.hasNext();) { ScrollableGridRange range = (ScrollableGridRange) iter.next(); - System.out.println("Range is: " + range.getFirst() + " - " + range.getLast() + " sortOrder: " + range.getSortOrder() ); + + if (log.isDebugEnabled()) { + log.debug("Range is: " + range.getFirst() + " - " + range.getLast() + " sortOrder: " + range.getSortOrder() ); + } + + getExtendedDataModel().walk(faces, visitor,range, argument); } @@ -368,11 +386,18 @@ } public SortListener getSortListener() { - if (sortListener != null) return sortListener; + if (sortListener != null) { + return sortListener; + } + if (SORT_MULTI.equals(getSortMode())) { + return MultiColumnSortListener.INSTANCE; + } else { + return SingleColumnSortListener.INSTANCE; + } } Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-06 16:56:37 UTC (rev 2083) @@ -321,11 +321,8 @@ state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid)); String row_id = null; - /* - System.out.println("row data index: " + grid.getRowIndex()); - System.out.println("rows count " + grid.getRows()); - System.out.println("local rows " + state.getRowIndex()); - */ + + for (Iterator iter = grid.getChildren().iterator(); iter.hasNext(); ) { UIComponent kid = (UIComponent) iter.next(); @@ -457,9 +454,9 @@ state.setColumType(COLUMN_NORMAL_TYPE); } - System.out.println(""); - System.out.println("ScrollableGridBaseRenderer.renderGridBody()"); - System.out.println(""); + if (log.isTraceEnabled()) { + log.trace("ScrollableGridBaseRenderer.renderGridBody(context, grid, isFrozen)"); + } state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid)); state.setFrozenPart(isFrozen); Modified: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java =================================================================== --- trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-06 16:56:37 UTC (rev 2083) @@ -65,31 +65,11 @@ public void testComponent() throws Exception { -/* - HtmlPage renderedView = renderView(); - assertNotNull(renderedView); - System.out.println(renderedView.getWebResponse().getContentAsString()); - HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId()); - assertNotNull(element); -*/ -// values[0] = component.saveState(facesContext); - } -/* - public void testDefaultValues(){ - - } -*/ + public void testContext(){ Object state = component.saveState(facesContext); -/* - UIViewRoot root = facesContext.getViewRoot(); - root.processDecodes(facesContext); - root.processValidators(facesContext); - root.processUpdates(facesContext); - root.processApplication(facesContext); -*/ testRestoreState(state); } Modified: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java =================================================================== --- trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java 2007-08-06 16:42:55 UTC (rev 2082) +++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java 2007-08-06 16:56:37 UTC (rev 2083) @@ -104,31 +104,11 @@ public void testComponent() throws Exception { assertEquals("org.richfaces.renderkit.html.ScrollableGridRenderer", component.getRendererType()); -/* - HtmlPage renderedView = renderView(); - assertNotNull(renderedView); - System.out.println(renderedView.getWebResponse().getContentAsString()); - HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId()); - assertNotNull(element); -*/ -// values[0] = component.saveState(facesContext); - + } -/* - public void testDefaultValues(){ - - } -*/ public void testContext(){ Object state = component.saveState(facesContext); -/* - UIViewRoot root = facesContext.getViewRoot(); - root.processDecodes(facesContext); - root.processValidators(facesContext); - root.processUpdates(facesContext); - root.processApplication(facesContext); -*/ testRestoreState(state); }