You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/08/10 15:13:34 UTC

svn commit: r1804677 - in /myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit: RendererUtils.java html/HtmlCheckboxRendererBase.java

Author: tandraschko
Date: Thu Aug 10 15:13:34 2017
New Revision: 1804677

URL: http://svn.apache.org/viewvc?rev=1804677&view=rev
Log:
MYFACES-3163 [perf] review working with SelectItem(s)

Modified:
    myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
    myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java

Modified: myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=1804677&r1=1804676&r2=1804677&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Thu Aug 10 15:13:34 2017
@@ -770,13 +770,13 @@ public final class RendererUtils
      * @param facesContext
      * @return List of SelectItem Objects
      */
-    public static List getSelectItemList(UISelectMany uiSelectMany,
+    public static List<SelectItem> getSelectItemList(UISelectMany uiSelectMany,
             FacesContext facesContext)
     {
         return internalGetSelectItemList(uiSelectMany, facesContext);
     }
 
-    private static List internalGetSelectItemList(UIComponent uiComponent,
+    private static List<SelectItem> internalGetSelectItemList(UIComponent uiComponent,
             FacesContext facesContext)
     {
         /* TODO: Shall we cache the list in a component attribute?
@@ -787,10 +787,9 @@ public final class RendererUtils
         }
          */
 
-        List list = new ArrayList();
+        List<SelectItem> list = new ArrayList<SelectItem>();
 
-        for (Iterator iter = new SelectItemsIterator(uiComponent, facesContext); iter
-                .hasNext();)
+        for (SelectItemsIterator iter = new SelectItemsIterator(uiComponent, facesContext); iter.hasNext();)
         {
             list.add(iter.next());
         }

Modified: myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=1804677&r1=1804676&r2=1804677&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Thu Aug 10 15:13:34 2017
@@ -19,7 +19,6 @@
 package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -151,11 +150,13 @@ public class HtmlCheckboxRendererBase ex
 
         int itemNum = 0;
 
-        for (Iterator it = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(
-                selectMany, facesContext)
-                .iterator(); it.hasNext();)
+        
+        List<SelectItem> selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(
+                selectMany, facesContext);
+
+        for (int i = 0; i < selectItemList.size(); i++)
         {
-            SelectItem selectItem = (SelectItem) it.next();
+            SelectItem selectItem = (SelectItem) selectItemList.get(i);
             
             itemNum = renderGroupOrItemCheckbox(facesContext, selectMany, 
                                                 selectItem, useSubmittedValues, lookupSet,