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/09/29 00:27:46 UTC
svn commit: r819754 - in /myfaces/core/trunk/impl/src/main:
java/org/apache/myfaces/el/unified/resolver/
java/org/apache/myfaces/taglib/core/
java/org/apache/myfaces/view/facelets/tag/composite/
java/org/apache/myfaces/view/facelets/tag/jstl/core/ reso...
Author: lu4242
Date: Mon Sep 28 22:27:45 2009
New Revision: 819754
URL: http://svn.apache.org/viewvc?rev=819754&view=rev
Log:
small fix javadoc and annotations
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java Mon Sep 28 22:27:45 2009
@@ -47,8 +47,8 @@
private static final String COMPOSITE_COMPONENT_ATTRIBUTES_MAPS =
"org.apache.myfaces.COMPOSITE_COMPONENT_ATTRIBUTES_MAPS";
- private static final String COMPOSITE_COMPONENT_GET_VALUE_EXPRESSION =
- "org.apache.myfaces.COMPOSITE_COMPONENT_GET_VALUE_EXPRESSION";
+ //private static final String COMPOSITE_COMPONENT_GET_VALUE_EXPRESSION =
+ // "org.apache.myfaces.COMPOSITE_COMPONENT_GET_VALUE_EXPRESSION";
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java Mon Sep 28 22:27:45 2009
@@ -60,7 +60,8 @@
* The fully qualified class name of the ActionListener class.
*/
@Override
- @JSFJspAttribute(className = "java.lang.String", rtexprvalue = true)
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
super.setType(type);
@@ -70,7 +71,8 @@
* Value binding expression that evaluates to an object that implements javax.faces.event.ActionListener.
*/
@Override
- @JSFJspAttribute(className = "javax.faces.event.ActionListener", rtexprvalue = true)
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="javax.faces.event.ActionListener")
public void setBinding(ValueExpression binding)
{
super.setBinding(binding);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java Mon Sep 28 22:27:45 2009
@@ -67,7 +67,8 @@
*
* @param nameExpression
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.String")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setName(ValueExpression nameExpression)
{
_nameExpression = nameExpression;
@@ -78,7 +79,8 @@
*
* @param valueExpression
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.Object")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.Object")
public void setValue(ValueExpression valueExpression)
{
_valueExpression = valueExpression;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java Mon Sep 28 22:27:45 2009
@@ -52,7 +52,8 @@
/**
* The converter's registered ID.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.String")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setConverterId(ValueExpression converterId)
{
_converterId = converterId;
@@ -61,7 +62,8 @@
/**
* A ValueExpression that evaluates to a Converter.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "javax.faces.convert.Converter")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="javax.faces.convert.Converter")
public void setBinding(ValueExpression binding)
{
_binding = binding;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java Mon Sep 28 22:27:45 2009
@@ -65,7 +65,8 @@
/**
* The base name of the resource bundle.
*/
- @JSFJspAttribute(required = true, rtexprvalue = true, className = "java.lang.String")
+ @JSFJspAttribute(required = true, className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setBasename(ValueExpression basename)
{
_basename = basename;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java Mon Sep 28 22:27:45 2009
@@ -60,7 +60,8 @@
/**
* Class name of the PhaseListener to be created and registered.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.String")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
this.type = type;
@@ -69,7 +70,8 @@
/**
* Value binding expression that evaluates to a PhaseListener.
*/
- @JSFJspAttribute(className = "javax.faces.event.PhaseListener", rtexprvalue = true)
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="javax.faces.event.PhaseListener")
public void setBinding(ValueExpression binding)
{
this.binding = binding;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java Mon Sep 28 22:27:45 2009
@@ -90,7 +90,9 @@
/**
* ValueExpression for the destination of the value attribute.
*/
- @JSFJspAttribute(required = true)
+ @JSFJspAttribute(required = true,
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.Object")
public ValueExpression getTarget()
{
return target;
@@ -106,7 +108,9 @@
*
* @return
*/
- @JSFJspAttribute(required = true)
+ @JSFJspAttribute(required = true,
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.Object")
public ValueExpression getValue()
{
return value;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java Mon Sep 28 22:27:45 2009
@@ -61,7 +61,8 @@
/**
* The registered ID of the desired Validator.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.String")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setValidatorId(ValueExpression validatorId)
{
_validatorId = validatorId;
@@ -70,7 +71,8 @@
/**
* A ValueExpression that evaluates to an implementation of the javax.faces.validator.Validator interface.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "javax.faces.validator.Validator")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="javax.faces.validator.Validator")
public void setBinding(ValueExpression binding)
{
_binding = binding;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java Mon Sep 28 22:27:45 2009
@@ -67,7 +67,8 @@
* The name of a Java class that implements ValueChangeListener.
*/
@Override
- @JSFJspAttribute(className = "java.lang.String", rtexprvalue = true)
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
super.setType(type);
@@ -78,7 +79,8 @@
* interface.
*/
@Override
- @JSFJspAttribute(className = "javax.faces.event.ValueChangeListener", rtexprvalue = true)
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="javax.faces.event.ValueChangeListener")
public void setBinding(ValueExpression binding)
{
super.setBinding(binding);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java Mon Sep 28 22:27:45 2009
@@ -69,7 +69,8 @@
/**
* If true, generated markup is escaped. Default: false.
*/
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.Boolean")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.Boolean")
public void setEscape(ValueExpression escape)
{
_escape = escape;
@@ -80,7 +81,8 @@
* any subsequent form submit. The default value for this property is true.
*/
@Override
- @JSFJspAttribute(rtexprvalue = true, className = "java.lang.Boolean")
+ @JSFJspAttribute(className="javax.el.ValueExpression",
+ deferredValueType="java.lang.Boolean")
public void setRendered(ValueExpression rendered)
{
_rendered = rendered;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java Mon Sep 28 22:27:45 2009
@@ -56,7 +56,8 @@
*/
@JSFFaceletAttribute(name="name",
className="javax.el.ValueExpression",
- deferredValueType="java.lang.String")
+ deferredValueType="java.lang.String",
+ required=true)
protected final TagAttribute _name;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java Mon Sep 28 22:27:45 2009
@@ -45,10 +45,15 @@
private static final Log log = LogFactory.getLog(AttributeHandler.class);
- @JSFFaceletAttribute(name="name")
+ @JSFFaceletAttribute(name="name",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String",
+ required=true)
private final TagAttribute _name;
- @JSFFaceletAttribute(name="targets")
+ @JSFFaceletAttribute(name="targets",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _targets;
/**
@@ -56,10 +61,14 @@
* value (null), the value set on this property is returned as default
* instead null.
*/
- @JSFFaceletAttribute(name="default")
+ @JSFFaceletAttribute(name="default",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _default;
- @JSFFaceletAttribute(name="displayName")
+ @JSFFaceletAttribute(name="displayName",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _displayName;
/**
@@ -68,22 +77,34 @@
* Myfaces specific feature: this attribute is checked only if project stage is
* not ProjectStage.Production when a composite component is created.</p>
*/
- @JSFFaceletAttribute(name="required")
+ @JSFFaceletAttribute(name="required",
+ className="javax.el.ValueExpression",
+ deferredValueType="boolean")
private final TagAttribute _required;
- @JSFFaceletAttribute(name="preferred")
+ @JSFFaceletAttribute(name="preferred",
+ className="javax.el.ValueExpression",
+ deferredValueType="boolean")
private final TagAttribute _preferred;
- @JSFFaceletAttribute(name="expert")
+ @JSFFaceletAttribute(name="expert",
+ className="javax.el.ValueExpression",
+ deferredValueType="boolean")
private final TagAttribute _expert;
- @JSFFaceletAttribute(name="shortDescription")
+ @JSFFaceletAttribute(name="shortDescription",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _shortDescription;
- @JSFFaceletAttribute(name="method-signature")
+ @JSFFaceletAttribute(name="method-signature",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _methodSignature;
- @JSFFaceletAttribute(name="type")
+ @JSFFaceletAttribute(name="type",
+ className="javax.el.ValueExpression",
+ deferredValueType="java.lang.String")
private final TagAttribute _type;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java Mon Sep 28 22:27:45 2009
@@ -33,6 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
@@ -40,6 +41,7 @@
* @author Leonardo Uribe (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFFaceletTag(name="composite:implementation")
public class ImplementationHandler extends TagHandler
{
private static final Log log = LogFactory.getLog(ImplementationHandler.class);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java Mon Sep 28 22:27:45 2009
@@ -48,7 +48,8 @@
*/
@JSFFaceletAttribute(name="name",
className="javax.el.ValueExpression",
- deferredValueType="java.lang.String")
+ deferredValueType="java.lang.String",
+ required=true)
protected final TagAttribute _name;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java Mon Sep 28 22:27:45 2009
@@ -42,7 +42,8 @@
*/
@JSFFaceletAttribute(name="name",
className="javax.el.ValueExpression",
- deferredValueType="java.lang.String")
+ deferredValueType="java.lang.String",
+ required=true)
protected final TagAttribute _name;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java Mon Sep 28 22:27:45 2009
@@ -47,7 +47,7 @@
* The test condition that determines whether or not the
* body content should be processed.
*/
- @JSFFaceletAttribute(className="boolean")
+ @JSFFaceletAttribute(className="boolean",required=true)
private final TagAttribute test;
public ChooseWhenHandler(TagConfig config)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java Mon Sep 28 22:27:45 2009
@@ -51,7 +51,7 @@
* The test condition that determines whether or
* not the body content should be processed.
*/
- @JSFFaceletAttribute(className="boolean")
+ @JSFFaceletAttribute(className="boolean", required=true)
private final TagAttribute test;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java Mon Sep 28 22:27:45 2009
@@ -76,7 +76,7 @@
*/
@JSFFaceletAttribute(
className="javax.el.ValueExpression",
- deferredValueType="java.lang.String")
+ deferredValueType="java.lang.Object")
private final TagAttribute value;
public SetHandler(TagConfig config)
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm Mon Sep 28 22:27:45 2009
@@ -226,12 +226,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -241,7 +244,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm Mon Sep 28 22:27:45 2009
@@ -237,12 +237,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -252,7 +255,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>
@@ -282,12 +284,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -297,7 +302,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm Mon Sep 28 22:27:45 2009
@@ -225,12 +225,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -240,7 +243,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>
@@ -270,12 +272,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -285,7 +290,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm?rev=819754&r1=819753&r2=819754&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm Mon Sep 28 22:27:45 2009
@@ -214,12 +214,15 @@
<name>$attribute.name</name>
<required>$attribute.isRequired()</required>
#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
- <deferred-value></deferred-value>
-#else
-#if($attribute.isRtexprvalue())
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
<deferred-value>
- <type>$attribute.className</type>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
</deferred-value>
#else
<rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
@@ -229,7 +232,6 @@
<type>java.lang.String</type>
#end
#end
-#end
</attribute>
#end
</tag>