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 2008/09/14 01:10:56 UTC
svn commit: r695059 [1/4] - in /myfaces/core/branches/2_0_0: ./ api/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/convert/
api/src/main/java/javax/faces/validator/
api/src/main/java/javax/faces/webapp/ impl/ impl/src/main/conf...
Author: lu4242
Date: Sat Sep 13 16:10:53 2008
New Revision: 695059
URL: http://svn.apache.org/viewvc?rev=695059&view=rev
Log:
MYFACES-1949 (merging all changes in trunk 1.2.x from revision 691297 to 695050) Apply myfaces-builder-plugin generation for myfaces core 1.2.x and 2.0.x
Added:
myfaces/core/branches/2_0_0/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia
myfaces/core/branches/2_0_0/impl/src/main/conf/META-INF/myfaces_core-base.tld
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/conf/META-INF/myfaces_core-base.tld
myfaces/core/branches/2_0_0/impl/src/main/conf/META-INF/myfaces_html-base.tld
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/conf/META-INF/myfaces_html-base.tld
myfaces/core/branches/2_0_0/impl/src/main/conf/META-INF/standard-faces-config-base.xml
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/conf/META-INF/standard-faces-config-base.xml
myfaces/core/branches/2_0_0/impl/src/main/old/
- copied from r695050, myfaces/core/trunk_1.2.x/impl/src/main/old/
myfaces/core/branches/2_0_0/impl/src/main/old/myfaces-html-base.tld
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/old/myfaces-html-base.tld
myfaces/core/branches/2_0_0/impl/src/main/old/myfaces-html.tld
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/old/myfaces-html.tld
myfaces/core/branches/2_0_0/impl/src/main/old/myfaces_core.tld
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/old/myfaces_core.tld
myfaces/core/branches/2_0_0/impl/src/main/old/standard-faces-config.xml
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/old/standard-faces-config.xml
myfaces/core/branches/2_0_0/impl/src/main/resources/META-INF/faces-config12.vm
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/faces-config12.vm
myfaces/core/branches/2_0_0/impl/src/main/resources/META-INF/myfaces_core12.vm
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm
myfaces/core/branches/2_0_0/impl/src/main/resources/META-INF/myfaces_html12.vm
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm
myfaces/core/branches/2_0_0/impl/src/main/resources/META-INF/tagClass12.vm
- copied unchanged from r695050, myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/tagClass12.vm
Removed:
myfaces/core/branches/2_0_0/impl/src/main/conf/META-INF/myfaces-html-base.tld
myfaces/core/branches/2_0_0/impl/src/main/resources/META-INF/myfaces_core.tld
Modified:
myfaces/core/branches/2_0_0/ (props changed)
myfaces/core/branches/2_0_0/api/pom.xml
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UINamingContainer.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessage.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessages.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIParameter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItem.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItems.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BooleanConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ByteConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/CharacterConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DateTimeConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DoubleConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/FloatConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/IntegerConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/LongConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/NumberConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ShortConverter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LengthValidator.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LongRangeValidator.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/webapp/FacetTag.java
myfaces/core/branches/2_0_0/impl/pom.xml
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ApplicationMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/InitParameterMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/RequestMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterValuesMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/DefaultPropertyResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/NullPropertyResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/ResolverForJSPInitializer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/MethodExpressionToMethodBinding.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SubviewTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/EnumerationIterator.java
myfaces/core/branches/2_0_0/impl/src/main/resources/javax/faces/Messages_fr.properties
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
myfaces/core/branches/2_0_0/pom.xml
Propchange: myfaces/core/branches/2_0_0/
------------------------------------------------------------------------------
svn:mergeinfo = /myfaces/core/trunk_1.2.x:691297-695050
Modified: myfaces/core/branches/2_0_0/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/pom.xml?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/pom.xml (original)
+++ myfaces/core/branches/2_0_0/api/pom.xml Sat Sep 13 16:10:53 2008
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -156,16 +156,16 @@
</profile>
</profiles>
<dependencies>
+ <!--
+ - The file with config metadata for generating component classes. The contents
+ - of this jarfile are processed using the maven-faces-plugin.
+ - This is no longer necessary because it is using myfaces-builder-plugin.
<dependency>
- <!--
- - The file with config metadata for generating component classes. The contents
- - of this jarfile are processed using the maven-faces-plugin.
- -->
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-build</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIComponentBase.java Sat Sep 13 16:10:53 2008
@@ -63,9 +63,10 @@
@JSFComponent(type = "javax.faces.ComponentBase",
family = "javax.faces.ComponentBase",
desc = "base component when all components must inherit",
- tagClass = "javax.faces.webapp.UIComponentELTag")
+ tagClass = "javax.faces.webapp.UIComponentELTag",
+ configExcluded = true)
@JSFJspProperty(name = "binding" ,
- returnType = "java.lang.String",
+ returnType = "javax.faces.component.UIComponent",
longDesc = "Identifies a backing bean property (of type UIComponent or appropriate subclass) to bind to this component instance. This value must be an EL expression.",
desc="backing bean property to bind to this component instance")
public abstract class UIComponentBase
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIData.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIData.java Sat Sep 13 16:10:53 2008
@@ -32,6 +32,7 @@
import javax.faces.model.*;
import javax.servlet.jsp.jstl.sql.Result;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFacet;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
/**
@@ -96,11 +97,6 @@
* see Javadoc of the <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
* for more information.
*
- * @JSFComponent
- * type = "javax.faces.Data"
- * family = "javax.faces.Data"
- * desc = "UIData"
- *
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
@@ -370,6 +366,7 @@
getFacets().put(FOOTER_FACET_NAME, footer);
}
+ @JSFFacet
public UIComponent getFooter()
{
return (UIComponent) getFacets().get(FOOTER_FACET_NAME);
@@ -380,6 +377,7 @@
getFacets().put(HEADER_FACET_NAME, header);
}
+ @JSFFacet
public UIComponent getHeader()
{
return (UIComponent) getFacets().get(HEADER_FACET_NAME);
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UINamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UINamingContainer.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UINamingContainer.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UINamingContainer.java Sat Sep 13 16:10:53 2008
@@ -19,6 +19,7 @@
package javax.faces.component;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
/**
* Base class for components that provide a new "namespace" for the ids of their
@@ -26,7 +27,11 @@
* <p>
* See the javadocs for interface NamingContainer for further details.
*/
-@JSFComponent
+@JSFComponent(
+ name="f:subview",
+ bodyContent="JSP",
+ tagClass="org.apache.myfaces.taglib.core.SubviewTag")
+@JSFJspProperty(name="id",required=true)
public class UINamingContainer extends UIComponentBase implements NamingContainer
{
public static final String COMPONENT_TYPE = "javax.faces.NamingContainer";
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/UIViewRoot.java Sat Sep 13 16:10:53 2008
@@ -52,10 +52,12 @@
* <p>
* Unless otherwise specified, all attributes accept static values or EL
* expressions.
+ * </p>
* <p>
* See the javadoc for this class in the <a
* href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF
* Specification</a> for further details.
+ * </p>
*/
@JSFComponent(name="f:view", bodyContent="JSP", tagClass="org.apache.myfaces.taglib.core.ViewTag")
@JSFJspProperty(name="binding", returnType="java.lang.String", tagExcluded=true)
@@ -217,6 +219,7 @@
* The locale for this view.
* <p>
* Defaults to the default locale specified in the faces configuration file.
+ * </p>
*/
@JSFProperty
public Locale getLocale()
@@ -669,7 +672,9 @@
}
/**
- * Gets
+ * MethodBinding pointing to a method that takes a
+ * javax.faces.event.PhaseEvent and returns void,
+ * called before every phase except for restore view.
*
* @return the new beforePhaseListener value
*/
@@ -701,7 +706,9 @@
}
/**
- * Gets
+ * MethodBinding pointing to a method that takes a
+ * javax.faces.event.PhaseEvent and returns void,
+ * called after every phase except for restore view.
*
* @return the new afterPhaseListener value
*/
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessage.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessage.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessage.java Sat Sep 13 16:10:53 2008
@@ -53,7 +53,7 @@
/**
* Specifies whether the detailed information from the message should be shown.
- * Default to false.
+ * Default to true.
*
* @return the new showDetail value
*/
@@ -63,7 +63,7 @@
/**
* Specifies whether the summary information from the message should be shown.
- * Defaults to true.
+ * Defaults to false.
*
* @return the new showSummary value
*/
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessages.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessages.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessages.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIMessages.java Sat Sep 13 16:10:53 2008
@@ -56,7 +56,7 @@
* @return the new showDetail value
*/
@JSFProperty
- (defaultValue = "true")
+ (defaultValue = "false")
public abstract boolean isShowDetail();
/**
@@ -66,7 +66,7 @@
* @return the new showSummary value
*/
@JSFProperty
- (defaultValue = "false")
+ (defaultValue = "true")
public abstract boolean isShowSummary();
}
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIParameter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIParameter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UIParameter.java Sat Sep 13 16:10:53 2008
@@ -22,10 +22,19 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
/**
- *
+ * This tag associates a parameter name-value pair with the nearest
+ * parent UIComponent. A UIComponent is created to represent this
+ * name-value pair, and stored as a child of the parent component; what
+ * effect this has depends upon the renderer of that parent component.
+ * <p>
+ * Unless otherwise specified, all attributes accept static values
+ * or EL expressions.
+ * </p>
*/
@JSFComponent
-(clazz = "javax.faces.component.UIParameter",template=true)
+(clazz = "javax.faces.component.UIParameter",template=true,
+name = "f:param",
+tagClass="org.apache.myfaces.taglib.core.ParamTag")
abstract class _UIParameter extends UIComponentBase
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItem.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItem.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItem.java Sat Sep 13 16:10:53 2008
@@ -22,13 +22,25 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
/**
- *
+ * This tag associates a single SelectItem with the nearest
+ * parent UIComponent. The item represents a single option
+ * for a component such as an h:selectBooleanCheckbox or h:selectOneMenu.
+ * See also component selectItems.
+ * <p>
+ * Unless otherwise specified, all attributes accept static values
+ * or EL expressions.
+ * </p>
+ * <p>
* UISelectItem should be nestetd inside a UISelectMany or UISelectOne component,
* and results in the addition of a SelectItem instance to the list of available options
* for the parent component
+ * </p>
*/
@JSFComponent
-(clazz = "javax.faces.component.UISelectItem",template=true)
+(clazz = "javax.faces.component.UISelectItem",template=true,
+ name = "f:selectItem",
+ tagClass = "org.apache.myfaces.taglib.core.SelectItemTag",
+ bodyContent = "empty")
abstract class _UISelectItem extends UIComponentBase
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItems.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItems.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItems.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/component/_UISelectItems.java Sat Sep 13 16:10:53 2008
@@ -22,13 +22,24 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
/**
- *
- * UISelectItems should be nestetd inside a UISelectMany or UISelectOne component,
+ * This tag associates a set of selection list items with the nearest
+ * parent UIComponent. The set of SelectItem objects is retrieved via
+ * a value-binding.
+ * <p>
+ * Unless otherwise specified, all attributes accept static values
+ * or EL expressions.
+ * </p>
+ * <p>
+ * UISelectItems should be nested inside a UISelectMany or UISelectOne component,
* and results in the addition of one ore more SelectItem instance to the list of available options
* for the parent component
+ * </p>
*/
@JSFComponent
-(clazz = "javax.faces.component.UISelectItems",template=true)
+(clazz = "javax.faces.component.UISelectItems",template=true,
+ name = "f:selectItems",
+ tagClass = "org.apache.myfaces.taglib.core.SelectItemsTag",
+ bodyContent = "empty")
abstract class _UISelectItems extends UIComponentBase
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigDecimalConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigDecimalConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigDecimalConverter.java Sat Sep 13 16:10:53 2008
@@ -20,6 +20,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
import java.math.BigDecimal;
/**
@@ -28,6 +31,7 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class BigDecimalConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigIntegerConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigIntegerConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BigIntegerConverter.java Sat Sep 13 16:10:53 2008
@@ -20,6 +20,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
import java.math.BigInteger;
/**
@@ -28,6 +31,7 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class BigIntegerConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BooleanConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BooleanConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BooleanConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/BooleanConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class BooleanConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ByteConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ByteConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ByteConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ByteConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class ByteConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/CharacterConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/CharacterConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/CharacterConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/CharacterConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class CharacterConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DateTimeConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DateTimeConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DateTimeConverter.java Sat Sep 13 16:10:53 2008
@@ -18,9 +18,6 @@
*/
package javax.faces.convert;
-import javax.faces.component.UIComponent;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -28,12 +25,32 @@
import java.util.Locale;
import java.util.TimeZone;
+import javax.faces.component.StateHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
/**
+ * This tag associates a date time converter with the nearest parent UIComponent.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter(
+ name="f:convertDateTime",
+ bodyContent="empty",
+ tagClass="org.apache.myfaces.taglib.core.ConvertDateTimeTag")
+@JSFJspProperty(
+ name="binding",
+ returnType = "javax.faces.convert.DateTimeConverter",
+ longDesc = "A ValueExpression that evaluates to a DateTimeConverter.")
public class DateTimeConverter
implements Converter, StateHolder
{
@@ -227,6 +244,13 @@
}
// GETTER & SETTER
+
+ /**
+ * The style of the date. Values include: default, short, medium,
+ * long, and full.
+ *
+ */
+ @JSFProperty
public String getDateStyle()
{
return _dateStyle != null ? _dateStyle : STYLE_DEFAULT;
@@ -238,6 +262,11 @@
_dateStyle = dateStyle;
}
+ /**
+ * The name of the locale to be used, instead of the default.
+ *
+ */
+ @JSFProperty
public Locale getLocale()
{
if (_locale != null) return _locale;
@@ -250,6 +279,11 @@
_locale = locale;
}
+ /**
+ * A custom Date formatting pattern, in the format used by java.text.SimpleDateFormat.
+ *
+ */
+ @JSFProperty
public String getPattern()
{
return _pattern;
@@ -260,6 +294,12 @@
_pattern = pattern;
}
+ /**
+ * The style of the time. Values include: default, short, medium, long,
+ * and full.
+ *
+ */
+ @JSFProperty
public String getTimeStyle()
{
return _timeStyle != null ? _timeStyle : STYLE_DEFAULT;
@@ -271,6 +311,15 @@
_timeStyle = timeStyle;
}
+ /**
+ * The time zone to use instead of GMT (the default timezone). When
+ * this value is a value-binding to a TimeZone instance, that
+ * timezone is used. Otherwise this value is treated as a String
+ * containing a timezone id, ie as the ID parameter of method
+ * java.util.TimeZone.getTimeZone(String).
+ *
+ */
+ @JSFProperty
public TimeZone getTimeZone()
{
return _timeZone != null ? _timeZone : TIMEZONE_DEFAULT;
@@ -291,6 +340,13 @@
_transient = aTransient;
}
+ /**
+ * Specifies whether the date, time, or both should be
+ * parsed/formatted. Values include: date, time, and both.
+ * Default based on setting of timeStyle and dateStyle.
+ *
+ */
+ @JSFProperty
public String getType()
{
return _type != null ? _type : TYPE_DATE;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DoubleConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DoubleConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/DoubleConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class DoubleConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/EnumConverter.java Sat Sep 13 16:10:53 2008
@@ -23,11 +23,14 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Stan Silvert
*/
+@JSFConverter
public class EnumConverter implements Converter, StateHolder {
public static final String CONVERTER_ID = "javax.faces.Enum";
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/FloatConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/FloatConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/FloatConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class FloatConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/IntegerConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/IntegerConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/IntegerConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class IntegerConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/LongConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/LongConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/LongConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class LongConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/NumberConverter.java Sat Sep 13 16:10:53 2008
@@ -18,9 +18,6 @@
*/
package javax.faces.convert;
-import javax.faces.component.UIComponent;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
@@ -28,12 +25,33 @@
import java.util.Currency;
import java.util.Locale;
+import javax.faces.component.StateHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
/**
+ * This tag creates a number formatting converter and associates it
+ * with the nearest parent UIComponent.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter(
+ name="f:convertNumber",
+ bodyContent="empty",
+ tagClass="org.apache.myfaces.taglib.core.ConvertNumberTag")
+@JSFJspProperty(
+ name="binding",
+ returnType = "javax.faces.convert.NumberConverter",
+ longDesc = "A ValueExpression that evaluates to a NumberConverter.")
public class NumberConverter
implements Converter, StateHolder
{
@@ -290,6 +308,12 @@
}
// GETTER & SETTER
+
+ /**
+ * ISO 4217 currency code
+ *
+ */
+ @JSFProperty
public String getCurrencyCode()
{
return _currencyCode != null ?
@@ -302,6 +326,12 @@
_currencyCode = currencyCode;
}
+ /**
+ * The currency symbol used to format a currency value. Defaults
+ * to the currency symbol for locale.
+ *
+ */
+ @JSFProperty
public String getCurrencySymbol()
{
return _currencySymbol != null ?
@@ -314,6 +344,11 @@
_currencySymbol = currencySymbol;
}
+ /**
+ * Specifies whether output will contain grouping separators. Default: true.
+ *
+ */
+ @JSFProperty
public boolean isGroupingUsed()
{
return _groupingUsed;
@@ -324,6 +359,11 @@
_groupingUsed = groupingUsed;
}
+ /**
+ * Specifies whether only the integer part of the input will be parsed. Default: false.
+ *
+ */
+ @JSFProperty
public boolean isIntegerOnly()
{
return _integerOnly;
@@ -334,6 +374,12 @@
_integerOnly = integerOnly;
}
+ /**
+ * The name of the locale to be used, instead of the default as
+ * specified in the faces configuration file.
+ *
+ */
+ @JSFProperty
public Locale getLocale()
{
if (_locale != null) return _locale;
@@ -346,6 +392,11 @@
_locale = locale;
}
+ /**
+ * The maximum number of digits in the fractional portion of the number.
+ *
+ */
+ @JSFProperty
public int getMaxFractionDigits()
{
return _maxFractionDigits;
@@ -357,6 +408,11 @@
_maxFractionDigits = maxFractionDigits;
}
+ /**
+ * The maximum number of digits in the integer portion of the number.
+ *
+ */
+ @JSFProperty
public int getMaxIntegerDigits()
{
return _maxIntegerDigits;
@@ -368,6 +424,11 @@
_maxIntegerDigits = maxIntegerDigits;
}
+ /**
+ * The minimum number of digits in the fractional portion of the number.
+ *
+ */
+ @JSFProperty
public int getMinFractionDigits()
{
return _minFractionDigits;
@@ -379,6 +440,11 @@
_minFractionDigits = minFractionDigits;
}
+ /**
+ * The minimum number of digits in the integer portion of the number.
+ *
+ */
+ @JSFProperty
public int getMinIntegerDigits()
{
return _minIntegerDigits;
@@ -390,6 +456,11 @@
_minIntegerDigits = minIntegerDigits;
}
+ /**
+ * A custom Date formatting pattern, in the format used by java.text.SimpleDateFormat.
+ *
+ */
+ @JSFProperty
public String getPattern()
{
return _pattern;
@@ -410,6 +481,12 @@
_transient = aTransient;
}
+ /**
+ * The type of formatting/parsing to be performed. Values include:
+ * number, currency, and percent. Default: number.
+ *
+ */
+ @JSFProperty
public String getType()
{
return _type;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ShortConverter.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ShortConverter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/convert/ShortConverter.java Sat Sep 13 16:10:53 2008
@@ -21,12 +21,15 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFConverter
public class ShortConverter
implements Converter
{
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Sat Sep 13 16:10:53 2008
@@ -22,13 +22,33 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
+
/**
+ * Creates a validator and associateds it with the nearest parent
+ * UIComponent. When invoked, the validator ensures that values are
+ * valid doubles that lie within the minimum and maximum values specified.
+ *
+ * Commonly associated with a h:inputText entity.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
*/
+@JSFValidator(
+ name="f:validateDoubleRange",
+ bodyContent="empty",
+ tagClass="org.apache.myfaces.taglib.core.ValidateDoubleRangeTag")
+@JSFJspProperty(
+ name="binding",
+ returnType = "javax.faces.validator.DoubleRangeValidator",
+ longDesc = "A ValueExpression that evaluates to a DoubleRangeValidator.")
public class DoubleRangeValidator
implements Validator, StateHolder
{
@@ -123,6 +143,12 @@
// GETTER & SETTER
+
+ /**
+ * The largest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public double getMaximum()
{
return _maximum != null ? _maximum.doubleValue() : Double.MAX_VALUE;
@@ -133,6 +159,11 @@
_maximum = new Double(maximum);
}
+ /**
+ * The smallest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public double getMinimum()
{
return _minimum != null ? _minimum.doubleValue() : Double.MIN_VALUE;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LengthValidator.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LengthValidator.java Sat Sep 13 16:10:53 2008
@@ -22,13 +22,34 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
+
/**
+ * Creates a validator and associateds it with the nearest parent
+ * UIComponent. When invoked, the validator ensures that values are
+ * valid strings with a length that lies within the minimum and maximum
+ * values specified.
+ *
+ * Commonly associated with a h:inputText entity.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
*/
+@JSFValidator(
+ name="f:validateLength",
+ bodyContent="empty",
+ tagClass="org.apache.myfaces.taglib.core.ValidateLengthTag")
+@JSFJspProperty(
+ name="binding",
+ returnType = "javax.faces.validator.LengthValidator",
+ longDesc = "A ValueExpression that evaluates to a LengthValidator.")
public class LengthValidator
implements Validator, StateHolder
{
@@ -95,6 +116,12 @@
}
// SETTER & GETTER
+
+ /**
+ * The largest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public int getMaximum()
{
return _maximum != null ? _maximum.intValue() : 0;
@@ -105,6 +132,11 @@
_maximum = new Integer(maximum);
}
+ /**
+ * The smallest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public int getMinimum()
{
return _minimum != null ? _minimum.intValue() : 0;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LongRangeValidator.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/validator/LongRangeValidator.java Sat Sep 13 16:10:53 2008
@@ -22,13 +22,33 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
+
/**
+ * Creates a validator and associateds it with the nearest parent
+ * UIComponent. When invoked, the validator ensures that values
+ * are valid longs that lie within the minimum and maximum values specified.
+ *
+ * Commonly associated with a h:inputText entity.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
*/
+@JSFValidator(
+ name="f:validateLongRange",
+ bodyContent="empty",
+ tagClass="org.apache.myfaces.taglib.core.ValidateLongRangeTag")
+@JSFJspProperty(
+ name="binding",
+ returnType = "javax.faces.validator.LongRangeValidator",
+ longDesc = "A ValueExpression that evaluates to a LongRangeValidator.")
public class LongRangeValidator
implements Validator, StateHolder
{
@@ -124,6 +144,12 @@
// GETTER & SETTER
+
+ /**
+ * The largest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public long getMaximum()
{
return _maximum != null ? _maximum.longValue() : Long.MAX_VALUE;
@@ -134,6 +160,11 @@
_maximum = new Long(maximum);
}
+ /**
+ * The smallest value that should be considered valid.
+ *
+ */
+ @JSFProperty
public long getMinimum()
{
return _minimum != null ? _minimum.longValue() : Long.MIN_VALUE;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/webapp/FacetTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/webapp/FacetTag.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/webapp/FacetTag.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/webapp/FacetTag.java Sat Sep 13 16:10:53 2008
@@ -22,8 +22,19 @@
import javax.servlet.jsp.tagext.TagSupport;
/**
+ * This tag adds its child as a facet of the nearest parent UIComponent.
+ * A child consisting of multiple elements should be nested within a
+ * container component (i.e., within an h:panelGroup for HTML library
+ * components).
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*
+ * @JSFJspTag
+ * name="f:facet"
+ * bodyContent="JSP"
+ *
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
@@ -38,6 +49,12 @@
return _name;
}
+ /**
+ * The name of the facet to be created. This must be a static value.
+ *
+ * @JSFJspAttribute
+ * required="true"
+ */
public void setName(String name)
{
_name = name;
@@ -55,4 +72,4 @@
return EVAL_BODY_INCLUDE;
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/branches/2_0_0/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/pom.xml?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/pom.xml (original)
+++ myfaces/core/branches/2_0_0/impl/pom.xml Sat Sep 13 16:10:53 2008
@@ -22,13 +22,106 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- </resource>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
<resource>
<directory>src/main/resources-facesconfig</directory>
</resource>
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>makemyfacesmetadata</id>
+ <configuration>
+ <!-- Qdox 1.6.3 does not parse inner enums on classes
+ so we have to exclude some files temporally. -->
+ <includes>**/*.java</includes>
+ <excludes>**/FacesCompositeELResolver.java</excludes>
+ </configuration>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makefacesconfig</id>
+ <configuration>
+ <templateFile>faces-config12.vm</templateFile>
+ <xmlFile>META-INF/standard-faces-config.xml</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/standard-faces-config-base.xml</xmlBaseFile>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_tags</id>
+ <configuration>
+ <jsfVersion>12</jsfVersion>
+ <templateTagName>tagClass12.vm</templateTagName>
+ <packageContains>org.apache</packageContains>
+ <typePrefix>javax.faces</typePrefix>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-tags</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makecoretld</id>
+ <configuration>
+ <xmlFile>META-INF/myfaces_core.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/myfaces_core-base.tld</xmlBaseFile>
+ <templateFile>myfaces_core12.vm</templateFile>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ <modelId>myfaces-impl</modelId>
+ </modelIds>
+ <params>
+ <shortname>f</shortname>
+ <uri>http://java.sun.com/jsf/core</uri>
+ <displayname>JSF core tag library.</displayname>
+ <description>This tag library implements the standard JSF core tags.</description>
+ </params>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makehtmltld</id>
+ <configuration>
+ <xmlFile>META-INF/myfaces_html.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/myfaces_html-base.tld</xmlBaseFile>
+ <templateFile>myfaces_html12.vm</templateFile>
+ <params>
+ <shortname>h</shortname>
+ <uri>http://java.sun.com/jsf/html</uri>
+ <displayname>JSF HTML tag library.</displayname>
+ <description>This tag library implements the standard JSF HTML tags.</description>
+ </params>
+ <modelIds>
+ <modelId>myfaces-api</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<executions>
@@ -50,7 +143,8 @@
</configuration>
</plugin>
- <plugin>
+ <!--
+ <plugin> -->
<!--
- Using the metadata from the "build" module, generate the JSP "h" taglib.
-
@@ -59,6 +153,7 @@
- Or because people just haven't got around to defining the metadata and
- templates for it in the build module?
-->
+ <!--
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-faces-plugin</artifactId>
<configuration>
@@ -84,6 +179,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<!--
- The shared-impl project generates a modified version of the "shared" module
@@ -231,12 +327,12 @@
<artifactId>myfaces-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-build</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency -->
<dependency>
<!-- this dependency will be packed together with the main artifact of this pom -->
<groupId>org.apache.myfaces.shared</groupId>
@@ -323,7 +419,13 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=695059&r1=695058&r2=695059&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Sat Sep 13 16:10:53 2008
@@ -164,7 +164,7 @@
return initializingRuntimeConfig.get();
}
- ApplicationImpl(RuntimeConfig runtimeConfig)
+ ApplicationImpl(final RuntimeConfig runtimeConfig)
{
if (runtimeConfig == null)
{
@@ -193,7 +193,7 @@
// ------------------------------------------------------------------------------------
@Override
- public void addELResolver(ELResolver resolver)
+ public final void addELResolver(final ELResolver resolver)
{
if (FacesContext.getCurrentInstance() != null)
{
@@ -206,7 +206,7 @@
}
@Override
- public ELResolver getELResolver()
+ public final ELResolver getELResolver()
{
// we don't need synchronization here since it is ok to have multiple instances of the elresolver
if (elResolver == null)
@@ -218,12 +218,12 @@
private ELResolver createFacesResolver()
{
- CompositeELResolver resolver = new FacesCompositeELResolver(Scope.Faces);
+ final CompositeELResolver resolver = new FacesCompositeELResolver(Scope.Faces);
getResolverBuilderForFaces().build(resolver);
return resolver;
}
- protected ELResolverBuilder getResolverBuilderForFaces()
+ protected final ELResolverBuilder getResolverBuilderForFaces()
{
if (resolverBuilderForFaces == null)
{
@@ -232,20 +232,20 @@
return resolverBuilderForFaces;
}
- public void setResolverBuilderForFaces(ELResolverBuilder factory)
+ public final void setResolverBuilderForFaces(final ELResolverBuilder factory)
{
resolverBuilderForFaces = factory;
}
@Override
- public java.util.ResourceBundle getResourceBundle(FacesContext facesContext, String name) throws FacesException,
+ public final java.util.ResourceBundle getResourceBundle(final FacesContext facesContext, final String name) throws FacesException,
NullPointerException
{
checkNull(facesContext, "facesContext");
checkNull(name, "name");
- String bundleName = getBundleName(facesContext, name);
+ final String bundleName = getBundleName(facesContext, name);
if (bundleName == null)
{
@@ -254,7 +254,7 @@
Locale locale = Locale.getDefault();
- UIViewRoot viewRoot = facesContext.getViewRoot();
+ final UIViewRoot viewRoot = facesContext.getViewRoot();
if (viewRoot != null && viewRoot.getLocale() != null)
{
locale = viewRoot.getLocale();
@@ -270,47 +270,47 @@
}
}
- ClassLoader getClassLoader()
+ private ClassLoader getClassLoader()
{
return Thread.currentThread().getContextClassLoader();
}
- String getBundleName(FacesContext facesContext, String name)
+ String getBundleName(final FacesContext facesContext, final String name)
{
ResourceBundle bundle = getRuntimeConfig(facesContext).getResourceBundle(name);
return bundle != null ? bundle.getBaseName() : null;
}
- java.util.ResourceBundle getResourceBundle(String name, Locale locale, ClassLoader loader)
+ java.util.ResourceBundle getResourceBundle(final String name, final Locale locale, final ClassLoader loader)
throws MissingResourceException
{
return java.util.ResourceBundle.getBundle(name, locale, loader);
}
- RuntimeConfig getRuntimeConfig(FacesContext facesContext)
+ final RuntimeConfig getRuntimeConfig(final FacesContext facesContext)
{
return RuntimeConfig.getCurrentInstance(facesContext.getExternalContext());
}
- FacesContext getFaceContext()
+ final FacesContext getFaceContext()
{
return FacesContext.getCurrentInstance();
}
@Override
- public UIComponent createComponent(ValueExpression componentExpression, FacesContext facesContext,
- String componentType) throws FacesException, NullPointerException
+ public final UIComponent createComponent(final ValueExpression componentExpression, final FacesContext facesContext,
+ final String componentType) throws FacesException, NullPointerException
{
checkNull(componentExpression, "componentExpression");
checkNull(facesContext, "facesContext");
checkNull(componentType, "componentType");
- ELContext elContext = facesContext.getELContext();
+ final ELContext elContext = facesContext.getELContext();
try
{
- Object retVal = componentExpression.getValue(elContext);
+ final Object retVal = componentExpression.getValue(elContext);
UIComponent createdComponent;
@@ -337,20 +337,20 @@
}
@Override
- public ExpressionFactory getExpressionFactory()
+ public final ExpressionFactory getExpressionFactory()
{
return _runtimeConfig.getExpressionFactory();
}
@Override
- public Object evaluateExpressionGet(FacesContext context, String expression, Class expectedType) throws ELException
+ public final Object evaluateExpressionGet(final FacesContext context, final String expression, final Class expectedType) throws ELException
{
ELContext elContext = context.getELContext();
return getExpressionFactory().createValueExpression(elContext, expression, expectedType).getValue(elContext);
}
@Override
- public void addELContextListener(ELContextListener listener)
+ public final void addELContextListener(final ELContextListener listener)
{
synchronized (_elContextListeners)
@@ -360,7 +360,7 @@
}
@Override
- public void removeELContextListener(ELContextListener listener)
+ public final void removeELContextListener(final ELContextListener listener)
{
synchronized (_elContextListeners)
{
@@ -369,16 +369,16 @@
}
@Override
- public ELContextListener[] getELContextListeners()
+ public final ELContextListener[] getELContextListeners()
{
// this gets called on every request, so I can't afford to synchronize
// I just have to trust that toArray() with do the right thing if the
// list is changing (not likely)
- return _elContextListeners.toArray(new ELContextListener[0]);
+ return _elContextListeners.toArray(new ELContextListener[_elContextListeners.size()]);
}
@Override
- public void setActionListener(ActionListener actionListener)
+ public final void setActionListener(final ActionListener actionListener)
{
checkNull(actionListener, "actionListener");
@@ -388,31 +388,31 @@
}
@Override
- public ActionListener getActionListener()
+ public final ActionListener getActionListener()
{
return _actionListener;
}
@Override
- public Iterator<String> getComponentTypes()
+ public final Iterator<String> getComponentTypes()
{
return _componentClassMap.keySet().iterator();
}
@Override
- public Iterator<String> getConverterIds()
+ public final Iterator<String> getConverterIds()
{
return _converterIdToClassMap.keySet().iterator();
}
@Override
- public Iterator<Class> getConverterTypes()
+ public final Iterator<Class> getConverterTypes()
{
return _converterClassNameToClassMap.keySet().iterator();
}
@Override
- public void setDefaultLocale(Locale locale)
+ public final void setDefaultLocale(final Locale locale)
{
checkNull(locale, "locale");
@@ -422,13 +422,13 @@
}
@Override
- public Locale getDefaultLocale()
+ public final Locale getDefaultLocale()
{
return _defaultLocale;
}
@Override
- public void setMessageBundle(String messageBundle)
+ public final void setMessageBundle(final String messageBundle)
{
checkNull(messageBundle, "messageBundle");
@@ -438,13 +438,13 @@
}
@Override
- public String getMessageBundle()
+ public final String getMessageBundle()
{
return _messageBundle;
}
@Override
- public void setNavigationHandler(NavigationHandler navigationHandler)
+ public final void setNavigationHandler(final NavigationHandler navigationHandler)
{
checkNull(navigationHandler, "navigationHandler");
@@ -454,7 +454,7 @@
}
@Override
- public NavigationHandler getNavigationHandler()
+ public final NavigationHandler getNavigationHandler()
{
return _navigationHandler;
}
@@ -464,7 +464,7 @@
*/
@Deprecated
@Override
- public void setPropertyResolver(PropertyResolver propertyResolver)
+ public final void setPropertyResolver(final PropertyResolver propertyResolver)
{
checkNull(propertyResolver, "propertyResolver");
@@ -560,13 +560,13 @@
*/
@Deprecated
@Override
- public PropertyResolver getPropertyResolver()
+ public final PropertyResolver getPropertyResolver()
{
return PROPERTYRESOLVER;
}
@Override
- public void setSupportedLocales(Collection<Locale> locales)
+ public final void setSupportedLocales(final Collection<Locale> locales)
{
checkNull(locales, "locales");
@@ -576,13 +576,13 @@
}
@Override
- public Iterator<Locale> getSupportedLocales()
+ public final Iterator<Locale> getSupportedLocales()
{
return _supportedLocales.iterator();
}
@Override
- public Iterator<String> getValidatorIds()
+ public final Iterator<String> getValidatorIds()
{
return _validatorClassMap.keySet().iterator();
}
@@ -592,7 +592,7 @@
*/
@Deprecated
@Override
- public void setVariableResolver(VariableResolver variableResolver)
+ public final void setVariableResolver(final VariableResolver variableResolver)
{
checkNull(variableResolver, "variableResolver");
@@ -612,13 +612,13 @@
*/
@Deprecated
@Override
- public VariableResolver getVariableResolver()
+ public final VariableResolver getVariableResolver()
{
return VARIABLERESOLVER;
}
@Override
- public void setViewHandler(ViewHandler viewHandler)
+ public final void setViewHandler(final ViewHandler viewHandler)
{
checkNull(viewHandler, "viewHandler");
@@ -628,13 +628,13 @@
}
@Override
- public ViewHandler getViewHandler()
+ public final ViewHandler getViewHandler()
{
return _viewHandler;
}
@Override
- public void addComponent(String componentType, String componentClassName)
+ public final void addComponent(final String componentType, final String componentClassName)
{
checkNull(componentType, "componentType");
checkEmpty(componentType, "componentType");
@@ -654,7 +654,7 @@
}
@Override
- public void addConverter(String converterId, String converterClass)
+ public final void addConverter(final String converterId, final String converterClass)
{
checkNull(converterId, "converterId");
checkEmpty(converterId, "converterId");
@@ -674,7 +674,7 @@
}
@Override
- public void addConverter(Class targetClass, String converterClass)
+ public final void addConverter(final Class targetClass, final String converterClass)
{
checkNull(targetClass, "targetClass");
checkNull(converterClass, "converterClass");
@@ -692,8 +692,8 @@
}
}
- public void addConverterConfiguration(String converterClassName,
- org.apache.myfaces.config.impl.digester.elements.Converter configuration)
+ public final void addConverterConfiguration(final String converterClassName,
+ final org.apache.myfaces.config.impl.digester.elements.Converter configuration)
{
checkNull(converterClassName, "converterClassName");
checkEmpty(converterClassName, "converterClassName");
@@ -703,7 +703,7 @@
}
@Override
- public void addValidator(String validatorId, String validatorClass)
+ public final void addValidator(final String validatorId, final String validatorClass)
{
checkNull(validatorId, "validatorId");
checkEmpty(validatorId, "validatorId");
@@ -723,12 +723,12 @@
}
@Override
- public UIComponent createComponent(String componentType) throws FacesException
+ public final UIComponent createComponent(final String componentType) throws FacesException
{
checkNull(componentType, "componentType");
checkEmpty(componentType, "componentType");
- Class componentClass = _componentClassMap.get(componentType);
+ final Class componentClass = _componentClassMap.get(componentType);
if (componentClass == null)
{
log.error("Undefined component type " + componentType);
@@ -751,8 +751,8 @@
*/
@Deprecated
@Override
- public UIComponent createComponent(ValueBinding valueBinding, FacesContext facesContext, String componentType)
- throws FacesException
+ public final UIComponent createComponent(final ValueBinding valueBinding, final FacesContext facesContext,
+ final String componentType) throws FacesException
{
checkNull(valueBinding, "valueBinding");
@@ -760,7 +760,7 @@
checkNull(componentType, "componentType");
checkEmpty(componentType, "componentType");
- ValueExpression valExpression = new ValueBindingToValueExpression(valueBinding);
+ final ValueExpression valExpression = new ValueBindingToValueExpression(valueBinding);
return createComponent(valExpression, facesContext, componentType);
}
@@ -795,12 +795,12 @@
* than using this method.
*/
@Override
- public Converter createConverter(String converterId)
+ public final Converter createConverter(final String converterId)
{
checkNull(converterId, "converterId");
checkEmpty(converterId, "converterId");
- Class converterClass = _converterIdToClassMap.get(converterId);
+ final Class converterClass = _converterIdToClassMap.get(converterId);
if(converterClass == null)
{
throw new FacesException("Could not find any registered converter-class by converterId : "+converterId);
@@ -808,7 +808,7 @@
try
{
- Converter converter = (Converter) converterClass.newInstance();
+ final Converter converter = (Converter) converterClass.newInstance();
setConverterProperties(converterClass, converter);
@@ -822,14 +822,14 @@
}
@Override
- public Converter createConverter(Class targetClass)
+ public final Converter createConverter(final Class targetClass)
{
checkNull(targetClass, "targetClass");
return internalCreateConverter(targetClass);
}
- private Converter internalCreateConverter(Class targetClass)
+ private Converter internalCreateConverter(final Class targetClass)
{
// Locate a Converter registered for the target class itself.
String converterClassName = _converterClassNameToClassMap.get(targetClass);
@@ -844,14 +844,14 @@
// implemented by the target class (directly or indirectly).
if (converterClassName == null)
{
- Class interfaces[] = targetClass.getInterfaces();
+ final Class interfaces[] = targetClass.getInterfaces();
if (interfaces != null)
{
for (int i = 0, len = interfaces.length; i < len; i++)
{
// search all superinterfaces for a matching converter,
// create it
- Converter converter = internalCreateConverter(interfaces[i]);
+ final Converter converter = internalCreateConverter(interfaces[i]);
if (converter != null)
{
return converter;
@@ -864,14 +864,14 @@
{
try
{
- Class converterClass = ClassUtils.simpleClassForName(converterClassName);
+ final Class converterClass = ClassUtils.simpleClassForName(converterClassName);
Converter converter = null;
try
{
// look for a constructor that takes a single Class object
// See JSF 1.2 javadoc for Converter
- Constructor constructor = converterClass.getConstructor(new Class[] { Class.class });
+ final Constructor constructor = converterClass.getConstructor(new Class[] { Class.class });
converter = (Converter) constructor.newInstance(new Object[] { targetClass });
}
catch (Exception e)
@@ -935,19 +935,19 @@
}
- private void setConverterProperties(Class converterClass, Converter converter)
+ private void setConverterProperties(final Class converterClass, final Converter converter)
{
- org.apache.myfaces.config.impl.digester.elements.Converter converterConfig = _converterClassNameToConfigurationMap
+ final org.apache.myfaces.config.impl.digester.elements.Converter converterConfig = _converterClassNameToConfigurationMap
.get(converterClass.getName());
if (converterConfig != null)
{
- Iterator it = converterConfig.getProperties();
+ final Iterator it = converterConfig.getProperties();
while (it.hasNext())
{
- Property property = (Property) it.next();
+ final Property property = (Property) it.next();
try
{
@@ -968,7 +968,7 @@
*/
@Deprecated
@Override
- public MethodBinding createMethodBinding(String reference, Class[] params) throws ReferenceSyntaxException
+ public final MethodBinding createMethodBinding(final String reference, Class[] params) throws ReferenceSyntaxException
{
checkNull(reference, "reference");
checkEmpty(reference, "reference");
@@ -998,7 +998,7 @@
}
@Override
- public Validator createValidator(String validatorId) throws FacesException
+ public final Validator createValidator(final String validatorId) throws FacesException
{
checkNull(validatorId, "validatorId");
checkEmpty(validatorId, "validatorId");
@@ -1026,7 +1026,7 @@
* @deprecated
*/
@Override
- public ValueBinding createValueBinding(String reference) throws ReferenceSyntaxException
+ public final ValueBinding createValueBinding(final String reference) throws ReferenceSyntaxException
{
checkNull(reference, "reference");
checkEmpty(reference, "reference");
@@ -1046,36 +1046,36 @@
}
// gets the elContext from the current FacesContext()
- private ELContext threadELContext()
+ private final ELContext threadELContext()
{
return getFaceContext().getELContext();
}
@Override
- public String getDefaultRenderKitId()
+ public final String getDefaultRenderKitId()
{
return _defaultRenderKitId;
}
@Override
- public void setDefaultRenderKitId(String defaultRenderKitId)
+ public final void setDefaultRenderKitId(final String defaultRenderKitId)
{
_defaultRenderKitId = defaultRenderKitId;
}
@Override
- public StateManager getStateManager()
+ public final StateManager getStateManager()
{
return _stateManager;
}
@Override
- public void setStateManager(StateManager stateManager)
+ public final void setStateManager(final StateManager stateManager)
{
_stateManager = stateManager;
}
- private void checkNull(Object param, String paramName)
+ private void checkNull(final Object param, final String paramName)
{
if (param == null)
{
@@ -1083,7 +1083,7 @@
}
}
- private void checkEmpty(String param, String paramName)
+ private void checkEmpty(final String param, final String paramName)
{
if (param.length() == 0)
{