You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2006/11/25 01:16:34 UTC

svn commit: r479054 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java

Author: cagatay
Date: Fri Nov 24 16:16:33 2006
New Revision: 479054

URL: http://svn.apache.org/viewvc?view=rev&rev=479054
Log:
Fixed TOMAHAWK-803 and other validation issues. Component was omitting the default validation behavior in UIInput and UISelectOne
so it was ignoring required attribute and it's other validators. Removed overriden validation since it's already implemented in UISelectOne.

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java?view=diff&rev=479054&r1=479053&r2=479054
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java Fri Nov 24 16:16:33 2006
@@ -26,7 +26,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.faces.application.FacesMessage;
+import javax.faces.component.UISelectItems;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -34,7 +34,6 @@
 
 import org.apache.myfaces.component.html.ext.HtmlSelectOneMenu;
 import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.myfaces.shared_tomahawk.util.MessageUtils;
 
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)
@@ -148,17 +147,11 @@
     }
 
     protected void validateValue(FacesContext context, Object value) {
-        if( !isValid() || value == null )
-            return;
-
-        // selected value must match to one of the available options
-        for(Iterator i = getLanguagesChoicesAsSelectItemList().iterator(); i.hasNext() ; ){
-            if( value.equals( ((SelectItem)i.next()).getValue() ) )
-                return;
-        }
-
-        MessageUtils.addMessage(FacesMessage.SEVERITY_ERROR, INVALID_MESSAGE_ID,  new Object[] {getId()}, context);
-
-        setValid(false);
+    	UISelectItems selectItems = new UISelectItems();
+    	selectItems.setTransient(true);
+    	selectItems.setValue(getLanguagesChoicesAsSelectItemList());
+    	getChildren().add(selectItems);
+    	
+    	super.validateValue(context,value);
     }
 }