primefaces#3189

tandraschko · tandraschko · commit fb157e969524 · 2018-03-02T12:19:51.000+01:00
diff --git a/src/main/java/org/primefaces/behavior/base/AbstractBehaviorHandler.java b/src/main/java/org/primefaces/behavior/base/AbstractBehaviorHandler.java
@@ -88,7 +88,8 @@ public void apply(FaceletContext faceletContext, UIComponent parent) throws IOEx
             }
 
             boolean supportedEvent = false;
-            for (AttachedObjectTarget target : targetList) {
+            for (int i = 0; i < targetList.size(); i++) {
+                AttachedObjectTarget target = targetList.get(i);
                 if (target instanceof BehaviorHolderAttachedObjectTarget) {
                     BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target;
                     if ((null != eventName && eventName.equals(behaviorTarget.getName()))
diff --git a/src/main/java/org/primefaces/component/accordionpanel/AccordionPanelRenderer.java b/src/main/java/org/primefaces/component/accordionpanel/AccordionPanelRenderer.java
@@ -162,15 +162,16 @@ protected void encodeTabs(FacesContext context, AccordionPanel acco) throws IOEx
                 : Arrays.asList(activeIndex.split(","));        
 
         if (var == null) {
-            int i = 0;
+            int j = 0;
 
-            for (UIComponent child : acco.getChildren()) {
+            for (int i = 0; i < acco.getChildCount(); i++) {
+                UIComponent child = acco.getChildren().get(i);
                 if (child.isRendered() && child instanceof Tab) {
-                    boolean active = activeIndexes.indexOf(Integer.toString(i)) != -1;
+                    boolean active = activeIndexes.indexOf(Integer.toString(j)) != -1;
 
                     encodeTab(context, acco, (Tab) child, active, dynamic, rtl);
 
-                    i++;
+                    j++;
                 }
             }
         }
diff --git a/src/main/java/org/primefaces/component/calendar/CalendarUtils.java b/src/main/java/org/primefaces/component/calendar/CalendarUtils.java
@@ -16,9 +16,7 @@
 package org.primefaces.component.calendar;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import javax.el.ValueExpression;
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
@@ -32,13 +30,8 @@
  */
 public class CalendarUtils {
 
-    private final static List<PatternConverter> PATTERN_CONVERTERS;
-
-    static {
-        PATTERN_CONVERTERS = new ArrayList<PatternConverter>();
-        PATTERN_CONVERTERS.add(new TimePatternConverter());
-        PATTERN_CONVERTERS.add(new DatePatternConverter());
-    }
+    private final static PatternConverter[] PATTERN_CONVERTERS =
+            new PatternConverter[] { new TimePatternConverter(), new DatePatternConverter() };
 
     public static String getValueAsString(FacesContext context, Calendar calendar) {
         Object submittedValue = calendar.getSubmittedValue();
diff --git a/src/main/java/org/primefaces/component/headerrow/HeaderRowRenderer.java b/src/main/java/org/primefaces/component/headerrow/HeaderRowRenderer.java
@@ -37,9 +37,10 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
         writer.writeAttribute("class", DataTable.HEADER_ROW_CLASS, null);
 
         boolean isFirstColumn = true;
-        for (UIComponent kid : row.getChildren()) {
-            if (kid.isRendered() && kid instanceof Column) {
-                Column column = (Column) kid;
+        for (int i = 0; i < row.getChildCount(); i++) {
+            UIComponent child = row.getChildren().get(i);
+            if (child.isRendered() && child instanceof Column) {
+                Column column = (Column) child;
                 String style = column.getStyle();
                 String styleClass = column.getStyleClass();
 
diff --git a/src/main/java/org/primefaces/component/messages/MessagesRenderer.java b/src/main/java/org/primefaces/component/messages/MessagesRenderer.java
@@ -86,7 +86,8 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
             }
         }
 
-        for (FacesMessage message : messages) {
+        for (int i = 0; i < messages.size(); i++) {
+            FacesMessage message = messages.get(i);
             FacesMessage.Severity severity = message.getSeverity();
 
             if (severity.equals(FacesMessage.SEVERITY_INFO)) {
@@ -165,14 +166,15 @@ protected void encodeSeverityMessages(FacesContext context, Messages uiMessages,
 
         writer.startElement("ul", null);
 
-        for (FacesMessage msg : messages) {
+        for (int i = 0; i < messages.size(); i++) {
+            FacesMessage message = messages.get(i);
             writer.startElement("li", null);
 
             writer.writeAttribute("role", "alert", null);
             writer.writeAttribute("aria-atomic", "true", null);
 
-            String summary = msg.getSummary() != null ? msg.getSummary() : "";
-            String detail = msg.getDetail() != null ? msg.getDetail() : summary;
+            String summary = message.getSummary() != null ? message.getSummary() : "";
+            String detail = message.getDetail() != null ? message.getDetail() : summary;
 
             if (uiMessages.isShowSummary()) {
                 writer.startElement("span", null);
@@ -204,7 +206,7 @@ protected void encodeSeverityMessages(FacesContext context, Messages uiMessages,
 
             writer.endElement("li");
 
-            msg.rendered();
+            message.rendered();
         }
 
         writer.endElement("ul");
diff --git a/src/main/java/org/primefaces/component/resetinput/ResetInputActionListener.java b/src/main/java/org/primefaces/component/resetinput/ResetInputActionListener.java
@@ -67,7 +67,8 @@ public void processAction(ActionEvent event) throws AbortProcessingException {
                 : ResetInputVisitCallback.INSTANCE;
 
         List<UIComponent> components = SearchExpressionFacade.resolveComponents(context, event.getComponent(), expressions);
-        for (UIComponent component : components) {
+        for (int i = 0; i < components.size(); i++) {
+            UIComponent component = components.get(i);
             component.visitTree(visitContext, visitCallback);
         }
     }
diff --git a/src/main/java/org/primefaces/component/selectmanycheckbox/SelectManyCheckboxRenderer.java b/src/main/java/org/primefaces/component/selectmanycheckbox/SelectManyCheckboxRenderer.java
@@ -378,7 +378,8 @@ protected void encodeGridLayout(FacesContext context, SelectManyCheckbox checkbo
 
         if (columns != 0) {
             int idx = 0, colMod;
-            for (SelectItem selectItem : selectItems) {
+            for (int i = 0; i < selectItems.size(); i++) {
+                SelectItem selectItem = selectItems.get(i);
                 colMod = idx % columns;
                 if (colMod == 0) {
                     writer.startElement("tr", null);
@@ -408,7 +409,8 @@ protected void encodeCustomLayout(FacesContext context, SelectManyCheckbox check
         Object submittedValues = getSubmittedValues(checkbox);
 
         int idx = 0;
-        for (SelectItem selectItem : selectItems) {
+        for (int i = 0; i < selectItems.size(); i++) {
+            SelectItem selectItem = selectItems.get(i);
             String itemValueAsString = getOptionAsString(context, checkbox, converter, selectItem.getValue());
             String name = checkbox.getClientId(context);
             String id = name + UINamingContainer.getSeparatorChar(context) + idx;
diff --git a/src/main/java/org/primefaces/component/selectmanymenu/SelectManyMenuRenderer.java b/src/main/java/org/primefaces/component/selectmanymenu/SelectManyMenuRenderer.java
@@ -258,7 +258,8 @@ protected void encodeSelectItems(FacesContext context, SelectManyMenu menu, List
         Object values = getValues(menu);
         Object submittedValues = getSubmittedValues(menu);
 
-        for (SelectItem selectItem : selectItems) {
+        for (int i = 0; i < selectItems.size(); i++) {
+            SelectItem selectItem = selectItems.get(i);
             encodeOption(context, menu, selectItem, values, submittedValues, converter);
         }
     }
diff --git a/src/main/java/org/primefaces/component/splitbutton/SplitButtonRenderer.java b/src/main/java/org/primefaces/component/splitbutton/SplitButtonRenderer.java
@@ -223,7 +223,8 @@ protected void encodeMenu(FacesContext context, SplitButton button, String menuI
         writer.startElement("ul", null);
         writer.writeAttribute("class", MenuButton.LIST_CLASS, "styleClass");
 
-        for (UIComponent child : button.getChildren()) {
+        for (int i = 0; i < button.getChildCount(); i++) {
+            UIComponent child = button.getChildren().get(i);
             if (child.isRendered()) {
                 if (child instanceof UIMenuItem) {
                     UIMenuItem item = (UIMenuItem) child;
diff --git a/src/main/java/org/primefaces/renderkit/CoreRenderer.java b/src/main/java/org/primefaces/renderkit/CoreRenderer.java
@@ -449,7 +449,8 @@ protected String buildNonAjaxRequest(FacesContext context, UIComponent component
             params.put(decodeParam, decodeParam);
         }
 
-        for (UIComponent child : component.getChildren()) {
+        for (int i = 0; i < component.getChildCount(); i++) {
+            UIComponent child = component.getChildren().get(i);
             if (child instanceof UIParameter) {
                 UIParameter param = (UIParameter) child;
 
diff --git a/src/main/java/org/primefaces/renderkit/HeadRenderer.java b/src/main/java/org/primefaces/renderkit/HeadRenderer.java
@@ -16,6 +16,7 @@
 package org.primefaces.renderkit;
 
 import java.io.IOException;
+import java.util.List;
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
 import javax.el.ValueExpression;
@@ -91,7 +92,9 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 
         //Registered Resources
         UIViewRoot viewRoot = context.getViewRoot();
-        for (UIComponent resource : viewRoot.getComponentResources(context, "head")) {
+        List<UIComponent> resources = viewRoot.getComponentResources(context, "head");
+        for (int i = 0; i < resources.size(); i++) {
+            UIComponent resource = resources.get(i);
             resource.encodeAll(context);
         }
 
diff --git a/src/main/java/org/primefaces/renderkit/SelectRenderer.java b/src/main/java/org/primefaces/renderkit/SelectRenderer.java
@@ -42,7 +42,8 @@ public class SelectRenderer extends InputRenderer {
     protected List<SelectItem> getSelectItems(FacesContext context, UIInput component) {
         List<SelectItem> selectItems = new ArrayList<SelectItem>();
 
-        for (UIComponent child : component.getChildren()) {
+        for (int i = 0; i < component.getChildCount(); i++) {
+            UIComponent child = component.getChildren().get(i);
             if (child instanceof UISelectItem) {
                 UISelectItem uiSelectItem = (UISelectItem) child;
                 Object selectItemValue = uiSelectItem.getValue();
@@ -68,8 +69,8 @@ else if (child instanceof UISelectItems) {
                         selectItems.add((SelectItem) value);
                     }
                     else if (value.getClass().isArray()) {
-                        for (int i = 0; i < Array.getLength(value); i++) {
-                            Object item = Array.get(value, i);
+                        for (int j = 0; j < Array.getLength(value); j++) {
+                            Object item = Array.get(value, j);
 
                             if (item instanceof SelectItem) {
                                 selectItems.add((SelectItem) item);
@@ -91,8 +92,8 @@ else if (value instanceof Map) {
                     else if (value instanceof List && value instanceof RandomAccess) {
                         List list = (List) value;
 
-                        for (int i = 0; i < list.size(); i++) {
-                            Object item = list.get(i);
+                        for (int j = 0; j < list.size(); j++) {
+                            Object item = list.get(j);
                             if (item instanceof SelectItem) {
                                 selectItems.add((SelectItem) item);
                             }
@@ -263,7 +264,8 @@ protected int countSelectItems(List<SelectItem> selectItems) {
         }
 
         int count = selectItems.size();
-        for (SelectItem selectItem : selectItems) {
+        for (int i = 0; i < selectItems.size(); i++) {
+            SelectItem selectItem = selectItems.get(i);
             if (selectItem instanceof SelectItemGroup) {
                 count += countSelectItems(((SelectItemGroup) selectItem).getSelectItems());
             }
diff --git a/src/main/java/org/primefaces/util/AjaxRequestBuilder.java b/src/main/java/org/primefaces/util/AjaxRequestBuilder.java
@@ -220,7 +220,8 @@ public AjaxRequestBuilder oncomplete(String oncomplete) {
     public AjaxRequestBuilder params(UIComponent component) {
         boolean paramWritten = false;
 
-        for (UIComponent child : component.getChildren()) {
+        for (int i = 0; i < component.getChildCount(); i++) {
+            UIComponent child = component.getChildren().get(i);
             if (child instanceof UIParameter) {
                 UIParameter parameter = (UIParameter) child;
                 Object paramValue = parameter.getValue();
diff --git a/src/main/java/org/primefaces/util/ComponentUtils.java b/src/main/java/org/primefaces/util/ComponentUtils.java
@@ -252,25 +252,25 @@ public static NavigationCase findNavigationCase(FacesContext context, String out
     }
 
     public static Map<String, List<String>> getUIParams(UIComponent component) {
-        List<UIComponent> children = component.getChildren();
         Map<String, List<String>> params = null;
 
-        if (children != null && children.size() > 0) {
-            params = new LinkedHashMap<String, List<String>>();
+        for (int i = 0; i < component.getChildCount(); i++) {
+            UIComponent child = component.getChildren().get(i);
+            if (child.isRendered() && (child instanceof UIParameter)) {
+                UIParameter uiParam = (UIParameter) child;
 
-            for (UIComponent child : children) {
-                if (child.isRendered() && (child instanceof UIParameter)) {
-                    UIParameter uiParam = (UIParameter) child;
-
-                    if (!uiParam.isDisable()) {
-                        List<String> paramValues = params.get(uiParam.getName());
-                        if (paramValues == null) {
-                            paramValues = new ArrayList<String>();
-                            params.put(uiParam.getName(), paramValues);
-                        }
+                if (!uiParam.isDisable()) {
+                    if (params == null) {
+                        params = new LinkedHashMap<String, List<String>>();
+                    }
 
-                        paramValues.add(String.valueOf(uiParam.getValue()));
+                    List<String> paramValues = params.get(uiParam.getName());
+                    if (paramValues == null) {
+                        paramValues = new ArrayList<String>();
+                        params.put(uiParam.getName(), paramValues);
                     }
+
+                    paramValues.add(String.valueOf(uiParam.getValue()));
                 }
             }
         }
diff --git a/src/main/java/org/primefaces/util/DynamicContentSrcBuilder.java b/src/main/java/org/primefaces/util/DynamicContentSrcBuilder.java
@@ -78,9 +78,10 @@ else if (value instanceof StreamedContent) {
                         .append("&").append(Constants.DYNAMIC_CONTENT_PARAM).append("=").append(URLEncoder.encode(resourceKey, "UTF-8"))
                         .append("&").append(Constants.DYNAMIC_CONTENT_TYPE_PARAM).append("=").append(type.toString());
 
-                for (UIComponent kid : component.getChildren()) {
-                    if (kid instanceof UIParameter) {
-                        UIParameter param = (UIParameter) kid;
+                for (int i = 0; i < component.getChildCount(); i++) {
+                    UIComponent child = component.getChildren().get(i);
+                    if (child instanceof UIParameter) {
+                        UIParameter param = (UIParameter) child;
                         if (!param.isDisable()) {
                             Object paramValue = param.getValue();
 
diff --git a/src/main/java/org/primefaces/util/ResourceUtils.java b/src/main/java/org/primefaces/util/ResourceUtils.java
@@ -69,7 +69,8 @@ public static ArrayList<ResourceInfo> getComponentResources(FacesContext context
         
         List<UIComponent> resources = context.getViewRoot().getComponentResources(context, "head");
         if (resources != null) {
-            for (UIComponent resource : resources) {
+            for (int i = 0; i < resources.size(); i++) {
+                UIComponent resource = resources.get(i);
                 ResourceUtils.ResourceInfo resourceInfo = newResourceInfo(resource);
                 if (resourceInfo != null && !resourceInfos.contains(resourceInfo)) {
                     resourceInfos.add(resourceInfo);
@@ -88,7 +89,8 @@ public static ArrayList<String> filterStylesheets(FacesContext context, ArrayLis
         ResourceHandler resourceHandler = context.getApplication().getResourceHandler();
         
         ArrayList<String> stylesheets = new ArrayList<String>();
-        for (ResourceInfo resourceInfo : resourceInfos) {
+        for (int i = 0; i < resourceInfos.size(); i++) {
+            ResourceInfo resourceInfo = resourceInfos.get(i);
             if (isStylesheet(resourceInfo.getResource()) && !isInline(resourceInfo)) {
                 Resource resource;
                 if (ComponentUtils.isValueBlank(resourceInfo.getLibrary())) {
@@ -117,7 +119,8 @@ public static ArrayList<String> filterScripts(FacesContext context, ArrayList<Re
         ResourceHandler resourceHandler = context.getApplication().getResourceHandler();
         
         ArrayList<String> scripts = new ArrayList<String>();
-        for (ResourceInfo resourceInfo : resourceInfos) {
+        for (int i = 0; i < resourceInfos.size(); i++) {
+            ResourceInfo resourceInfo = resourceInfos.get(i);
             if (isScript(resourceInfo.getResource()) && !isInline(resourceInfo)) {
                 Resource resource;
                 if (ComponentUtils.isValueBlank(resourceInfo.getLibrary())) {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ public void apply(FaceletContext faceletContext, UIComponent parent) throws IOEx`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`boolean supportedEvent = false;`
`91`		`- for (AttachedObjectTarget target : targetList) {`
	`91`	`+ for (int i = 0; i < targetList.size(); i++) {`
	`92`	`+ AttachedObjectTarget target = targetList.get(i);`
`92`	`93`	`if (target instanceof BehaviorHolderAttachedObjectTarget) {`
`93`	`94`	`BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target;`
`94`	`95`	`if ((null != eventName && eventName.equals(behaviorTarget.getName()))`
Original file line number	Diff line number	Diff line change
`@@ -162,15 +162,16 @@ protected void encodeTabs(FacesContext context, AccordionPanel acco) throws IOEx`
`162`	`162`	`: Arrays.asList(activeIndex.split(","));`
`163`	`163`
`164`	`164`	`if (var == null) {`
`165`		`- int i = 0;`
	`165`	`+ int j = 0;`
`166`	`166`
`167`		`- for (UIComponent child : acco.getChildren()) {`
	`167`	`+ for (int i = 0; i < acco.getChildCount(); i++) {`
	`168`	`+ UIComponent child = acco.getChildren().get(i);`
`168`	`169`	`if (child.isRendered() && child instanceof Tab) {`
`169`		`- boolean active = activeIndexes.indexOf(Integer.toString(i)) != -1;`
	`170`	`+ boolean active = activeIndexes.indexOf(Integer.toString(j)) != -1;`
`170`	`171`
`171`	`172`	`encodeTab(context, acco, (Tab) child, active, dynamic, rtl);`
`172`	`173`
`173`		`- i++;`
	`174`	`+ j++;`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ public void processAction(ActionEvent event) throws AbortProcessingException {`
`67`	`67`	`: ResetInputVisitCallback.INSTANCE;`
`68`	`68`
`69`	`69`	`List<UIComponent> components = SearchExpressionFacade.resolveComponents(context, event.getComponent(), expressions);`
`70`		`- for (UIComponent component : components) {`
	`70`	`+ for (int i = 0; i < components.size(); i++) {`
	`71`	`+ UIComponent component = components.get(i);`
`71`	`72`	`component.visitTree(visitContext, visitCallback);`
`72`	`73`	`}`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ protected void encodeSelectItems(FacesContext context, SelectManyMenu menu, List`
`258`	`258`	`Object values = getValues(menu);`
`259`	`259`	`Object submittedValues = getSubmittedValues(menu);`
`260`	`260`
`261`		`- for (SelectItem selectItem : selectItems) {`
	`261`	`+ for (int i = 0; i < selectItems.size(); i++) {`
	`262`	`+ SelectItem selectItem = selectItems.get(i);`
`262`	`263`	`encodeOption(context, menu, selectItem, values, submittedValues, converter);`
`263`	`264`	`}`
`264`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,8 @@ protected String buildNonAjaxRequest(FacesContext context, UIComponent component`
`449`	`449`	`params.put(decodeParam, decodeParam);`
`450`	`450`	`}`
`451`	`451`
`452`		`- for (UIComponent child : component.getChildren()) {`
	`452`	`+ for (int i = 0; i < component.getChildCount(); i++) {`
	`453`	`+ UIComponent child = component.getChildren().get(i);`
`453`	`454`	`if (child instanceof UIParameter) {`
`454`	`455`	`UIParameter param = (UIParameter) child;`
`455`	`456`