JBoss Rich Faces SVN: r3906 - trunk/ui/message/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-12 07:01:54 -0500 (Mon, 12 Nov 2007)
New Revision: 3906
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
Log:
RF-1327
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-11-12 11:47:59 UTC (rev 3905)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-11-12 12:01:54 UTC (rev 3906)
@@ -266,7 +266,7 @@
boolean accept = false;
- if(acceptLevels.contains(ALL_NAME)){
+ if(acceptLevels.contains(ALL_NAME) || message == null){
return true;
}
18 years, 5 months
JBoss Rich Faces SVN: r3905 - trunk/ui/panelbar/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-12 06:47:59 -0500 (Mon, 12 Nov 2007)
New Revision: 3905
Modified:
trunk/ui/panelbar/src/main/config/component/panelbar.xml
Log:
Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-11-12 11:04:49 UTC (rev 3904)
+++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-11-12 11:47:59 UTC (rev 3905)
@@ -228,7 +228,7 @@
<name>onenter</name>
<classname>java.lang.String</classname>
<description>
- Event must occurs on than item has been changed
+ Event must occurs on than item has been entered
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -237,7 +237,7 @@
<name>onleave</name>
<classname>java.lang.String</classname>
<description>
- Event must occurs on than item has been changed
+ Event must occurs on than item has been leaved
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
18 years, 5 months
JBoss Rich Faces SVN: r3904 - in branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-12 06:04:49 -0500 (Mon, 12 Nov 2007)
New Revision: 3904
Modified:
branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
Log:
RF-1312
Modified: branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
===================================================================
--- branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-11-12 08:44:03 UTC (rev 3903)
+++ branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-11-12 11:04:49 UTC (rev 3904)
@@ -26,6 +26,7 @@
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
@@ -47,6 +48,9 @@
*/
private static final int SHADOW_DEPTH = 4;
+ private boolean resizeable = true;
+ private boolean resizeableSet = false;
+
public abstract int getWidth();
public abstract int getHeight();
@@ -59,11 +63,9 @@
public abstract void setMinWidth(int width);
public abstract void setMinHeight(int height);
- public abstract boolean isResizeable();
public abstract boolean isMoveable();
public abstract boolean isAutosized();
- public abstract void setResizeable(boolean resizeable);
public abstract void setMoveable(boolean moveable);
public abstract void setAutosized(boolean autosized);
@@ -130,4 +132,35 @@
public void setVisualOptions(Map visualOptions) {
this.visualOptions = visualOptions;
}
+
+ /**
+ * if "true" there is possibility to change component size
+ * Setter for resizeable
+ * @param resizeable - new value
+ */
+ public void setResizeable(boolean __resizeable) {
+ this.resizeable = __resizeable;
+ this.resizeableSet = true;
+ }
+
+ /**
+ * if "true" there is possibility to change component size
+ * Getter for resizeable
+ * @return resizeable value from local variable or value bindings
+ */
+ public boolean isResizeable() {
+ if (this.resizeableSet) {
+ return this.resizeable;
+ }
+ ValueBinding vb = getValueBinding("resizeable");
+ if (vb != null) {
+ Boolean value = (Boolean) vb.getValue(getFacesContext());
+ if (null == value) {
+ return !isAutosized();
+ }
+ return (value.booleanValue());
+ } else {
+ return !isAutosized();
+ }
+ }
}
Modified: branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
===================================================================
--- branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-12 08:44:03 UTC (rev 3903)
+++ branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-12 11:04:49 UTC (rev 3904)
@@ -88,7 +88,7 @@
//TODO nick - add messages
public void checkOptions(FacesContext context, UIModalPanel panel) {
if (panel.isAutosized() && panel.isResizeable()) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("Autosized modal panel can't be resizeable.");
}
if (panel.getMinHeight() != -1) {
if (panel.getMinHeight() < sizeA) {
18 years, 5 months
JBoss Rich Faces SVN: r3903 - trunk/ui/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-12 03:44:03 -0500 (Mon, 12 Nov 2007)
New Revision: 3903
Modified:
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
RF-1322
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-11-12 08:21:10 UTC (rev 3902)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-11-12 08:44:03 UTC (rev 3903)
@@ -73,7 +73,7 @@
style="#{component.shadowStyle}" >
</div>
<table id="#{clientId}ContentTable" cellpadding="0" cellspacing="0" border="0" style="position: absolute; z-index: 2;"><tbody><tr><td class="dr-mpnl-pnl">
- <div id="#{clientId}ContentDiv" style="overflow: hidden; #{component.attributes['style']}">
+ <div id="#{clientId}ContentDiv" style="overflow: hidden; #{component.attributes['style']}" class="rich-mp-content">
<a href="#" class="dr-mpnl-pnl-a" id="#{clientId}FirstHref" >_</a>
<table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0">
18 years, 5 months
JBoss Rich Faces SVN: r3902 - in trunk/ui/panelbar/src/main: java/org/richfaces/renderkit/html and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-12 03:21:10 -0500 (Mon, 12 Nov 2007)
New Revision: 3902
Modified:
trunk/ui/panelbar/src/main/config/component/panelbar.xml
trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java
trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
Log:
add onleave onenter client events
Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-11-12 03:03:18 UTC (rev 3901)
+++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-11-12 08:21:10 UTC (rev 3902)
@@ -223,6 +223,25 @@
</description>
<defaultvalue><![CDATA["false"]]></defaultvalue>
</property>
+
+ <property>
+ <name>onenter</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Event must occurs on than item has been changed
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+
+ <property>
+ <name>onleave</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Event must occurs on than item has been changed
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+
</component>
</components>
Modified: trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java
===================================================================
--- trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-11-12 03:03:18 UTC (rev 3901)
+++ trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-11-12 08:21:10 UTC (rev 3902)
@@ -125,13 +125,22 @@
}*/
}
- protected List getPanelBarItems(FacesContext context,UIPanelBar panelBar){
+ protected List getScriptPanelBarItems(FacesContext context,UIPanelBar panelBar){
List items = new ArrayList();
+ JSReference id_ref = new JSReference("id");
+ JSReference onenter = new JSReference("onenter");
+ JSReference onleave = new JSReference("onleave");
+
List children = panelBar.getChildren();
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
UIComponent child = (UIComponent) iterator.next();
if(child instanceof UIPanelBarItem){
- items.add(((UIPanelBarItem)child).getClientId(context));
+ Map item = new HashMap();
+ UIPanelBarItem panelBarItem = (UIPanelBarItem) child;
+ item.put(id_ref, panelBarItem.getClientId(context));
+ item.put(onenter, panelBarItem.getAttributes().get("onenter"));
+ item.put(onleave, panelBarItem.getAttributes().get("onleave"));
+ items.add(item);
}
}
@@ -143,12 +152,16 @@
if(component instanceof UIPanelBar){
UIPanelBar panelBar = (UIPanelBar)component;
+ List items = getScriptPanelBarItems(context, panelBar);
+
ScriptOptions options = new ScriptOptions(component);
options.addOption("onitemchange",panelBar.getAttributes().get("onitemchange"));
options.addOption("onclick", panelBar.getAttributes().get("onclick"));
options.addOption("mouseouver", panelBar.getAttributes().get("mouseouver"));
options.addOption("mouseout", panelBar.getAttributes().get("mouseout"));
options.addOption("mousemove", panelBar.getAttributes().get("mousemove"));
+ options.addOption("items", items);
+
StringBuffer script = new StringBuffer();
JSFunction function = new JSFunction("new Richfaces.PanelBar");
Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-11-12 03:03:18 UTC (rev 3901)
+++ trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-11-12 08:21:10 UTC (rev 3902)
@@ -31,6 +31,7 @@
this.mouseover = options.mouseover;
this.mouseout = options.mouseout;
this.mousemove = options.mousemove;
+ this.items = options.items;
if (this.mouseover && this.mouseover != ""){
Event.observe(this.panel,'mouseover',new Function("event", "return " + this.mouseout + ";").bindAsEventListener(this));
@@ -107,18 +108,48 @@
onItemChange: function(event,slide){
var onitemchange = this.onitemchange;
var changeEvent = event;
- if(onitemchange && onitemchange != ""){
- var leftItem_id = this.current.item.id;
- var enterItem_id = slide.item.id;
- var panel_id = this.panel.id;
- var func = new Function("event","panel_id","leftItem_id","enterItem_id",onitemchange);
- var result = func(changeEvent,panel_id,leftItem_id,enterItem_id);
+ var leaveItem_id = this.current.item.id;
+ var enterItem_id = slide.item.id;
+ var panel_id = this.panel.id;
+
+ if (onitemchange && onitemchange != "") {
+ var func = new Function("event","panel_id","leaveItem_id","enterItem_id",onitemchange);
+ var result = func(changeEvent,panel_id,leaveItem_id,enterItem_id);
if (result != undefined && !result) {
return;
}
- }
+ }
+
+ var items = this.items;
+ var leaveItem;
+ var enterItem;
+
+ for (var i = 0; i < items.length; i++) {
+ if (leaveItem_id == items[i].id) {
+ leaveItem = items[i];
+ }
+ if (enterItem_id == items[i].id) {
+ enterItem = items[i];
+ }
+ }
+
+ if (leaveItem && leaveItem.onleave) {
+ var func = new Function("event","leaveItem_id","enterItem_id",leaveItem.onleave);
+ var result = func(changeEvent,leaveItem_id,enterItem_id);
+ if (result != undefined && !result) {
+ return;
+ }
+ }
+
+ if (enterItem && enterItem.onenter) {
+ var func = new Function("event","leaveItem_id","enterItem_id",enterItem.onenter);
+ var result = func(changeEvent,leaveItem_id,enterItem_id);
+ if (result != undefined && !result) {
+ return;
+ }
+ }
},
-
+
_attachBehaviors: function() {
var rows=this._getDirectChildrenByTag(this.panel,'DIV');
for(var i=0; i<rows.length; i++) {
18 years, 5 months
JBoss Rich Faces SVN: r3901 - in trunk/ui/drag-drop/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-11 22:03:18 -0500 (Sun, 11 Nov 2007)
New Revision: 3901
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
Log:
http://jira.jboss.com/jira/browse/RF-1330
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -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: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -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: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -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: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DnDValidator.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -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: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -26,7 +26,6 @@
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;
@@ -34,6 +33,7 @@
import org.ajax4jsf.renderkit.RendererUtils;
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;
@@ -47,10 +47,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: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-11-12 03:03:11 UTC (rev 3900)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-11-12 03:03:18 UTC (rev 3901)
@@ -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);
18 years, 5 months
JBoss Rich Faces SVN: r3900 - trunk/ui/tree/src/main/java/org/richfaces/component/events.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-11 22:03:11 -0500 (Sun, 11 Nov 2007)
New Revision: 3900
Modified:
trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
Log:
http://jira.jboss.com/jira/browse/RF-1330
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-11-12 03:03:07 UTC (rev 3899)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-11-12 03:03:11 UTC (rev 3900)
@@ -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) {
18 years, 5 months
JBoss Rich Faces SVN: r3899 - trunk/framework/api/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-11 22:03:07 -0500 (Sun, 11 Nov 2007)
New Revision: 3899
Added:
trunk/framework/api/src/main/java/org/richfaces/event/DnDEvent.java
Removed:
trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java
trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java
Log:
http://jira.jboss.com/jira/browse/RF-1330
Added: trunk/framework/api/src/main/java/org/richfaces/event/DnDEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/DnDEvent.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/event/DnDEvent.java 2007-11-12 03:03:07 UTC (rev 3899)
@@ -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: trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-11-12 03:03:02 UTC (rev 3898)
+++ trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-11-12 03:03:07 UTC (rev 3899)
@@ -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: trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-11-12 03:03:02 UTC (rev 3898)
+++ trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-11-12 03:03:07 UTC (rev 3899)
@@ -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: trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-11-12 03:03:02 UTC (rev 3898)
+++ trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-11-12 03:03:07 UTC (rev 3899)
@@ -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;
- }
-
-}
18 years, 5 months
JBoss Rich Faces SVN: r3898 - trunk/samples/dragDropDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-11 22:03:02 -0500 (Sun, 11 Nov 2007)
New Revision: 3898
Modified:
trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-1330
Modified: trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-11-12 03:02:58 UTC (rev 3897)
+++ trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-11-12 03:03:02 UTC (rev 3898)
@@ -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}" />
18 years, 5 months
JBoss Rich Faces SVN: r3897 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-11 22:02:58 -0500 (Sun, 11 Nov 2007)
New Revision: 3897
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
Log:
http://jira.jboss.com/jira/browse/RF-1330
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-11-12 02:56:22 UTC (rev 3896)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-11-12 03:02:58 UTC (rev 3897)
@@ -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 [];
18 years, 5 months