10:10 a.m.
Author: nbelaevski
Date: 2007-11-12 11:10:43 -0500 (Mon, 12 Nov 2007)
New Revision: 3926
Added:
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DnDEvent.java
Removed:
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java
Modified:
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DragEvent.java
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropEvent.java
branches/3.1.x/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
branches/3.1.x/samples/dragDropDemo/src/main/webapp/pages/index.jsp
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
Log:
http://jira.jboss.com/jira/browse/RF-1330
Copied: branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DnDEvent.java (from
rev 3901, trunk/framework/api/src/main/java/org/richfaces/event/DnDEvent.java)
===================================================================
--- branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DnDEvent.java
(rev 0)
+++
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DnDEvent.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -0,0 +1,68 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+/**
+ *
+ * <br /><br />
+ *
+ * Created 12.11.2007
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public abstract class DnDEvent extends FacesEvent {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2455016405742082110L;
+
+ public DnDEvent(UIComponent component) {
+ super(component);
+ }
+
+ protected Object value;
+
+ private boolean valid = true;
+
+ public boolean isAppropriateListener(FacesListener listener) {
+ return valid;
+ }
+
+ public void invalidate() {
+ valid = false;
+ }
+
+ public boolean isValid() {
+ return valid;
+ }
+
+ public void processListener(FacesListener listener) {
+ if (!valid) {
+ throw new IllegalStateException();
+ }
+ }
+}
Modified: branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DragEvent.java
===================================================================
---
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -22,7 +22,6 @@
package org.richfaces.event;
import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
import org.richfaces.component.Draggable;
@@ -33,11 +32,10 @@
* created 27.12.2006
*
*/
-public class DragEvent extends FacesEvent {
+public class DragEvent extends DnDEvent {
private Dropzone dropTarget;
private Object acceptedTypes;
- private Object dropValue;
/**
*
*/
@@ -51,13 +49,14 @@
* @see
javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener)
*/
public boolean isAppropriateListener(FacesListener faceslistener) {
- return faceslistener instanceof DragListener;
+ return super.isAppropriateListener(faceslistener) && faceslistener instanceof
DragListener;
}
/* (non-Javadoc)
* @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener)
*/
public void processListener(FacesListener faceslistener) {
+ super.processListener(faceslistener);
((DragListener) faceslistener).processDrag(this);
}
@@ -94,10 +93,10 @@
}
public Object getDropValue() {
- return dropValue;
+ return value;
}
public void setDropValue(Object dropValue) {
- this.dropValue = dropValue;
+ this.value = dropValue;
}
}
Modified: branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropEvent.java
===================================================================
---
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -22,7 +22,6 @@
package org.richfaces.event;
import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
import org.richfaces.component.Draggable;
@@ -32,7 +31,7 @@
* @author shura
*
*/
-public class DropEvent extends FacesEvent {
+public class DropEvent extends DnDEvent {
/**
*
@@ -41,7 +40,6 @@
private Draggable draggableSource;
private String dragType;
- private Object dragValue;
public DropEvent(UIComponent component) {
super(component);
@@ -51,19 +49,15 @@
* @see
javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener)
*/
public boolean isAppropriateListener(FacesListener listener) {
-
- return listener instanceof DropListener;
+ return super.isAppropriateListener(listener) && listener instanceof
DropListener;
}
/* (non-Javadoc)
* @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener)
*/
public void processListener(FacesListener listener) {
- if (listener instanceof DropListener) {
- DropListener dropListener = (DropListener) listener;
- dropListener.processDrop(this);
- }
-
+ super.processListener(listener);
+ ((DropListener) listener).processDrop(this);
}
/**
@@ -104,10 +98,10 @@
}
public Object getDragValue() {
- return dragValue;
+ return value;
}
public void setDragValue(Object dragValue) {
- this.dragValue = dragValue;
+ this.value = dragValue;
}
}
Deleted:
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java
===================================================================
---
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -1,104 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.event;
-
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * Wrapper for bind DrolListener to EL expression.
- * @author shura
- *
- */
-public class DropListenerBinding implements DropListener, StateHolder {
-
- private ValueBinding _binding;
-
- private String _dragType;
-
- private ValueBinding _dragTypeBinding;
-
- private boolean _transient = false;
-
- public DropListenerBinding() {
- }
-
- /**
- * @param binding
- */
- public DropListenerBinding(ValueBinding binding) {
- super();
- _binding = binding;
- }
-
- private DropListener getHandler(FacesContext context) {
- return (DropListener) _binding.getValue(context);
- }
-
- public void processDrop(DropEvent event) {
- DropListener handler = getHandler(FacesContext.getCurrentInstance());
- handler.processDrop(event);
- }
-
- public boolean isTransient() {
- // TODO Auto-generated method stub
- return _transient;
- }
-
- public void restoreState(FacesContext context, Object state) {
- _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context, state);
-
- }
-
- public Object saveState(FacesContext context) {
- return UIComponentBase.saveAttachedState(context, _binding);
- }
-
- public void setTransient(boolean newTransientValue) {
- _transient = newTransientValue;
-
- }
-
- /**
- * @return the dragType
- */
- public String getDragType() {
- return _dragType;
- }
-
- /**
- * @param dragType the dragType to set
- */
- public void setDragType(String dragType) {
- _dragType = dragType;
- }
-
- /**
- * @param dragTypeBinding the dragTypeBinding to set
- */
- public void setDragTypeBinding(ValueBinding dragTypeBinding) {
- _dragTypeBinding = dragTypeBinding;
- }
-
-}
Modified:
branches/3.1.x/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
===================================================================
---
branches/3.1.x/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-11-12
16:10:43 UTC (rev 3926)
@@ -30,7 +30,7 @@
* @return
*/
accept: function(drag) {
- return this.getAcceptedTypes().indexOf(drag.type) > -1 ;
+ return DnD.CLIENT_VALIDATION_OFF || this.getAcceptedTypes().indexOf(drag.type) > -1
;
},
getAcceptedTypes: function() {
return [];
Modified: branches/3.1.x/samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-11-12
16:02:11 UTC (rev 3925)
+++ branches/3.1.x/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-11-12
16:10:43 UTC (rev 3926)
@@ -25,6 +25,10 @@
</style>
</head>
<body>
+ <script type="text/javascript">
+ // DnD.CLIENT_VALIDATION_OFF = true;
+ </script>
+
<f:view>
<h:form id="form">
<h:selectOneRadio binding="#{skinBean.component}" />
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -58,13 +58,16 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
if (event instanceof DragEvent) {
- MethodBinding binding = getDragListener();
- if (binding != null) {
- binding.invoke(getFacesContext(), new Object[] {event});
+ DragEvent dragEvent = (DragEvent) event;
+ if (dragEvent.isValid()) {
+ MethodBinding binding = getDragListener();
+ if (binding != null) {
+ binding.invoke(getFacesContext(), new Object[] {event});
+ }
+
+ new AjaxEvent(this).queue();
+ new ActionEvent(this).queue();
}
-
- new AjaxEvent(this).queue();
- new ActionEvent(this).queue();
}
}
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -57,14 +57,15 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
if (event instanceof DropEvent) {
- MethodBinding binding = getDropListener();
- if (binding != null) {
- binding.invoke(getFacesContext(), new Object[] {event});
+ if (((DropEvent) event).isValid()) {
+ MethodBinding binding = getDropListener();
+ if (binding != null) {
+ binding.invoke(getFacesContext(), new Object[] {event});
+ }
+
+ new AjaxEvent(this).queue();
+ new ActionEvent(this).queue();
}
-
- new AjaxEvent(this).queue();
- new ActionEvent(this).queue();
-
}
}
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -28,11 +28,11 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.event.FacesEvent;
import org.apache.commons.collections.MultiHashMap;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
+import org.richfaces.event.DnDEvent;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
@@ -45,16 +45,16 @@
}
private static class EventInfoStructure {
- private FacesEvent facesEvent;
+ private DnDEvent dndEvent;
private EventCallback eventCallback;
private Object type;
private Object value;
- public EventInfoStructure(FacesEvent facesEvent,
+ public EventInfoStructure(DnDEvent dndEvent,
EventCallback eventCallback, Object type, Object value) {
super();
- this.facesEvent = facesEvent;
+ this.dndEvent = dndEvent;
this.eventCallback = eventCallback;
this.type = type;
this.value = value;
@@ -63,7 +63,7 @@
}
static abstract class EventCallback {
- abstract void processEvent(FacesEvent facesEvent, UIComponent source, FacesContext
facesContext, Object type, Object value);
+ abstract void processEvent(DnDEvent dndEvent, UIComponent source, FacesContext
facesContext, Object type, Object value);
}
static DnDEventsExchangeMailer getInstance(FacesContext facesContext) {
@@ -86,22 +86,25 @@
private Map components = new HashMap();
- private void processEvent(UIComponent source, FacesContext facesContext, FacesEvent
facesEvent, EventCallback callback, Object type, Object value) {
+ private void processEvent(UIComponent source, FacesContext facesContext, DnDEvent
dndEvent, EventCallback callback, Object type, Object value) {
if (callback != null) {
- callback.processEvent(facesEvent, source, facesContext, type, value);
+ callback.processEvent(dndEvent, source, facesContext, type, value);
}
}
- public void mailEvent(String sourceId, UIComponent target, FacesContext facesContext,
FacesEvent facesEvent,
+ public void mailEvent(String sourceId, UIComponent target, FacesContext facesContext,
DnDEvent dndEvent,
EventCallback callback, Object type, Object value, boolean isDraggable) {
- facesEvent.queue();
+ //we should queue event right now to preserve row key if its generator
+ //is nested in UIData...
+ dndEvent.queue();
+
UIComponent component = (UIComponent) components.get(sourceId);
String targetId = target.getClientId(facesContext);
if (component == null) {
//component with that sourceId have never mailed anything before - wait
- queuedMap.put(sourceId, new EventInfoStructure(facesEvent, callback, type, value));
+ queuedMap.put(sourceId, new EventInfoStructure(dndEvent, callback, type, value));
components.put(targetId, target);
} else {
//check queued mail lists for current component
@@ -131,15 +134,24 @@
dragType = eventInfo.type;
}
- DnDValidator.validateAcceptTypes(facesContext, draggable, dropzone, dragType,
acceptedTypes);
+ if (DnDValidator.validateAcceptTypes(facesContext,
+ draggable, dropzone,
+ dragType, acceptedTypes)) {
+
- processEvent(target, facesContext, eventInfo.facesEvent, eventInfo.eventCallback,
- type, value);
+ processEvent(target, facesContext, eventInfo.dndEvent, eventInfo.eventCallback,
+ type, value);
- //we know the component - process event now
- processEvent(component, facesContext, facesEvent, callback,
- eventInfo.type, eventInfo.value);
+ //we know the component - process event now
+ processEvent(component, facesContext, dndEvent, callback,
+ eventInfo.type, eventInfo.value);
+ } else {
+ dndEvent.invalidate();
+
+ eventInfo.dndEvent.invalidate();
+ }
+
iterator.remove();
}
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -41,7 +41,7 @@
class DnDValidator {
private final static String MESSAGE_FORMAT = "Dropzone [{0}] with accepted types
{1} cannot accept Draggable [{2}] with dragType [{3}]";
- static void validateAcceptTypes(FacesContext context, Draggable draggable, Dropzone
dropzone, Object dragType, Object acceptedTypes) {
+ static boolean validateAcceptTypes(FacesContext context, Draggable draggable, Dropzone
dropzone, Object dragType, Object acceptedTypes) {
Set set = AjaxRendererUtils.asSet(acceptedTypes);
if (set == null || !set.contains(dragType)) {
UIComponent component = (UIComponent) dropzone;
@@ -58,6 +58,10 @@
context.addMessage(component.getClientId(context), message);
context.renderResponse();
+
+ return false;
}
+
+ return true;
}
}
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -26,13 +26,13 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.event.FacesEvent;
import org.ajax4jsf.javascript.DnDScript;
import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
+import org.richfaces.event.DnDEvent;
import org.richfaces.event.DragEvent;
import org.richfaces.renderkit.DnDEventsExchangeMailer.EventCallback;
@@ -46,10 +46,10 @@
private static final EventCallback dragEventsCallback = new EventCallback() {
- void processEvent(FacesEvent facesEvent, UIComponent source,
+ void processEvent(DnDEvent dndEvent, UIComponent source,
FacesContext facesContext, Object type, Object value) {
- DragEvent dragEvent = (DragEvent) facesEvent;
+ DragEvent dragEvent = (DragEvent) dndEvent;
dragEvent.setDropTarget((Dropzone) source);
dragEvent.setDropValue(value);
dragEvent.setAcceptedTypes(type);
Modified:
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
---
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -26,7 +26,6 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.event.FacesEvent;
import org.ajax4jsf.javascript.DnDScript;
import org.ajax4jsf.javascript.JSFunction;
@@ -37,6 +36,7 @@
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
+import org.richfaces.event.DnDEvent;
import org.richfaces.event.DropEvent;
import org.richfaces.json.JSONCollection;
import org.richfaces.json.JSONException;
@@ -53,10 +53,10 @@
private static final EventCallback dropEventsCallback = new EventCallback() {
- void processEvent(FacesEvent facesEvent, UIComponent source,
+ void processEvent(DnDEvent dndEvent, UIComponent source,
FacesContext facesContext, Object type, Object value) {
- DropEvent dropEvent = (DropEvent) facesEvent;
+ DropEvent dropEvent = (DropEvent) dndEvent;
Draggable draggable = (Draggable) source;
dropEvent.setDraggableSource(draggable);
Modified:
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
===================================================================
---
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-11-12
16:02:11 UTC (rev 3925)
+++
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-11-12
16:10:43 UTC (rev 3926)
@@ -65,9 +65,13 @@
} else if (event instanceof NodeSelectedEvent) {
binding = eventsProducer.getNodeSelectListener();
} else if (event instanceof DropEvent) {
- binding = eventsProducer.getDropListener();
+ if (((DropEvent) event).isValid()) {
+ binding = eventsProducer.getDropListener();
+ }
} else if (event instanceof DragEvent) {
- binding = eventsProducer.getDragListener();
+ if (((DragEvent) event).isValid()) {
+ binding = eventsProducer.getDragListener();
+ }
}
if (binding != null) {