[richfaces-svn-commits] JBoss Rich Faces SVN: r4464 - branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component.

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

Author: nbelaevski
Date: 2007-12-04 12:18:56 -0500 (Tue, 04 Dec 2007)
New Revision: 4464

Modified:
   branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
   branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
Log:
validation error message added
immediate validation fixed

Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java	2007-12-04 17:18:50 UTC (rev 4463)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java	2007-12-04 17:18:56 UTC (rev 4464)
@@ -362,7 +362,7 @@
 	/**
 	 * Executes validation logic.
 	 */
-	private void executeValidate(FacesContext context) {
+	protected void executeValidate(FacesContext context) {
 		try {
 			validate(context);
 		} catch (RuntimeException e) {

Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java	2007-12-04 17:18:50 UTC (rev 4463)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java	2007-12-04 17:18:56 UTC (rev 4464)
@@ -60,19 +60,20 @@
 					faces.addMessage(this.getClientId(faces), message);
 
 					setValid(false);
-					
-					iterator.remove();
-					
-					submittedValue.selection.remove(value);
-					
-					if (submittedValue.activeItem != null && submittedValue.activeItem.equals(value)) {
-						submittedValue.activeItem = null;
-					}
+					break;
 				}
 			}
 		}
-				
-		this.iterate(faces, decodeVisitor, argument);
+		
+		if (isImmediate()) {
+			executeValidate(faces);
+		}
+		
+        if (!isValid()) {
+            faces.renderResponse();
+        }
+
+        this.iterate(faces, decodeVisitor, argument);
 	}
 
 	private transient Map dataMap;