You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/08/17 01:00:21 UTC
svn commit: r804801 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject:
ComponentImplicitObject.java ImplicitObjectResolver.java
Author: lu4242
Date: Sun Aug 16 23:00:20 2009
New Revision: 804801
URL: http://svn.apache.org/viewvc?rev=804801&view=rev
Log:
MYFACES-2331 Implement Composite Component Attributes ELResolver (jsf 2.0 spec section 5.6.2.2) and add implicit object "cc" and "component"
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java?rev=804801&r1=804800&r2=804801&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java Sun Aug 16 23:00:20 2009
@@ -26,14 +26,15 @@
/**
* Encapsulates information needed by the ImplicitObjectResolver
*
- * @author Leonardo Uribe
+ * @author Leonardo Uribe (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class ComponentImplicitObject extends ImplicitObject
{
private static final String NAME = "component".intern();
- /** Creates a new instance of ApplicationImplicitObject */
+ /** Creates a new instance of ComponentImplicitObject */
public ComponentImplicitObject()
{
}
@@ -41,8 +42,7 @@
@Override
public Object getValue(ELContext context)
{
- return facesContext(context).getAttributes()
- .get(UIComponent.CURRENT_COMPONENT);
+ return UIComponent.getCurrentComponent(facesContext(context));
}
@Override
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java?rev=804801&r1=804800&r2=804801&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java Sun Aug 16 23:00:20 2009
@@ -88,6 +88,8 @@
forFacesList.put(io16.getName(), io16);
ImplicitObject io17 = new ViewScopeImplicitObject();
forFacesList.put(io17.getName(), io17);
+ ImplicitObject io18 = new CompositeComponentImplicitObject();
+ forFacesList.put(io18.getName(), io18);
return new ImplicitObjectResolver(forFacesList);
}