Author: nbelaevski
Date: 2009-11-21 21:29:15 -0500 (Sat, 21 Nov 2009)
New Revision: 15956
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java
branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml
branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java
Log:
UI: merged from 3.3.x_jsf2 branch
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java 2009-11-22
02:22:13 UTC (rev 15955)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputSecret.java 2009-11-22
02:29:15 UTC (rev 15956)
@@ -76,7 +76,7 @@
}
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return true;
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java 2009-11-22
02:22:13 UTC (rev 15955)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputText.java 2009-11-22
02:29:15 UTC (rev 15956)
@@ -77,7 +77,7 @@
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return true;
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java 2009-11-22
02:22:13 UTC (rev 15955)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/component/html/HtmlInputTextarea.java 2009-11-22
02:29:15 UTC (rev 15956)
@@ -77,7 +77,7 @@
}
- private static boolean isEmpty(Object value) {
+ public static boolean isEmpty(Object value) {
if (value == null) {
return (true);
Modified: branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml
===================================================================
---
branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml 2009-11-22
02:22:13 UTC (rev 15955)
+++
branches/community/3.3.X/ui/core/src/main/config/component/actionParameter.xml 2009-11-22
02:29:15 UTC (rev 15956)
@@ -34,7 +34,7 @@
<superclass>
org.ajax4jsf.taglib.html.jsp.ActionParamTag
</superclass>
- <test/>
+
<description>
<![CDATA[
A combination of the functionality of two JSF tags,
@@ -52,6 +52,7 @@
<br />
]]>
</description>
+ <test/>
</tag>
<taghandler generate="false">
<classname>org.ajax4jsf.taglib.html.facelets.ActionParamHandler</classname>
Modified:
branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java
===================================================================
---
branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-22
02:22:13 UTC (rev 15955)
+++
branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-22
02:29:15 UTC (rev 15956)
@@ -254,7 +254,7 @@
* @return
* @see javax.faces.application.Application#getConverterTypes()
*/
- public Iterator<Class> getConverterTypes() {
+ public Iterator<Class<?>> getConverterTypes() {
return parent.getConverterTypes();
}