[richfaces-svn-commits] JBoss Rich Faces SVN: r357 - in trunk/richfaces/datascroller/src: main/java/org/richfaces/renderkit/html and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Apr 11 09:02:11 EDT 2007
Author: A.Skokov
Date: 2007-04-11 09:02:10 -0400 (Wed, 11 Apr 2007)
New Revision: 357
Added:
trunk/richfaces/datascroller/src/test/java/org/richfaces/event/
trunk/richfaces/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerEvent.java
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
test updated
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerEvent.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerEvent.java 2007-04-11 13:00:35 UTC (rev 356)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerEvent.java 2007-04-11 13:02:10 UTC (rev 357)
@@ -38,8 +38,8 @@
* Creates a new ScrollerEvent.
*
* @param component the source of the event
- * @param thisOldScrollerVal the previously showing item identifier
- * @param thisNewSliderVal the currently showing item identifier
+ * @param thisOldScrolVal the previously showing item identifier
+ * @param thisNewScrolVal the currently showing item identifier
*/
public DataScrollerEvent(UIComponent component, String thisOldScrolVal, String thisNewScrolVal) {
super(component);
@@ -66,6 +66,6 @@
* @param listener the slider listener
*/
public void processListener(FacesListener listener){
- ((DataScrollerListener) listener).processScroller(this);
+ ((DataScrollerListener) listener).processScroller(this);
}
}
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-11 13:00:35 UTC (rev 356)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-11 13:02:10 UTC (rev 357)
@@ -21,210 +21,190 @@
package org.richfaces.renderkit.html;
-import java.io.IOException;
-import java.util.Map;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.richfaces.component.UIDatascroller;
import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
import org.ajax4jsf.framework.util.javascript.JSFunction;
+import org.richfaces.component.UIDatascroller;
import org.richfaces.event.DataScrollerEvent;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.util.Map;
+public class DataScrollerRenderer extends HeaderResourcesRendererBase {
-public class DataScrollerRenderer extends HeaderResourcesRendererBase {
-
- protected Class getComponentClass() {
- return UIDatascroller.class;
- }
+ protected Class getComponentClass() {
+ return UIDatascroller.class;
+ }
- public void encodeBegin(FacesContext context, UIComponent component)
- throws IOException {
-
- UIDatascroller scroller = (UIDatascroller) component;
-
- //if ((scroller.getRowCount()-scroller.getFirstRow())<scroller.getRows() && scroller.getRowCount()>=scroller.getRows()){
- // scroller.setFirstRow(scroller.getRowCount()-scroller.getRows()+1);
- //}
-
- if (scroller.getHandleValue()==null){
- scroller.setHandleValue("1");
+ public void encodeBegin(FacesContext context, UIComponent component)
+ throws IOException {
+
+ UIDatascroller scroller = (UIDatascroller) component;
+
+ //if ((scroller.getRowCount()-scroller.getFirstRow())<scroller.getRows() && scroller.getRowCount()>=scroller.getRows()){
+ // scroller.setFirstRow(scroller.getRowCount()-scroller.getRows()+1);
+ //}
+
+ if (scroller.getHandleValue() == null) {
+ scroller.setHandleValue("1");
}
-
- if (scroller.getPageCount() < Integer.parseInt(scroller.getHandleValue())){
-
- scroller.setPageIndex(scroller.getPageCount()-1);
- scroller.setHandleValue(Integer.toString(scroller.getPageCount()));
- }
- else{
-
- scroller.setPageIndex(Integer.parseInt(scroller.getHandleValue())-1);
- }
-
-
-
- if (!(scroller.getPageCount()==1) || (scroller.isRenderIfSinglePage())){
- super.encodeBegin(context, component);
+
+ if (scroller.getPageCount() < Integer.parseInt(scroller.getHandleValue()))
+ {
+
+ scroller.setPageIndex(scroller.getPageCount() - 1);
+ scroller.setHandleValue(Integer.toString(scroller.getPageCount()));
+ } else {
+
+ scroller.setPageIndex(Integer.parseInt(scroller.getHandleValue()) - 1);
}
+
+
+ if (!(scroller.getPageCount() == 1) || (scroller.isRenderIfSinglePage()))
+ {
+ super.encodeBegin(context, component);
+ }
}
public void encodeEnd(FacesContext context, UIComponent component)
- throws IOException {
- UIDatascroller scroller = (UIDatascroller) component;
-
- if (!(scroller.getPageCount()==1) || (scroller.isRenderIfSinglePage())){
- super.encodeEnd(context, component);
- }
+ throws IOException {
+ UIDatascroller scroller = (UIDatascroller) component;
+
+ if (!(scroller.getPageCount() == 1) || (scroller.isRenderIfSinglePage()))
+ {
+ super.encodeEnd(context, component);
+ }
}
-
- //public static final String RENDERER_TYPE = Datascroller.RENDERER_TYPE;
+ private static final String PARAM_SUFFIX = "_parameter";
- private static final String PARAM_SUFFIX = "_parameter";
+ public void decode(FacesContext context, UIComponent component) {
- public void decode(FacesContext context, UIComponent component) {
-
- String param = (String) getParamMap(context).get(
- component.getClientId(context) + PARAM_SUFFIX);
- UIDatascroller scroller = (UIDatascroller) component;
- if (scroller.getHandleValue()==null){
- scroller.setHandleValue("1");
+ String param = (String) getParamMap(context).get(
+ component.getClientId(context) + PARAM_SUFFIX);
+ UIDatascroller scroller = (UIDatascroller) component;
+ if (scroller.getHandleValue() == null) {
+ scroller.setHandleValue("1");
}
- if (param != null) {
- //UIDatascroller scroller = (UIDatascroller) component;
- scroller.setPage(param);
- scroller.getPageIndex();
- String oldScrolVal = scroller.getHandleValue();
- String newScrolVal = Integer.toString(scroller.getPageIndex());
- if (!newScrolVal.equals(oldScrolVal)) {
+ if (param != null) {
+ //UIDatascroller scroller = (UIDatascroller) component;
+ scroller.setPage(param);
+ scroller.getPageIndex();
+ String oldScrolVal = scroller.getHandleValue();
+ String newScrolVal = Integer.toString(scroller.getPageIndex());
+ if (!newScrolVal.equals(oldScrolVal)) {
- scroller.setHandleValue(newScrolVal);
- DataScrollerEvent event = new DataScrollerEvent(scroller, oldScrolVal, newScrolVal);
- event.queue();
+ scroller.setHandleValue(newScrolVal);
+ DataScrollerEvent event = new DataScrollerEvent(scroller, oldScrolVal, newScrolVal);
+ event.queue();
- AjaxRendererUtils.addRegionByName(context, component, component.getId());
- AjaxRendererUtils.addRegionByName(context, component, scroller.getFor());
- }
-
-
- }
-
-
-
-
-
-
-
+ AjaxRendererUtils.addRegionByName(context, component, component.getId());
+ AjaxRendererUtils.addRegionByName(context, component, scroller.getFor());
+ }
+ }
+ }
- }
+ public void renderPager(FacesContext context, UIComponent component) throws IOException {
+ ResponseWriter out = context.getResponseWriter();
+ UIDatascroller scroller = (UIDatascroller) component;
+ int currentPage = scroller.getPageIndex();
+ int maxPages = scroller.getMaxPages();
+ if (maxPages <= 1) {
+ maxPages = 1;
+ }
+ int pageCount = scroller.getPageCount();
+ if (pageCount <= 1) {
+ return;
+ }
+ int pageIndex = scroller.getPageIndex();
+ int delta = maxPages / 2;
- public void renderPager(FacesContext context, UIComponent component) throws IOException{
- ResponseWriter out = context.getResponseWriter();
- UIDatascroller scroller=(UIDatascroller)component;
- int currentPage = scroller.getPageIndex();
+ int pages;
+ int start;
+ if (pageCount > maxPages && pageIndex > delta) {
+ pages = maxPages;
+ start = pageIndex - pages / 2 - 1;
+ if (start + pages > pageCount) {
+ start = pageCount - pages;
+ }
+ } else {
+ pages = pageCount < maxPages ? pageCount : maxPages;
+ start = 0;
+ }
- int maxPages = scroller.getMaxPages();
- if (maxPages <= 1) {
- maxPages = 1;
- }
- int pageCount = scroller.getPageCount();
- if (pageCount <= 1) {
- return;
- }
- int pageIndex = scroller.getPageIndex();
- int delta = maxPages / 2;
+ for (int i = start, size = start + pages; i < size; i++) {
+ //String styleClass;
+ //String style;
- int pages;
- int start;
- if (pageCount > maxPages && pageIndex > delta) {
- pages = maxPages;
- start = pageIndex - pages / 2 - 1;
- if (start + pages > pageCount) {
- start = pageCount - pages;
- }
- }
- else {
- pages = pageCount < maxPages ? pageCount : maxPages;
- start = 0;
- }
+ boolean isCurrentPage = (i + 1 == currentPage);
+ /*
+ if (isCurrentPage) {
+ styleClass = scroller.getSelectedStyleClass();
+ style = scroller.getSelectedStyle();
+ }
+ else {
+ styleClass = scroller.getStyleClass();
+ style = scroller.getStyle();
+ }
- for (int i = start, size = start + pages; i < size; i++) {
- //String styleClass;
- //String style;
+ if (style==null){
+ style="";
+ }
+ if (styleClass==null){
+ styleClass="";
+ }
+ */
- boolean isCurrentPage = (i + 1 == currentPage);
- /*
- if (isCurrentPage) {
- styleClass = scroller.getSelectedStyleClass();
- style = scroller.getSelectedStyle();
- }
- else {
- styleClass = scroller.getStyleClass();
- style = scroller.getStyle();
- }
-
- if (style==null){
- style="";
- }
- if (styleClass==null){
- styleClass="";
- }
- */
-
- out.startElement("td", component);
- if (isCurrentPage){
- out.writeAttribute("align", "center", null);
- //out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+scroller.getStyleClass(), null);
- out.writeAttribute("class", "dr-dscr-act rich-datascr-act", null);
- out.writeAttribute("style", ""+scroller.getSelectedStyle(), null);
- }
- else{
- out.writeAttribute("align", "center", null);
- //out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null);
- out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact", null);
- //out.writeAttribute("style", ""+scroller.getStyle(), null);
- out.writeAttribute("onclick", getOnClick(context, component,Integer.toString(i+1)) , null);
- }
- out.writeText(Integer.toString(i + 1), null);
- //renderChild(context, link);
- out.endElement("td");
- }
+ out.startElement("td", component);
+ if (isCurrentPage) {
+ out.writeAttribute("align", "center", null);
+ //out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+scroller.getStyleClass(), null);
+ out.writeAttribute("class", "dr-dscr-act rich-datascr-act", null);
+ out.writeAttribute("style", "" + scroller.getSelectedStyle(), null);
+ } else {
+ out.writeAttribute("align", "center", null);
+ //out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null);
+ out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact", null);
+ //out.writeAttribute("style", ""+scroller.getStyle(), null);
+ out.writeAttribute("onclick", getOnClick(context, component, Integer.toString(i + 1)), null);
+ }
+ out.writeText(Integer.toString(i + 1), null);
+ //renderChild(context, link);
+ out.endElement("td");
+ }
- }
+ }
+ private Map getParamMap(FacesContext context) {
+ return context.getExternalContext().getRequestParameterMap();
+ }
+ public String getOnClick(FacesContext context, UIComponent component, String value) {
- private Map getParamMap(FacesContext context) {
- return context.getExternalContext().getRequestParameterMap();
- }
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(component,
+ context);
+ UIDatascroller scroller = (UIDatascroller) component;
+ Map eventOptions = AjaxRendererUtils.buildEventOptions(context, component);
+ Map parameters = (Map) eventOptions.get("parameters");
+ parameters.put(scroller.getClientId(context) + PARAM_SUFFIX, value);
+ function.addParameter(eventOptions);
+ StringBuffer buffer = new StringBuffer();
+ function.appendScript(buffer);
+ buffer.append("; return false;");
+ String script = buffer.toString();
+ return script;
+ }
-
- public String getOnClick(FacesContext context, UIComponent component,String value) {
-
- JSFunction function = AjaxRendererUtils.buildAjaxFunction(component,
- context);
- UIDatascroller scroller=(UIDatascroller)component;
- Map eventOptions = AjaxRendererUtils.buildEventOptions(context,component);
- Map parameters = (Map) eventOptions.get("parameters");
- parameters.put(scroller.getClientId(context) + PARAM_SUFFIX, value);
- function.addParameter(eventOptions);
- StringBuffer buffer = new StringBuffer();
- function.appendScript(buffer);
- buffer.append("; return false;");
- String script = buffer.toString();
- return script;
- }
-
-
- /**
- * Creates HtmlAjaxCommandLink sets its id, value and reRender and UIParameter
- */
- public boolean getRendersChildren() {
- return true;
- }
+ /**
+ * Creates HtmlAjaxCommandLink sets its id, value and reRender and UIParameter
+ */
+ public boolean getRendersChildren() {
+ return true;
+ }
}
Added: trunk/richfaces/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java
===================================================================
--- trunk/richfaces/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java (rev 0)
+++ trunk/richfaces/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java 2007-04-11 13:02:10 UTC (rev 357)
@@ -0,0 +1,82 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.event;
+
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
+import javax.faces.component.UIData;
+import javax.faces.component.html.HtmlDataTable;
+import javax.faces.event.PhaseId;
+import javax.faces.event.FacesListener;
+
+/**
+ * Unit test for DataScrollerEvent.
+ */
+public class DataScrollerEventTest extends AbstractAjax4JsfTestCase {
+
+ private DataScrollerEvent event;
+ private UIData data;
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public DataScrollerEventTest(String testName) {
+ super(testName);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
+
+ data = (UIData) application.createComponent(HtmlDataTable.COMPONENT_TYPE);
+ event = new DataScrollerEvent(data, "old", "new");
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ event = null;
+ data = null;
+ }
+
+ public void testEvent() throws Exception {
+ assertEquals(PhaseId.INVOKE_APPLICATION, event.getPhaseId());
+ assertEquals("old", event.getOldScrolVal());
+ assertEquals("new", event.getNewScrolVal());
+ assertFalse(event.isAppropriateListener(new TestFacesListener()));
+ assertTrue(event.isAppropriateListener(new TestDataScrollerListener()));
+ }
+
+ class TestFacesListener implements FacesListener {
+
+ }
+
+ class TestDataScrollerListener implements DataScrollerListener {
+ public void processScroller(DataScrollerEvent event) {
+ }
+ }
+}
More information about the richfaces-svn-commits
mailing list