Author: maksimkaszynski Date: 2008-03-25 12:18:28 -0400 (Tue, 25 Mar 2008) New Revision: 7192 Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2008-03-25 16:18:21 UTC (rev 7191) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2008-03-25 16:18:28 UTC (rev 7192) @@ -90,10 +90,10 @@ private Object targetValue; private boolean targetValueSet; - private Collection sourceSelection; + private Set sourceSelection; private boolean sourceSelectionSet; - private Collection targetSelection; + private Set targetSelection; private boolean targetSelectionSet; private Object activeItem; @@ -124,10 +124,10 @@ targetValue = restoreAttachedState(context, state[2]); targetValueSet = Boolean.TRUE.equals(state[3]); - sourceSelection = (Collection) restoreAttachedState(context, state[4]); + sourceSelection = (Set) restoreAttachedState(context, state[4]); sourceSelectionSet = Boolean.TRUE.equals(state[5]); - targetSelection = (Collection) restoreAttachedState(context, state[6]); + targetSelection = (Set) restoreAttachedState(context, state[6]); targetSelectionSet = Boolean.TRUE.equals(state[7]); activeItem = restoreAttachedState(context, state[8]); @@ -681,39 +681,39 @@ } } - public Collection getSourceSelection() { + public Set getSourceSelection() { if (valueHolder != null && valueHolder.sourceSelection != null) { return valueHolder.sourceSelection; } else { ValueBinding vb = getValueBinding("sourceSelection"); if (vb != null) { - return (Collection) vb.getValue(FacesContext.getCurrentInstance()); + return (Set) vb.getValue(FacesContext.getCurrentInstance()); } } return null; } - public void setSourceSelection(Collection collection) { + public void setSourceSelection(Set collection) { createValueHolder(); valueHolder.sourceSelection = collection; valueHolder.sourceSelectionSet = true; } - public Collection getTargetSelection() { + public Set getTargetSelection() { if (valueHolder != null && valueHolder.targetSelection != null) { return valueHolder.targetSelection; } else { ValueBinding vb = getValueBinding("targetSelection"); if (vb != null) { - return (Collection) vb.getValue(FacesContext.getCurrentInstance()); + return (Set) vb.getValue(FacesContext.getCurrentInstance()); } } return null; } - public void setTargetSelection(Collection collection) { + public void setTargetSelection(Set collection) { createValueHolder(); valueHolder.targetSelection = collection; valueHolder.targetSelectionSet = true;