Author: nbelaevski Date: 2007-11-12 15:18:12 -0500 (Mon, 12 Nov 2007) New Revision: 3936 Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java Log: VB handling for activeItem/selection added Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-12 19:06:42 UTC (rev 3935) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-12 20:18:12 UTC (rev 3936) @@ -431,7 +431,6 @@ } } - /** * <p>Specialized decode behavior on top of that provided by the * superclass. In addition to the standard @@ -787,15 +786,15 @@ selectionSet.add(selectionItem); } - this.selection = selectionSet; - this.localSelectionSet = true; + setSelection(selectionSet); if (submittedValueHolder.activeItem != null) { dataModel.setRowKey(submittedValueHolder.activeItem); Object activeItem = dataModel.getRowData(); - this.activeItem = activeItem; - this.localActiveItemSet = true; + setActiveItem(activeItem); + } else { + setActiveItem(null); } Object previous = getValue(); @@ -1030,7 +1029,7 @@ return ScriptUtils.toScript(order); } - public boolean isActiveItem() { + public boolean isActive() { return activeItem != null && activeItem.equals(getRowData()) || submittedValueHolder != null && (submittedValueHolder.activeItem != null && submittedValueHolder.activeItem.equals(getTranslatedRowKey())); } @@ -1038,9 +1037,42 @@ return selection != null && selection.contains(getRowData()) || submittedValueHolder != null && submittedValueHolder.selectedItems.contains(getTranslatedRowKey()); } - public abstract Collection getSelection(); - public abstract void setSelection(Collection collection); + public Collection getSelection() { + if (this.selection != null) { + return this.selection; + } else { + ValueBinding vb = getValueBinding("selection"); + if (vb != null) { + return (Collection) vb.getValue(FacesContext.getCurrentInstance()); + } + } + + return null; + } + + public void setSelection(Collection collection) { + this.selection = collection; + this.localSelectionSet = true; + } + public Object getActiveItem() { + if (this.activeItem != null) { + return this.activeItem; + } else { + ValueBinding vb = getValueBinding("activeItem"); + if (vb != null) { + return vb.getValue(FacesContext.getCurrentInstance()); + } + } + + return null; + } + + public void setActiveItem(Object activeItem) { + this.activeItem = activeItem; + this.localActiveItemSet = true; + } + public abstract boolean isOrderControlsVisible(); public abstract void setOrderControlsVisible(boolean visible); Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-12 19:06:42 UTC (rev 3935) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-12 20:18:12 UTC (rev 3936) @@ -371,7 +371,7 @@ writer.writeAttribute("id", clientId, null); String className = null; - if (table.isActiveItem()) { + if (table.isActive()) { className = "ol_active rich-ordering-list-row-active"; } else if (table.isSelected()) { className = "ol_select rich-ordering-list-row-selected";