Author: nbelaevski Date: 2011-02-03 14:41:55 -0500 (Thu, 03 Feb 2011) New Revision: 21429 Modified: trunk/ui/dnd/api/src/main/java/org/richfaces/event/DropEvent.java trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java Log: https://issues.jboss.org/browse/RF-10399 Modified: trunk/ui/dnd/api/src/main/java/org/richfaces/event/DropEvent.java =================================================================== --- trunk/ui/dnd/api/src/main/java/org/richfaces/event/DropEvent.java 2011-02-03 19:04:13 UTC (rev 21428) +++ trunk/ui/dnd/api/src/main/java/org/richfaces/event/DropEvent.java 2011-02-03 19:41:55 UTC (rev 21429) @@ -36,48 +36,34 @@ private UIComponent dragSource; - private UIComponent dropTarget; - private Object dropValue; private Object dragValue; - public DropEvent(UIComponent dragSource, UIComponent dropTarget) { + public DropEvent(UIComponent dropTarget, Object dropValue, UIComponent dragSource, Object dragValue) { super(dropTarget); + + this.dropValue = dropValue; + this.dragSource = dragSource; + this.dragValue = dragValue; } public UIComponent getDragSource() { return dragSource; } - public void setDragSource(UIComponent dragSource) { - this.dragSource = dragSource; - } - public UIComponent getDropTarget() { - return dropTarget; + return getComponent(); } - public void setDropTarget(UIComponent dropTarget) { - this.dropTarget = dropTarget; - } - public Object getDropValue() { return dropValue; } - public void setDropValue(Object dropValue) { - this.dropValue = dropValue; - } - public Object getDragValue() { return dragValue; } - public void setDragValue(Object dragValue) { - this.dragValue = dragValue; - } - @Override public boolean isAppropriateListener(FacesListener listener) { return (listener instanceof DropListener); Modified: trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java =================================================================== --- trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java 2011-02-03 19:04:13 UTC (rev 21428) +++ trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java 2011-02-03 19:41:55 UTC (rev 21429) @@ -60,10 +60,8 @@ facesContext.getViewRoot().invokeOnComponent(facesContext, dragSourceId, dragSourceContextCallBack); AbstractDropTarget dropTarget = (AbstractDropTarget)component; - DropEvent dropEvent = new DropEvent(dragSourceContextCallBack.getDragSource(), dropTarget); - dropEvent.setDragValue(dragSourceContextCallBack.getDragValue()); - dropEvent.setDropValue(dropTarget.getDropValue()); - dropEvent.queue(); + new DropEvent(dropTarget, dropTarget.getDropValue(), + dragSourceContextCallBack.getDragSource(), dragSourceContextCallBack.getDragValue()).queue(); } } }