Author: baranda
Date: Mon Nov 27 12:06:39 2006
New Revision: 479746
URL: http://svn.apache.org/viewvc?view=rev&rev=479746
Log:
Some properties appeared duplicated in the state management methods, if they
were validators or lists
Modified:
incubator/adffaces/branches/myfaces-1_2-maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
Modified:
incubator/adffaces/branches/myfaces-1_2-maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/myfaces-1_2-maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java?view=diff&rev=479746&r1=479745&r2=479746
==============================================================================
---
incubator/adffaces/branches/myfaces-1_2-maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
(original)
+++
incubator/adffaces/branches/myfaces-1_2-maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
Mon Nov 27 12:06:39 2006
@@ -305,13 +305,16 @@
if (property.isStateHolder())
{
- out.println(arrayName+"["+propIndex+"] =
saveAttachedState(facesContext, "+varName+");");
if (GeneratorHelper.isValidator(property,
_is12)){
out.println(arrayName+"["+
++propIndex+"] = saveAttachedState(facesContext, "+varName+"List);");
} else if( property.isList()){
out.println(arrayName+"["+ ++propIndex+"] =
saveAttachedState(facesContext, "+varName+");");
}
- }
+ else
+ {
+ out.println(arrayName+"["+propIndex+"] =
saveAttachedState(facesContext, "+varName+");");
+ }
+ }
else
{
out.println(arrayName+"["+propIndex+"] = "+varName+";");
@@ -358,8 +361,6 @@
if (property.isStateHolder())
{
- out.println(varName + " =
"+_castIfNecessary(propClass)+"restoreAttachedState(facesContext, "
- + arrayName + "[" + propIndex + "]);");
if (GeneratorHelper.isValidator(property,
_is12)){
out.println(varName + "List =
(List<Validator>) restoreAttachedState(facesContext, "
+ arrayName + "[" + ++propIndex + "]);");
@@ -367,8 +368,13 @@
out.println(varName + " = (List)
restoreAttachedState(facesContext, "
+ arrayName + "[" + ++propIndex + "]);");
}
+ else
+ {
+ out.println(varName + " =
"+_castIfNecessary(propClass)+"restoreAttachedState(facesContext, "
+ + arrayName + "[" + propIndex + "]);");
+ }
- }
+ }
else
{
out.println(varName + " = " + _castIfNecessary(propClass)
