myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmarinsc...@apache.org
Subject svn commit: r294838 - /myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
Date Tue, 04 Oct 2005 17:12:17 GMT
Author: mmarinschek
Date: Tue Oct  4 10:12:14 2005
New Revision: 294838

URL: http://svn.apache.org/viewcvs?rev=294838&view=rev
Log:
fix for MYFACES-662

Modified:
    myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java

Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java?rev=294838&r1=294837&r2=294838&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
(original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
Tue Oct  4 10:12:14 2005
@@ -590,17 +590,6 @@
         List selectItemList=null;
         Converter converter=null;
         boolean isSelectOne=false;
-        if (uiComponent instanceof UISelectMany) {
-        	isSelectOne = false;
-            selectItemList = RendererUtils
-                    .getSelectItemList((UISelectMany) uiComponent);
-            converter = findUISelectManyConverterFailsafe(facesContext, uiComponent);
-        } else if(uiComponent instanceof UISelectOne){
-        	isSelectOne = true;
-            selectItemList = RendererUtils
-                    .getSelectItemList((UISelectOne) uiComponent);
-            converter = findUIOutputConverterFailSafe(facesContext, uiComponent);
-        }
 
         if(uiComponent instanceof UISelectBoolean)
         {
@@ -616,6 +605,18 @@
         }
         else
         {
+            if (uiComponent instanceof UISelectMany) {
+                isSelectOne = false;
+                selectItemList = RendererUtils
+                        .getSelectItemList((UISelectMany) uiComponent);
+                converter = findUISelectManyConverterFailsafe(facesContext, uiComponent);
+            } else if(uiComponent instanceof UISelectOne){
+                isSelectOne = true;
+                selectItemList = RendererUtils
+                        .getSelectItemList((UISelectOne) uiComponent);
+                converter = findUIOutputConverterFailSafe(facesContext, uiComponent);
+            }
+
             writer.startElement(isSelectOne ? HTML.SPAN_ELEM : HTML.UL_ELEM, uiComponent);
             writeIdIfNecessary(writer, uiComponent, facesContext);
 



Mime
View raw message