You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/04 22:56:00 UTC
svn commit: r453056 - in /incubator/adffaces/branches/faces-1_2/trinidad:
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apach...
Author: awiner
Date: Wed Oct 4 15:55:57 2006
New Revision: 453056
URL: http://svn.apache.org/viewvc?view=rev&rev=453056
Log:
Change all MethodBindings (other than those on EditableValueHolder and ActionSource) to MethodExpressions
Modified:
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java Wed Oct 4 15:55:57 2006
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -40,7 +42,7 @@
* @param event
* @throws javax.faces.event.AbortProcessingException
*/
- @Override
+ @Override
public void broadcast(FacesEvent event)
throws AbortProcessingException
{
@@ -48,7 +50,7 @@
// Deliver to the default ChartDrillDownEvent
if (event instanceof ChartDrillDownEvent)
{
- broadcastToMethodBinding(event, getChartDrillDownListener());
+ broadcastToMethodExpression(event, getChartDrillDownListener());
}
super.broadcast(event);
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Wed Oct 4 15:55:57 2006
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.ActionSource;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -39,8 +41,8 @@
{
/**/ // Abstract methods implemented by code gen
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
-/**/ abstract public MethodBinding getLaunchListener();
+/**/ abstract public MethodExpression getReturnListener();
+/**/ abstract public MethodExpression getLaunchListener();
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for the
@@ -107,7 +109,7 @@
if (event instanceof LaunchEvent)
{
- broadcastToMethodBinding(event, getLaunchListener());
+ broadcastToMethodExpression(event, getLaunchListener());
boolean useWindow =
Boolean.TRUE.equals(getAttributes().get("useWindow"));
@@ -115,7 +117,7 @@
}
else if (event instanceof ReturnEvent)
{
- broadcastToMethodBinding(event, getReturnListener());
+ broadcastToMethodExpression(event, getReturnListener());
// =-=AEW: always jump to render response??? Seems the safest
// option, because we don't want to immediately update a model
// or really perform any validation.
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java Wed Oct 4 15:55:57 2006
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
@@ -32,7 +34,7 @@
/**/ // Abstract methods implemented by code gen
/**/ abstract public boolean isImmediate();
-/**/ abstract public MethodBinding getPollListener();
+/**/ abstract public MethodExpression getPollListener();
//
// Abstract methods implemented by subclass.
@@ -45,7 +47,7 @@
// Notify the specified Poll listener method (if any)
if (event instanceof PollEvent)
{
- broadcastToMethodBinding(event, getPollListener());
+ broadcastToMethodExpression(event, getPollListener());
}
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java Wed Oct 4 15:55:57 2006
@@ -14,6 +14,7 @@
* limitations under the License.
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
import javax.faces.component.ActionSource;
import javax.faces.context.FacesContext;
@@ -41,7 +42,7 @@
/**/ // Abstract methods implemented by code gen
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
+/**/ abstract public MethodExpression getReturnListener();
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for any
@@ -113,7 +114,7 @@
{
super.broadcast(event);
- broadcastToMethodBinding(event, getReturnListener());
+ broadcastToMethodExpression(event, getReturnListener());
Object returnValue = ((ReturnEvent) event).getReturnValue();
if (returnValue != null)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java Wed Oct 4 15:55:57 2006
@@ -16,6 +16,7 @@
package org.apache.myfaces.trinidad.component;
import java.io.IOException;
+import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -36,7 +37,7 @@
public abstract class UIXSelectRangeTemplate extends UIXComponentBase
{
/**/ // Abstract methods implemented by code gen
-/**/ abstract public MethodBinding getRangeChangeListener();
+/**/ abstract public MethodExpression getRangeChangeListener();
/**/ abstract public void setFirst(int first);
/**/ abstract public boolean isImmediate();
/**/ abstract public Object getValue();
@@ -58,7 +59,7 @@
// update first when the event is delivered
setFirst(gtEvent.getNewStart());
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
// Perform standard superclass processing
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java Wed Oct 4 15:55:57 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -34,7 +35,7 @@
/**/ abstract public boolean isDisclosed();
/**/ abstract public void setDisclosed(boolean setDisclosed);
/**/ abstract public boolean isImmediate();
-/**/ abstract public MethodBinding getDisclosureListener();
+/**/ abstract public MethodExpression getDisclosureListener();
@Override
public void processDecodes(FacesContext context)
@@ -81,7 +82,7 @@
getFacesContext().renderResponse();
// Notify the specified disclosure listener method (if any)
- broadcastToMethodBinding(event, getDisclosureListener());
+ broadcastToMethodExpression(event, getDisclosureListener());
}
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Wed Oct 4 15:55:57 2006
@@ -19,6 +19,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -101,7 +103,7 @@
// since the range is now different we can clear the currency cache:
clearCurrencyStringCache();
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
else if (event instanceof RowDisclosureEvent)
{
@@ -109,20 +111,20 @@
RowKeySet set = getDisclosedRowKeys();
set.addAll(eEvent.getAddedSet());
set.removeAll(eEvent.getRemovedSet());
- broadcastToMethodBinding(event, getRowDisclosureListener());
+ broadcastToMethodExpression(event, getRowDisclosureListener());
}
else if (event instanceof SortEvent)
{
SortEvent sEvent = (SortEvent) event;
setSortCriteria(sEvent.getSortCriteria());
- broadcastToMethodBinding(event, getSortListener());
+ broadcastToMethodExpression(event, getSortListener());
}
else if (event instanceof SelectionEvent)
{
//pu: Implicitly record a Change for 'selectionState' attribute
addAttributeChange("selectedRowKeys",
getSelectedRowKeys());
- broadcastToMethodBinding(event, getSelectionListener());
+ broadcastToMethodExpression(event, getSelectionListener());
}
super.broadcast(event);
@@ -137,10 +139,10 @@
/**/ abstract public void setShowAll(boolean showAll);
/**/ abstract public boolean isShowAll();
/**/ abstract public UIComponent getDetailStamp();
-/**/ public abstract MethodBinding getRangeChangeListener();
-/**/ public abstract MethodBinding getSortListener();
-/**/ public abstract MethodBinding getRowDisclosureListener();
-/**/ public abstract MethodBinding getSelectionListener();
+/**/ public abstract MethodExpression getRangeChangeListener();
+/**/ public abstract MethodExpression getSortListener();
+/**/ public abstract MethodExpression getRowDisclosureListener();
+/**/ public abstract MethodExpression getSelectionListener();
/**/ public abstract boolean isImmediate();
@Override
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Wed Oct 4 15:55:57 2006
@@ -21,6 +21,8 @@
import java.util.List;
import java.util.Map;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -44,7 +46,7 @@
abstract public class UIXTreeTableTemplate extends UIXTree
{
/**/ public abstract int[] getRowsByDepth();
-/**/ abstract public MethodBinding getRangeChangeListener();
+/**/ abstract public MethodExpression getRangeChangeListener();
/**
* Gets the maximum number of rows to show.
@@ -180,7 +182,7 @@
// it is nice to expand the focused item:
getDisclosedRowKeys().add();
- broadcastToMethodBinding(event, getFocusListener());
+ broadcastToMethodExpression(event, getFocusListener());
}
else if (event instanceof RangeChangeEvent)
{
@@ -190,7 +192,7 @@
//=-=pu: This ain't getting restored. Check with Arj or file a bug.
addAttributeChange("first",
new Integer(rce.getNewStart()));
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
// Perform standard superclass processing
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Wed Oct 4 15:55:57 2006
@@ -15,6 +15,9 @@
*/
package org.apache.myfaces.trinidad.component;
import java.io.IOException;
+
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -39,7 +42,7 @@
/**/ public abstract void setDisclosedRowKeys(RowKeySet keys);
/**/ public abstract RowKeySet getSelectedRowKeys();
/**/ public abstract void setSelectedRowKeys(RowKeySet keys);
-/**/ public abstract MethodBinding getRowDisclosureListener();
+/**/ public abstract MethodExpression getRowDisclosureListener();
/**/ public abstract UIComponent getNodeStamp();
/**
@@ -66,7 +69,7 @@
//=-=pu: This ain't getting restored. Check with Arj or file a bug.
addAttributeChange("selectedRowKeys",
getSelectedRowKeys());
- broadcastToMethodBinding(event, getSelectionListener());
+ broadcastToMethodExpression(event, getSelectionListener());
}
HierarchyUtils.__handleBroadcast(this,
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java Wed Oct 4 15:55:57 2006
@@ -17,7 +17,7 @@
import javax.faces.component.ActionSource;
-import javax.faces.el.MethodBinding;
+import javax.el.MethodExpression;
import org.apache.myfaces.trinidad.event.LaunchListener;
import org.apache.myfaces.trinidad.event.ReturnListener;
@@ -35,12 +35,12 @@
public void addReturnListener(ReturnListener listener);
public void removeReturnListener(ReturnListener listener);
public ReturnListener[] getReturnListeners();
- public void setReturnListener(MethodBinding returnListener);
- public MethodBinding getReturnListener();
+ public void setReturnListener(MethodExpression returnListener);
+ public MethodExpression getReturnListener();
public void addLaunchListener(LaunchListener listener);
public void removeLaunchListener(LaunchListener listener);
public LaunchListener[] getLaunchListeners();
- public void setLaunchListener(MethodBinding launchListener);
- public MethodBinding getLaunchListener();
+ public void setLaunchListener(MethodExpression launchListener);
+ public MethodExpression getLaunchListener();
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java Wed Oct 4 15:55:57 2006
@@ -17,9 +17,9 @@
import java.util.ArrayList;
import java.util.List;
+import javax.el.MethodExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
@@ -36,10 +36,10 @@
UIXHierarchy comp,
FacesEvent event,
RowKeySet state,
- MethodBinding disclosureListener) throws AbortProcessingException
+ MethodExpression method) throws AbortProcessingException
{
- // Notify the specified disclosure listener method (if any)
+ // Notify the specified disclosure listener method (if any)
if (event instanceof RowDisclosureEvent)
{
RowDisclosureEvent dEvent = (RowDisclosureEvent) event;
@@ -65,7 +65,7 @@
}
//pu: Implicitly record a Change for 'expandedRowKeys' attribute
comp.addAttributeChange("expandedRowKeys", state);
- comp.broadcastToMethodBinding(event, disclosureListener);
+ comp.broadcastToMethodExpression(event, method);
}
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java Wed Oct 4 15:55:57 2006
@@ -15,19 +15,10 @@
*/
package org.apache.myfaces.trinidad.component;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-import javax.faces.render.Renderer;
+import javax.el.MethodExpression;
+
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.event.AttributeChangeListener;
@@ -42,8 +33,8 @@
abstract public void removeAttributeChangeListener(AttributeChangeListener acl);
abstract public AttributeChangeListener[] getAttributeChangeListeners();
- abstract public void setAttributeChangeListener(MethodBinding mb);
- abstract public MethodBinding getAttributeChangeListener();
+ abstract public void setAttributeChangeListener(MethodExpression me);
+ abstract public MethodExpression getAttributeChangeListener();
abstract public void markInitialState();
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java Wed Oct 4 15:55:57 2006
@@ -26,6 +26,8 @@
import java.util.Properties;
import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.FacesException;
@@ -85,8 +87,7 @@
static private final PropertyKey _LISTENERS_KEY =
TYPE.registerKey("listeners", FacesListener[].class, PropertyKey.CAP_LIST);
static private final PropertyKey _ATTRIBUTE_CHANGE_LISTENER_KEY =
- TYPE.registerKey("attributeChangeListener", MethodBinding.class,
- PropertyKey.CAP_STATE_HOLDER);
+ TYPE.registerKey("attributeChangeListener", MethodExpression.class);
// =-=AEW "parent", "rendersChildren", "childCount", "children",
// "facets", "facetsAndChildren", "family" all are technically
// bean properties, but they aren't exposed here...
@@ -169,15 +170,15 @@
}
@Override
- public void setAttributeChangeListener(MethodBinding mb)
+ public void setAttributeChangeListener(MethodExpression mb)
{
setProperty(_ATTRIBUTE_CHANGE_LISTENER_KEY, mb);
}
@Override
- public MethodBinding getAttributeChangeListener()
+ public MethodExpression getAttributeChangeListener()
{
- return (MethodBinding) getProperty(_ATTRIBUTE_CHANGE_LISTENER_KEY);
+ return (MethodExpression) getProperty(_ATTRIBUTE_CHANGE_LISTENER_KEY);
}
@@ -630,7 +631,7 @@
if (event instanceof AttributeChangeEvent)
{
- broadcastToMethodBinding(event, getAttributeChangeListener());
+ broadcastToMethodExpression(event, getAttributeChangeListener());
}
}
@@ -1164,6 +1165,7 @@
* This can be used to support MethodBindings such as the "actionListener"
* binding on ActionSource components:
* <tr:commandButton actionListener="#{mybean.myActionListener}">
+ * @deprecated
*/
protected final void broadcastToMethodBinding(
FacesEvent event,
@@ -1177,6 +1179,35 @@
method.invoke(context, new Object[] { event });
}
catch (EvaluationException ee)
+ {
+ Throwable t = ee.getCause();
+ // Unwrap AbortProcessingExceptions
+ if (t instanceof AbortProcessingException)
+ throw ((AbortProcessingException) t);
+ throw ee;
+ }
+ }
+ }
+
+
+ /**
+ * Broadcast an event to a MethodExpression.
+ * This can be used to support MethodBindings such as the "actionListener"
+ * binding on ActionSource components:
+ * <tr:commandButton actionListener="#{mybean.myActionListener}">
+ */
+ protected final void broadcastToMethodExpression(
+ FacesEvent event,
+ MethodExpression method) throws AbortProcessingException
+ {
+ if (method != null)
+ {
+ try
+ {
+ FacesContext context = getFacesContext();
+ method.invoke(context.getELContext(), new Object[] { event });
+ }
+ catch (ELException ee)
{
Throwable t = ee.getCause();
// Unwrap AbortProcessingExceptions
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java Wed Oct 4 15:55:57 2006
@@ -23,6 +23,8 @@
import java.util.Date;
import java.util.Iterator;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -132,10 +134,14 @@
if (_attributeChangeListener != null)
{
- MethodBinding mb =
- createMethodBinding(_attributeChangeListener,
- new Class[]{AttributeChangeEvent.class});
- uixComponent.setAttributeChangeListener(mb);
+ MethodExpression me = getFacesContext().getApplication().
+ getExpressionFactory().createMethodExpression(
+ getFacesContext().getELContext(),
+ _attributeChangeListener,
+ null,
+ new Class[]{AttributeChangeEvent.class});
+
+ uixComponent.setAttributeChangeListener(me);
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java Wed Oct 4 15:55:57 2006
@@ -15,8 +15,9 @@
*/
package org.apache.myfaces.trinidad.component;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
+import javax.el.ELContext;
+import javax.el.MethodExpression;
+import javax.el.MethodInfo;
import org.apache.myfaces.trinidad.event.AttributeChangeEvent;
import org.apache.myfaces.trinidad.event.AttributeChangeListener;
@@ -24,7 +25,7 @@
/**
* Utility class for testing out AttributeChange events.
*/
-public class AttributeChangeTester extends MethodBinding
+public class AttributeChangeTester extends MethodExpression
implements AttributeChangeListener
{
public AttributeChangeTester()
@@ -38,8 +39,13 @@
_listenerCalled = true;
}
+ public MethodInfo getMethodInfo(ELContext context)
+ {
+ return null;
+ }
+
@Override
- public Object invoke(FacesContext context, Object params[])
+ public Object invoke(ELContext context, Object params[])
{
if (params.length != 1)
throw new IllegalStateException("Params not of length 1");
@@ -52,10 +58,24 @@
return null;
}
- @Override
- public Class<?> getType(FacesContext context)
+ public String getExpressionString()
{
return null;
+ }
+
+ public boolean isLiteralText()
+ {
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return 0;
+ }
+
+ public boolean equals(Object o)
+ {
+ return o == this;
}
public void verify()
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java Wed Oct 4 15:55:57 2006
@@ -280,13 +280,19 @@
mockRenderer.expects(never()).method("decode");
}
- doTestApplyRequestValues(facesContext, root, component);
+ try
+ {
+ setCurrentContext(facesContext);
+ doTestApplyRequestValues(facesContext, root, component);
+ }
+ finally
+ {
+ setCurrentContext(null);
+ }
mockRenderKitFactory.verify();
mockRenderkit.verify();
mockRenderer.verify();
-
- setCurrentContext(null);
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml Wed Oct 4 15:55:57 2006
@@ -47,7 +47,7 @@
will be called when the user drills down into the chart data.The method must take a parameter of type <code>org.apache.myfaces.trinidad.event.ChartDrillDownEvent</code>.]]>
</description>
<property-name>chartDrillDownListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.ChartDrillDownEvent</mfp:parameter-type>
@@ -56,7 +56,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<component-extension>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml Wed Oct 4 15:55:57 2006
@@ -63,7 +63,7 @@
<property>
<description><![CDATA[a method reference to an return listener]]></description>
<property-name>returnListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:parameter-type>
@@ -72,13 +72,12 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<property>
<description><![CDATA[a method reference to a launch listener]]></description>
<property-name>launchListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.LaunchEvent</mfp:parameter-type>
@@ -87,7 +86,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml Wed Oct 4 15:55:57 2006
@@ -29,9 +29,8 @@
parameter and returns void.</description -->
<description>a method reference to an attribute change listener</description>
<property-name>attributeChangeListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
- <mfp:state-holder>true</mfp:state-holder>
<mfp:property-metadata>
<mfp:expert>true</mfp:expert>
</mfp:property-metadata>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml Wed Oct 4 15:55:57 2006
@@ -45,7 +45,7 @@
<property>
<description><![CDATA[a method reference to a poll listener]]></description>
<property-name>pollListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.PollEvent</mfp:parameter-type>
@@ -54,7 +54,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<component-extension>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml Wed Oct 4 15:55:57 2006
@@ -62,7 +62,7 @@
<property>
<description><![CDATA[a method reference to an return listener]]></description>
<property-name>returnListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:parameter-type>
@@ -71,7 +71,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<component-extension>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml Wed Oct 4 15:55:57 2006
@@ -74,7 +74,7 @@
will be called when a new range is selected.]]>
</description>
<property-name>rangeChangeListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -83,7 +83,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml Wed Oct 4 15:55:57 2006
@@ -60,7 +60,7 @@
<property>
<description><![CDATA[a method reference to a disclosure listener]]></description>
<property-name>disclosureListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.DisclosureEvent</mfp:parameter-type>
@@ -69,7 +69,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<component-extension>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml Wed Oct 4 15:55:57 2006
@@ -46,7 +46,7 @@
<property>
<description><![CDATA[a method reference to a sort listener]]></description>
<property-name>sortListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.SortEvent</mfp:parameter-type>
@@ -55,7 +55,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<property>
@@ -63,7 +62,7 @@
will be called when a new range is selected.]]>
</description>
<property-name>rangeChangeListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -72,7 +71,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml Wed Oct 4 15:55:57 2006
@@ -104,7 +104,7 @@
<property>
<description><![CDATA[a method reference to a focus listener]]></description>
<property-name>focusListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.FocusEvent</mfp:parameter-type>
@@ -113,7 +113,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml Wed Oct 4 15:55:57 2006
@@ -54,7 +54,7 @@
will be called when a new range is selected.]]>
</description>
<property-name>rangeChangeListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -63,7 +63,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
<component-extension>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml Wed Oct 4 15:55:57 2006
@@ -8,7 +8,7 @@
<property>
<description><![CDATA[a method reference to an ExpansionListener]]></description>
<property-name>rowDisclosureListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.RowDisclosureEvent</mfp:parameter-type>
@@ -17,7 +17,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml?view=diff&rev=453056&r1=453055&r2=453056
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml Wed Oct 4 15:55:57 2006
@@ -8,7 +8,7 @@
<property>
<description><![CDATA[a method reference to a selection listener]]></description>
<property-name>selectionListener</property-name>
- <property-class>javax.faces.el.MethodBinding</property-class>
+ <property-class>javax.el.MethodExpression</property-class>
<property-extension>
<mfp:method-binding-signature>
<mfp:parameter-type>org.apache.myfaces.trinidad.event.SelectionEvent</mfp:parameter-type>
@@ -17,7 +17,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:state-holder>yes</mfp:state-holder>
</property-extension>
</property>