You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/11/23 22:47:26 UTC
svn commit: r597748 - in
/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator:
component/MyFacesComponentGenerator.java
taglib/MyFacesComponentTagGenerator.java
Author: matzew
Date: Fri Nov 23 13:47:25 2007
New Revision: 597748
URL: http://svn.apache.org/viewvc?rev=597748&view=rev
Log:
TRINIDAD-838 - MyFaces Plugin doesn't support literalOnly
supporting literals now (for both JSF versions)
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java?rev=597748&r1=597747&r2=597748&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java Fri Nov 23 13:47:25 2007
@@ -246,6 +246,10 @@
{
out.println("return " + property.getFieldPropertyName() + ";");
}
+ else if(property.isLiteralOnly())
+ {
+ out.println("return " + varName + ";");
+ }
else
{
if (Util.isPrimitiveClass(propFullClass))
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java?rev=597748&r1=597747&r2=597748&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java Fri Nov 23 13:47:25 2007
@@ -231,9 +231,6 @@
String componentClass,
PropertyBean property) throws IOException
{
- String propName = property.getPropertyName();
- String propClass = property.getPropertyClass();
- String propVar = "_" + propName;
if (property.isMethodBinding())
{
@@ -243,26 +240,32 @@
{
_writeSetMethodExpression(out, componentClass, property);
}
- else if (GeneratorHelper.isConverter(propClass))
+ else if (GeneratorHelper.isConverter(property.getPropertyClass()))
{
- _writeSetConverter(out, componentClass, propName);
+ _writeSetConverter(out, componentClass, property.getPropertyName());
}
else
{
- _writeSetProperty(out, propName, propVar);
+ _writeSetProperty(out, property);
}
}
private void _writeSetProperty(
PrettyWriter out,
- String propName,
- String propVar)
+ PropertyBean property)
{
+ String propName = property.getPropertyName();
+ String propVar = "_" + propName;
+
out.println("if (" + propVar + " != null) ");
out.println("{");
out.indent();
- if (_is12)
+ if (property.isLiteralOnly())
+ {
+ out.println("comp.getAttributes().put(\"" + propName + "\", " + propVar + ");");
+ }
+ else if (_is12)
{
out.println("comp.setValueExpression(\"" + propName + "\", " + propVar + ");");
}