Author: nbelaevski
Date: 2011-02-01 14:07:49 -0500 (Tue, 01 Feb 2011)
New Revision: 21377
Modified:
trunk/ui/common/ui/src/main/java/org/richfaces/component/util/SelectUtils.java
Log:
https://issues.jboss.org/browse/RF-10131
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/util/SelectUtils.java
===================================================================
---
trunk/ui/common/ui/src/main/java/org/richfaces/component/util/SelectUtils.java 2011-02-01
19:07:25 UTC (rev 21376)
+++
trunk/ui/common/ui/src/main/java/org/richfaces/component/util/SelectUtils.java 2011-02-01
19:07:49 UTC (rev 21377)
@@ -67,16 +67,11 @@
private static final String ITEM_DISABLED = "itemDisabled";
private static final String NO_SELECTION_OPTION = "noSelectionOption";
- private String var;
-
- private UIComponent sourceComponent;
-
- private GenericObjectSelectItem(UIComponent sourceComponent) {
- this.var = (String) sourceComponent.getAttributes().get(VAR);
- this.sourceComponent = sourceComponent;
+ private GenericObjectSelectItem() {
}
- private void updateItem(FacesContext facesContext, Object value) {
+ private void updateItem(FacesContext facesContext, UIComponent sourceComponent,
Object value) {
+ String var = (String) sourceComponent.getAttributes().get(VAR);
Map<String, Object> requestMap =
facesContext.getExternalContext().getRequestMap();
Object oldVarValue = null;
@@ -146,8 +141,6 @@
private Iterator<?> data;
- private GenericObjectSelectItem genericItem;
-
public GenericItemsIterator(FacesContext facesContext, UIComponent component,
Iterator<?> data) {
super();
this.facesContext = facesContext;
@@ -163,12 +156,9 @@
if (next instanceof SelectItem) {
return (SelectItem) next;
} else {
- if (genericItem == null) {
- genericItem = new GenericObjectSelectItem(component);
- }
+ GenericObjectSelectItem genericItem = new GenericObjectSelectItem();
+ genericItem.updateItem(facesContext, component, next);
- genericItem.updateItem(facesContext, next);
-
return genericItem;
}
}