[richfaces-svn-commits] JBoss Rich Faces SVN: r389 - in trunk/richfaces/datascroller/src/main/java/org/richfaces: renderkit/html and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: sergeyhalipov
Date: 2007-04-12 12:41:26 -0400 (Thu, 12 Apr 2007)
New Revision: 389

Modified:
   trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerAdapter.java
   trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
Block changes in dataTable when validation or other errors occured in form.

Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerAdapter.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerAdapter.java	2007-04-12 16:24:47 UTC (rev 388)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/event/DataScrollerAdapter.java	2007-04-12 16:41:26 UTC (rev 389)
@@ -26,7 +26,9 @@
 import javax.faces.el.MethodBinding;
 import javax.faces.context.FacesContext;
 
+import org.richfaces.component.UIDatascroller;
 
+
 public class DataScrollerAdapter implements DataScrollerListener, StateHolder {
 
     public static Class[] SIGNATURE = new Class[] { DataScrollerEvent.class };
@@ -56,6 +58,9 @@
     	if (scrollerMethod!=null){
           scrollerMethod.invoke(context, new Object[]{event});
     	}
+    	UIDatascroller scroller = ((UIDatascroller)event.getComponent());
+    	scroller.setPage(event.getNewScrolVal());
+    	scroller.setHandleValue(event.getNewScrolVal());
     }
 
     /**

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-12 16:24:47 UTC (rev 388)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java	2007-04-12 16:41:26 UTC (rev 389)
@@ -91,14 +91,14 @@
             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());
+            scroller.setPage(oldScrolVal);
             if (!newScrolVal.equals(oldScrolVal)) {
 
-                scroller.setHandleValue(newScrolVal);
                 DataScrollerEvent event = new DataScrollerEvent(scroller, oldScrolVal, newScrolVal);
                 event.queue();