svn commit: r467184 - /incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java

[awiner]

Author: awiner
Date: Mon Oct 23 16:54:13 2006
New Revision: 467184

URL: http://svn.apache.org/viewvc?view=rev&rev=467184
Log:
Fix AWTKeyStroke property generation in JSP 2.1 generation

Modified:
    
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java

Modified: 
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?view=diff&rev=467184&r1=467183&r2=467184
==============================================================================
--- 
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
 (original)
+++ 
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
 Mon Oct 23 16:54:13 2006
@@ -2248,25 +2248,53 @@
       String propKey = Util.getConstantNameFromProperty(propName, "_KEY");
       String propVar = "_" + propName;
 
-      out.println("if (" + propVar + " != null)");
-      out.println("{");
-      out.indent();
-      out.println("if (isValueReference(" + propVar + "))");
-      out.println("{");
-      out.indent();
-      out.println("ValueBinding vb = createValueBinding(" + propVar + ");");
-      out.println("bean.setValueBinding(" + componentClass + "." + propKey + 
", vb);");
-      out.unindent();
-      out.println("}");
-      out.println("else");
-      out.println("{");
-      out.indent();
-      out.println("bean.setProperty(" + componentClass + "." + propKey + ",");
-      out.println("\tAWTKeyStroke.getAWTKeyStroke(" + propVar + "));");
-      out.unindent();
-      out.println("}");
-      out.unindent();
-      out.println("}");
+      if (_is12())
+      {
+        out.println("if (" + propVar + " != null)");
+        out.println("{");
+        out.indent();
+        out.println("if (!" + propVar + ".isLiteralText())");
+        out.println("{");
+        out.indent();
+        out.println("bean.setValueExpression(" + componentClass + "." + 
propKey + ", " + propVar + ");");
+        out.unindent();
+        out.println("}");
+        out.println("else");
+        out.println("{");
+        out.indent();
+        out.println("Object val = " + propVar + ".getValue(null);");
+        out.println("if (val != null)");
+        out.indent();
+        out.println("bean.setProperty(" + componentClass + "." + propKey + 
",");
+        out.println("\tAWTKeyStroke.getAWTKeyStroke(val.toString()));");
+        out.unindent();
+        out.unindent();
+        out.println("}");
+        out.unindent();
+        out.println("}");
+      }
+      else
+      {
+        out.println("if (" + propVar + " != null)");
+        out.println("{");
+        out.indent();
+        out.println("if (isValueReference(" + propVar + "))");
+        out.println("{");
+        out.indent();
+        out.println("ValueBinding vb = createValueBinding(" + propVar + ");");
+        out.println("bean.setValueBinding(" + componentClass + "." + propKey + 
", vb);");
+        out.unindent();
+        out.println("}");
+        out.println("else");
+        out.println("{");
+        out.indent();
+        out.println("bean.setProperty(" + componentClass + "." + propKey + 
",");
+        out.println("\tAWTKeyStroke.getAWTKeyStroke(" + propVar + "));");
+        out.unindent();
+        out.println("}");
+        out.unindent();
+        out.println("}");
+      }
     }