You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/12/12 16:00:49 UTC
svn commit: r486174 - in /myfaces/tobago/trunk:
example/sandbox/src/main/webapp/
sandbox/src/main/java/org/apache/myfaces/tobago/component/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
Author: lofwyr
Date: Tue Dec 12 07:00:47 2006
New Revision: 486174
URL: http://svn.apache.org/viewvc?view=rev&rev=486174
Log:
TOBAGO-18: wrapping broatcast to excute a methodbinding in a node. e.g. action="#{node.userObject.myAction}"
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp?view=diff&rev=486174&r1=486173&r2=486174
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp Tue Dec 12 07:00:47 2006
@@ -80,8 +80,7 @@
<tcs:treeNode label="Root" id="root">
<tcs:treeNodes value="#{tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}" id="template"
- action="#{controller.action1}" value="#{node}"/>
- <%--action="#{node.userObject.action}" value="#{node}"/>--%>
+ action="#{node.userObject.action}" value="#{node}"/>
</tcs:treeNodes>
<tcs:treeNode label="Action 1" action="#{controller.action1}" id="action1"/>
<tcs:treeNode label="Action 2" action="#{controller.action2}" id="action2"/>
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java?view=diff&rev=486174&r1=486173&r2=486174
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java Tue Dec 12 07:00:47 2006
@@ -25,6 +25,10 @@
import javax.faces.component.NamingContainer;
import javax.faces.context.FacesContext;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.PhaseId;
+import javax.faces.event.FacesListener;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.IOException;
@@ -67,6 +71,10 @@
}
}
+ public String getPathIndex() {
+ return pathIndex;
+ }
+
private void setPathIndex(String pathIndex) {
if (StringUtils.equals(this.pathIndex, pathIndex)) {
@@ -143,6 +151,30 @@
}
@Override
+ public void queueEvent(FacesEvent event) {
+ super.queueEvent(new FacesEventWrapper(event, getPathIndex(), this));
+ }
+
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException {
+ if (event instanceof FacesEventWrapper) {
+ FacesEvent originalEvent = ((FacesEventWrapper) event)
+ .getWrappedFacesEvent();
+ String eventPathIndex = ((FacesEventWrapper) event).getPathIndex();
+ String currentPathIndex = getPathIndex();
+ setPathIndex(eventPathIndex);
+ try {
+ originalEvent.getComponent().broadcast(originalEvent);
+ }
+ finally {
+ setPathIndex(currentPathIndex);
+ }
+ } else {
+ super.broadcast(event);
+ }
+ }
+
+ @Override
public Object saveState(FacesContext context) {
Object[] state = new Object[2];
state[0] = super.saveState(context);
@@ -187,6 +219,60 @@
public void setCurrentParentNodeId(String currentParentNodeId) {
this.currentParentNodeId = currentParentNodeId;
+ }
+
+ private static class FacesEventWrapper extends FacesEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private FacesEvent wrappedFacesEvent;
+ private String pathIndex;
+
+ FacesEventWrapper(FacesEvent facesEvent, String pathIndex,
+ UITreeNodes redirectComponent) {
+ super(redirectComponent);
+ wrappedFacesEvent = facesEvent;
+ this.pathIndex = pathIndex;
+ }
+
+ @Override
+ public PhaseId getPhaseId() {
+ return wrappedFacesEvent.getPhaseId();
+ }
+
+ @Override
+ public void setPhaseId(PhaseId phaseId) {
+ wrappedFacesEvent.setPhaseId(phaseId);
+ }
+
+ @Override
+ public void queue() {
+ wrappedFacesEvent.queue();
+ }
+
+ @Override
+ public String toString() {
+ return wrappedFacesEvent.toString();
+ }
+
+ @Override
+ public boolean isAppropriateListener(
+ FacesListener faceslistener) {
+ return wrappedFacesEvent.isAppropriateListener(faceslistener);
+ }
+
+ @Override
+ public void processListener(FacesListener faceslistener) {
+ wrappedFacesEvent.processListener(faceslistener);
+ }
+
+ public FacesEvent getWrappedFacesEvent() {
+ return wrappedFacesEvent;
+ }
+
+ public String getPathIndex() {
+ return pathIndex;
+ }
}
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=486174&r1=486173&r2=486174
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Tue Dec 12 07:00:47 2006
@@ -65,7 +65,6 @@
TreeState state = tree.getState();
String treeId = tree.getClientId(facesContext);
String nodeStateId = node.nodeStateId(facesContext);
- UIComponent parent = node.getParent();
Map requestParameterMap
= facesContext.getExternalContext().getRequestParameterMap();