dev@javaserverfaces.java.net

[REVIEW] Move generated Html components of deprecated API

From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Tue, 17 May 2005 08:58:41 -0400

SECTION: Modified Files
----------------------------
M src/com/sun/faces/generate/HtmlComponentGenerator.java
  - Move from {Value,Method}Binding to {Value,Method}Expression


SECTION: Diffs
----------------------------
Index: src/com/sun/faces/generate/HtmlComponentGenerator.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/generate/HtmlComponentGenerator.java,v
retrieving revision 1.13
diff -u -r1.13 HtmlComponentGenerator.java
--- src/com/sun/faces/generate/HtmlComponentGenerator.java 5 May 2005
20:51:37 -0000 1.13
+++ src/com/sun/faces/generate/HtmlComponentGenerator.java 17 May
2005 12:58:51 -0000
@@ -175,8 +175,8 @@
         writer.writeImport("java.io.IOException");
         writer.write('\n');
         writer.writeImport("javax.faces.context.FacesContext");
- writer.writeImport("javax.faces.el.MethodBinding");
- writer.writeImport("javax.faces.el.ValueBinding");
+ writer.writeImport("javax.el.MethodExpression");
+ writer.writeImport("javax.el.ValueExpression");
         writer.write("\n\n");
 
         writer.writeBlockComment("******* GENERATED CODE - DO NOT EDIT
*******");
@@ -324,14 +324,14 @@
             writer.write(";\n");
              writer.outdent();
             writer.fwrite("}\n");
- writer.fwrite("ValueBinding _vb = getValueBinding(\"");
+ writer.fwrite("ValueExpression _ve = getValueExpression(\"");
             writer.write(pb.getPropertyName());
             writer.write("\");\n");
- writer.fwrite("if (_vb != null) {\n");
+ writer.fwrite("if (_ve != null) {\n");
             writer.indent();
             if (primitive(type)) {
                 writer.fwrite(
- "Object _result = _vb.getValue(getFacesContext());\n");
+ "Object _result =
_ve.getValue(getFacesContext().getELContext());\n");
                 writer.fwrite("if (_result == null) {\n");
                 writer.indent();
                 writer.fwrite("return ");
@@ -350,7 +350,7 @@
             } else {
                 writer.fwrite("return (");
                 writer.write(type);
- writer.write(") _vb.getValue(getFacesContext());\n");
+ writer.write(")
_ve.getValue(getFacesContext().getELContext());\n");
             }
             writer.outdent();
             writer.fwrite("} else {\n");
@@ -406,7 +406,7 @@
     private void suffix() throws Exception {
 
         int p = 0; // Number of primitive properties
- for (int i = 0; i < properties.size(); i++) {
+ for (int i = 0, size = properties.size(); i < size; i++) {
             PropertyBean pb = (PropertyBean) properties.get(i);
             if (primitive(pb.getPropertyClass())) {
                 p++;
@@ -416,7 +416,7 @@
         // Generate the saveState() method
         writer.fwrite("public Object saveState(FacesContext _context)
{\n");
         writer.indent();
- writer.fwrite("Object _values[] = new Object[");
+ writer.fwrite("Object[] _values = new Object[");
         writer.write("" + (properties.size() + p + 1));
         writer.write("];\n");
         writer.fwrite("_values[0] = super.saveState(_context);\n");
@@ -459,10 +459,10 @@
         writer.fwrite(
             "public void restoreState(FacesContext _context, Object
_state) {\n");
         writer.indent();
- writer.fwrite("Object _values[] = (Object[]) _state;\n");
+ writer.fwrite("Object[] _values = (Object[]) _state;\n");
         writer.fwrite("super.restoreState(_context, _values[0]);\n");
         n = 1;
- for (int i = 0; i < properties.size(); i++) {
+ for (int i = 0, size = properties.size(); i < size; i++) {
             PropertyBean pb = (PropertyBean) properties.get(i);
             String name = mangle(pb.getPropertyName());
             String type = pb.getPropertyClass();