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/20 16:22:59 UTC
svn commit: r466173 -
/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
Author: awiner
Date: Fri Oct 20 09:22:58 2006
New Revision: 466173
URL: http://svn.apache.org/viewvc?view=rev&rev=466173
Log:
Merge back JSF 1.2 modifications, one step at a time. Having svn problems with some files
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
Modified: incubator/adffaces/branches/faces-1_2-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Fri Oct 20 09:22:58 2006
@@ -15,7 +15,10 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.ActionSource;
+import javax.faces.component.ActionSource2;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -35,12 +38,35 @@
* @author The Oracle ADF Faces Team
*/
abstract public class UIXCommandTemplate extends UIXComponentBase
- implements ActionSource, DialogSource
+ implements ActionSource, ActionSource2, DialogSource
{
/**/ // Abstract methods implemented by code gen
+/**/ abstract public MethodExpression getActionExpression();
+/**/ abstract public MethodExpression setActionExpression();
+/**/ abstract public MethodExpression getLaunchListener();
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
-/**/ abstract public MethodBinding getLaunchListener();
+/**/ abstract public MethodExpression getReturnListener();
+/**/ abstract public MethodExpression getLaunchListener();
+
+ public MethodBinding getAction()
+ {
+ MethodExpression me = getActionExpression();
+ if (me == null)
+ return null;
+
+ if (me instanceof MethodBindingMethodExpression)
+ return ((MethodBindingMethodExpression) me).getMethodBinding();
+
+ return new MethodExpressionMethodBinding(me);
+ }
+
+ public void setAction(MethodBinding binding)
+ {
+ if (binding instanceof MethodExpressionMethodBinding)
+ setActionExpression(((MethodExpressionMethodBinding) binding).getMethodExpression());
+ else
+ setActionExpression(new MethodBindingMethodExpression(binding));
+ }
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for the
@@ -107,7 +133,7 @@
if (event instanceof LaunchEvent)
{
- broadcastToMethodBinding(event, getLaunchListener());
+ broadcastToMethodExpression(event, getLaunchListener());
boolean useWindow =
Boolean.TRUE.equals(getAttributes().get("useWindow"));
@@ -115,7 +141,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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java Fri Oct 20 09:22:58 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.faces.context.FacesContext;
import javax.faces.component.NamingContainer;
/**
@@ -61,9 +62,9 @@
* @return the local clientId
*/
@Override
- protected final String getLocalClientId()
+ public final String getContainerClientId(FacesContext context)
{
- String id = super.getLocalClientId();
+ String id = getClientId(context);
String key = getCurrencyString();
if (key != null)
{
Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java Fri Oct 20 09:22:58 2006
@@ -17,6 +17,8 @@
import java.util.Iterator;
+import javax.el.ValueExpression;
+
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
import javax.faces.component.EditableValueHolder;
@@ -25,7 +27,6 @@
import javax.faces.convert.ConverterException;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.ValueChangeEvent;
@@ -111,6 +112,7 @@
// Submitted value == null means "the component was not submitted
// at all"; validation should not continue
+
Object submittedValue = getSubmittedValue();
if (submittedValue == null)
return;
@@ -239,21 +241,21 @@
if (!isValid() || !isLocalValueSet())
return;
- ValueBinding binding = getFacesBean().getValueBinding(VALUE_KEY);
- if (binding == null)
+ ValueExpression expression = getFacesBean().getValueExpression(VALUE_KEY);
+ if (expression == null)
return;
try
{
Object localValue = getLocalValue();
- binding.setValue(context, localValue);
+ expression.setValue(context.getELContext(), localValue);
setValue(null);
setLocalValueSet(false);
if (_LOG.isFiner())
{
_LOG.finer("Wrote value {0} to model {1} in component {2}",
new Object[]{localValue,
- binding.getExpressionString(),
+ expression.getExpressionString(),
this});
}
}
@@ -263,8 +265,8 @@
// bean attribute level validation:
if (_LOG.isFine())
{
- _LOG.fine("Error updating binding ({0})",
- binding.getExpressionString());
+ _LOG.fine("Error updating expression ({0})",
+ expression.getExpressionString());
_LOG.fine(e);
}
@@ -381,7 +383,6 @@
{
newValue = renderer.getConvertedValue(context, this,
submittedValue);
-
if (_LOG.isFine())
{
_LOG.fine("Renderer " + renderer + " returned value " + newValue + "(" +
@@ -466,7 +467,7 @@
{
Object o = getAttributes().get("label");
if (o == null)
- o = getValueBinding("label");
+ o = getValueExpression("label");
return o;
}
@@ -475,7 +476,7 @@
{
Object o = getAttributes().get("requiredMessageDetail");
if (o == null)
- o = getValueBinding("requiredMessageDetail");
+ o = getValueExpression("requiredMessageDetail");
return o;
}
@@ -527,13 +528,13 @@
return converter;
}
- ValueBinding valueBinding = getValueBinding("value");
- if (valueBinding == null)
+ ValueExpression valueExpression = getValueExpression("value");
+ if (valueExpression == null)
{
return null;
}
- Class<?> converterType = valueBinding.getType(context);
+ Class<?> converterType = valueExpression.getType(context.getELContext());
// if converterType is null, String, or Object, assume
// no conversion is needed
if (converterType == null ||
Modified: incubator/adffaces/branches/faces-1_2-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java Fri Oct 20 09:22:58 2006
@@ -15,7 +15,10 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.ActionSource;
+import javax.faces.component.ActionSource2;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -36,12 +39,35 @@
* @author The Oracle ADF Faces Team
*/
abstract public class UIXSelectInputTemplate extends UIXEditableValue
- implements ActionSource
+ implements ActionSource, ActionSource2
{
/**/ // Abstract methods implemented by code gen
+/**/ abstract public MethodExpression getActionExpression();
+/**/ abstract public MethodExpression setActionExpression();
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
+/**/ abstract public MethodExpression getReturnListener();
+
+
+ public MethodBinding getAction()
+ {
+ MethodExpression me = getActionExpression();
+ if (me == null)
+ return null;
+
+ if (me instanceof MethodBindingMethodExpression)
+ return ((MethodBindingMethodExpression) me).getMethodBinding();
+
+ return new MethodExpressionMethodBinding(me);
+ }
+
+ public void setAction(MethodBinding binding)
+ {
+ if (binding instanceof MethodExpressionMethodBinding)
+ setActionExpression(((MethodExpressionMethodBinding) binding).getMethodExpression());
+ else
+ setActionExpression(new MethodBindingMethodExpression(binding));
+ }
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for any
@@ -113,7 +139,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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Fri Oct 20 09:22:58 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-second/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-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?view=diff&rev=466173&r1=466172&r2=466173
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Fri Oct 20 09:22:58 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,