[richfaces-svn-commits] JBoss Rich Faces SVN: r4722 - in branches/3.1.x/ui/listShuttle/src: main/templates/org/richfaces and 1 other directories.

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

Author: nbelaevski
Date: 2007-12-11 11:23:01 -0500 (Tue, 11 Dec 2007)
New Revision: 4722

Modified:
   branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
   branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
   branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-1583
name for focus keepers removed

Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java	2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java	2007-12-11 16:23:01 UTC (rev 4722)
@@ -16,7 +16,6 @@
 
 import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.component.StateHolder;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.ConverterException;
@@ -28,7 +27,6 @@
 
 import org.ajax4jsf.Messages;
 import org.ajax4jsf.model.DataVisitor;
-import org.richfaces.component.UIOrderingList.ValueHolder;
 import org.richfaces.component.util.MessageUtil;
 import org.richfaces.model.ListShuttleDataModel;
 import org.richfaces.model.ListShuttleRowKey;
@@ -563,9 +561,8 @@
 			final ArrayList sourceList = new ArrayList();
 			final ArrayList targetList = new ArrayList();
 
-			final ListShuttleDataModel listShuttleDataModel = (ListShuttleDataModel) getExtendedDataModel();
 			try {
-				listShuttleDataModel.walk(context, new DataVisitor() {
+				walk(context, new DataVisitor() {
 
 					public void process(FacesContext context, Object rowKey,
 							Object argument) throws IOException {
@@ -579,7 +576,7 @@
 							targetList.add(getRowData());
 						}
 					}
-				}, null, null);
+				}, null);
 			} catch (IOException e) {
 				throw new ConverterException(e.getLocalizedMessage(), e);
 			}
@@ -593,7 +590,7 @@
 			setValid(false);
 		}	
 
-		//validateValue(context, newValue);
+		validateValue(context, newTargetValue);
 
 		// If our value is valid, store the new value, erase the
 		// "submitted" value, and emit a ValueChangeEvent if appropriate

Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-11 16:23:01 UTC (rev 4722)
@@ -60,7 +60,7 @@
 				<tr>
 					<td>
 					    <div class="rich-shuttle-source-items">
-					    	<input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
+					    	<input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;"/>
 							
 							<table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
 								<tbody>
@@ -122,7 +122,7 @@
 						<div class="rich-shuttle-target-items" >
 					    	<input type="hidden" value=":" style="display: none;" name="#{clientId}" />
 	
-					    	<input id="#{clientId}tlFocusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
+					    	<input id="#{clientId}tlFocusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;"/>
 							
 							<table id="#{clientId}tlTable" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
 								<tbody>

Modified: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java	2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java	2007-12-11 16:23:01 UTC (rev 4722)
@@ -23,7 +23,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UICommand;
@@ -32,7 +31,6 @@
 import javax.faces.component.html.HtmlCommandLink;
 import javax.faces.component.html.HtmlForm;
 import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.ValueBinding;
@@ -187,8 +185,8 @@
          });
     	
         externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
-        externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
         externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
+        externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
         listShuttle.processDecodes(facesContext);
         assertTrue(facesContext.getMessages().hasNext());
     }