Skip to content

Commit a8bdc5e

Browse files
committed
1 parent fb157e9 commit a8bdc5e

File tree

3 files changed

+31
-16
lines changed

3 files changed

+31
-16
lines changed

src/main/java/org/primefaces/behavior/ajax/AjaxBehaviorRenderer.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.primefaces.behavior.ajax;
1717

18+
import java.util.ArrayList;
1819
import java.util.Collection;
1920
import javax.faces.component.ActionSource;
2021
import javax.faces.component.EditableValueHolder;
@@ -61,10 +62,23 @@ public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior be
6162

6263
Collection<ClientBehaviorContext.Parameter> behaviorParameters = behaviorContext.getParameters();
6364
if (behaviorParameters != null && !behaviorParameters.isEmpty()) {
64-
for (ClientBehaviorContext.Parameter behaviorParameter : behaviorParameters) {
65-
if (behaviorParameter.getValue() != null && behaviorParameter.getValue() instanceof ClientBehaviorRenderingMode) {
66-
renderingMode = (ClientBehaviorRenderingMode) behaviorParameter.getValue();
67-
break;
65+
// perf optimzation
66+
if (behaviorParameters instanceof ArrayList) {
67+
for (int i = 0; i < behaviorParameters.size(); i++) {
68+
ClientBehaviorContext.Parameter behaviorParameter =
69+
((ArrayList<ClientBehaviorContext.Parameter>) behaviorParameters).get(i);
70+
if (behaviorParameter.getValue() != null && behaviorParameter.getValue() instanceof ClientBehaviorRenderingMode) {
71+
renderingMode = (ClientBehaviorRenderingMode) behaviorParameter.getValue();
72+
break;
73+
}
74+
}
75+
}
76+
else {
77+
for (ClientBehaviorContext.Parameter behaviorParameter : behaviorParameters) {
78+
if (behaviorParameter.getValue() != null && behaviorParameter.getValue() instanceof ClientBehaviorRenderingMode) {
79+
renderingMode = (ClientBehaviorRenderingMode) behaviorParameter.getValue();
80+
break;
81+
}
6882
}
6983
}
7084
}

src/main/java/org/primefaces/component/orderlist/OrderListRenderer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ protected void encodeOptions(FacesContext context, OrderList old, List model) th
154154
String var = old.getVar();
155155
Converter converter = old.getConverter();
156156

157-
for (Iterator it = model.iterator(); it.hasNext();) {
158-
Object item = it.next();
157+
for (Object item : model) {
159158
context.getExternalContext().getRequestMap().put(var, item);
160159
String value = converter != null ? converter.getAsString(context, old, old.getItemValue()) : old.getItemValue().toString();
161160

src/main/java/org/primefaces/component/tabview/TabViewRenderer.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,12 @@ protected void encodeHeaders(FacesContext context, TabView tabView) throws IOExc
177177
writer.writeAttribute("role", "tablist", null);
178178

179179
if (var == null) {
180-
int i = 0;
181-
for (UIComponent kid : tabView.getChildren()) {
182-
if (kid.isRendered() && kid instanceof Tab) {
183-
encodeTabHeader(context, tabView, (Tab) kid, i, (i == activeIndex));
184-
i++;
180+
int j = 0;
181+
for (int i = 0; i < tabView.getChildren().size(); i++) {
182+
UIComponent child = tabView.getChildren().get(i);
183+
if (child.isRendered() && child instanceof Tab) {
184+
encodeTabHeader(context, tabView, (Tab) child, j, (j == activeIndex));
185+
j++;
185186
}
186187
}
187188
}
@@ -284,11 +285,12 @@ protected void encodeContents(FacesContext context, TabView tabView) throws IOEx
284285
writer.writeAttribute("class", TabView.PANELS_CLASS, null);
285286

286287
if (var == null) {
287-
int i = 0;
288-
for (UIComponent kid : tabView.getChildren()) {
289-
if (kid.isRendered() && kid instanceof Tab) {
290-
encodeTabContent(context, (Tab) kid, i, (i == activeIndex), dynamic);
291-
i++;
288+
int j = 0;
289+
for (int i = 0; i < tabView.getChildren().size(); i++) {
290+
UIComponent child = tabView.getChildren().get(i);
291+
if (child.isRendered() && child instanceof Tab) {
292+
encodeTabContent(context, (Tab) child, j, (j == activeIndex), dynamic);
293+
j++;
292294
}
293295
}
294296
}

0 commit comments

Comments
 (0)