[richfaces-svn-commits] JBoss Rich Faces SVN: r14774 - in branches/community/3.3.X/cdk/generator/src/main: resources/META-INF/templates/templatecompiler and 1 other directories.
Author: konstantin.mishin
Date: 2009-07-02 12:51:15 -0400 (Thu, 02 Jul 2009)
New Revision: 14774
Modified:
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
Log:
RF-7332
Modified:
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
===================================================================
---
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02
16:48:00 UTC (rev 14773)
+++
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02
16:51:15 UTC (rev 14774)
@@ -64,10 +64,8 @@
Node baseNode = nnm.getNamedItem("base");
if (baseNode != null) {
base = ELParser.compileEL(baseNode.getNodeValue(), componentBean);
- } else {
- base = "";
}
-
+
try {
this.getComponentBean().addVariable(variableName, VARIABLE_TYPE.getName());
} catch (CompilationException e) {
Modified:
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
===================================================================
---
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02
16:48:00 UTC (rev 14773)
+++
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02
16:51:15 UTC (rev 14774)
@@ -1 +1 @@
-$type $variable = new $type($base);
\ No newline at end of file
+$type $variable = new $type(#if ($base) (java.util.Map)$base #end);
\ No newline at end of file
Modified:
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
===================================================================
---
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02
16:48:00 UTC (rev 14773)
+++
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02
16:51:15 UTC (rev 14774)
@@ -1 +1 @@
-$type $variable = new $type($base);
\ No newline at end of file
+$type $variable = new $type(#if ($base) (java.util.Map)$base #end);
\ No newline at end of file