Author: lfryc(a)redhat.com Date: 2010-12-20 10:19:52 -0500 (Mon, 20 Dec 2010) New Revision: 20690 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragSourceBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropTargetBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml Log: drag-n-drop: fixed list of attributes (RFPL-979) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragSourceBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragSourceBean.java 2010-12-20 15:15:05 UTC (rev 20689) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragSourceBean.java 2010-12-20 15:19:52 UTC (rev 20690) @@ -58,10 +58,15 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIDragSource.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDragSource.class, getClass()); - attributes.setAttribute("event", "mouseover"); + attributes.setAttribute("dragIndicator", "indicator"); attributes.setAttribute("type", "drg1"); + attributes.setAttribute("rendered", true); + + attributes.remove("dragValue"); + attributes.remove("event"); + for (int i = 0; i < DRAG_VALUES; i++) { dragValues.add(new DragValue(i + 1)); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropTargetBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropTargetBean.java 2010-12-20 15:15:05 UTC (rev 20689) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropTargetBean.java 2010-12-20 15:19:52 UTC (rev 20690) @@ -64,13 +64,17 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIDropTarget.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDropTarget.class, getClass()); - attributes.setAttribute("event", "mouseover"); attributes.setAttribute("acceptedTypes", "drg1, drg2"); attributes.setAttribute("render", "droppedValues"); + attributes.remove("event"); + attributes.remove("actionExpression"); + attributes.remove("action"); + attributes.remove("actionListener"); attributes.remove("dropListener"); + attributes.remove("dropValue"); increaseDropValue(); } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2010-12-20 15:15:05 UTC (rev 20689) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2010-12-20 15:19:52 UTC (rev 20690) @@ -80,21 +80,15 @@ <rich:dropTarget event="mouseover" dropValue="#{richDropTargetBean.dropValue}" dropListener="#{richDropListenerBean.processDragging}" + action="#{richBean.dummyAction}" + actionListener="#{richBean.dummyActionListener}" acceptedTypes="#{richDragSourceBean.attributes['acceptedTypes'].value}" bypassUpdates="#{richDragSourceBean.attributes['bypassUpdates'].value}" - data="#{richDragSourceBean.attributes['data'].value}" - disabled="#{richDragSourceBean.attributes['disabled'].value}" - execute="#{richDragSourceBean.attributes['execute'].value}" immediate="#{richDragSourceBean.attributes['immediate'].value}" - limitRender="#{richDragSourceBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richDragSourceBean.attributes['onbeforedomupdate'].value}" - onbegin="#{richDragSourceBean.attributes['onbegin'].value}" - oncomplete="#{richDragSourceBean.attributes['oncomplete'].value}" - onerror="#{richDragSourceBean.attributes['onerror'].value}" - queueId="#{richDragSourceBean.attributes['queueId'].value}" render="#{richDragSourceBean.attributes['render'].value}" - status="#{richDragSourceBean.attributes['status'].value}" + rendered="#{richDragSourceBean.attributes['rendered'].value}" + value="#{richDragSourceBean.attributes['value'].value}" /> <h:dataTable id="droppedValues" var="droppedValue" value="#{richDropTargetBean.droppedEntries}">