[richfaces-svn-commits] JBoss Rich Faces SVN: r15889 - in branches/community/3.3.X/cdk/generator/src/main: resources/META-INF/templates/templatecompiler and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2009-11-16 19:49:17 -0500 (Mon, 16 Nov 2009)
New Revision: 15889

Modified:
   branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java
   branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm
   branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/FORElement_2.vm
Log:
https://jira.jboss.org/jira/browse/RF-8051

Modified: branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java	2009-11-16 23:56:33 UTC (rev 15888)
+++ branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java	2009-11-17 00:49:17 UTC (rev 15889)
@@ -100,14 +100,14 @@
 	 * @return
 	 */
 	protected String getTemplate2Name() {
-		return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_1.vm";
+		return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_2.vm";
 	}
 
 	/**
 	 * @return
 	 */
 	protected String getTemplate1Name() {
-		return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_2.vm";
+		return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_1.vm";
 	}
 
 	/**

Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm	2009-11-16 23:56:33 UTC (rev 15888)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm	2009-11-17 00:49:17 UTC (rev 15889)
@@ -1,5 +1,5 @@
 for ( 
 	variables.setVariable("$item", $from);
-	Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString()).intValue();
+	Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString().intValue();
 	variables.addValueToVariable("$item", new Integer(1) )
 	) {
\ No newline at end of file

Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/FORElement_2.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/FORElement_2.vm	2009-11-16 23:56:33 UTC (rev 15888)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/FORElement_2.vm	2009-11-17 00:49:17 UTC (rev 15889)
@@ -1,5 +1,5 @@
 for ( 
 	variables.setVariable("$item", $from);
-	Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString()).intValue();
+	Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString().intValue();
 	variables.addValueToVariable("$item", new Integer(1) )
 	) {
\ No newline at end of file