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 2008/01/15 04:57:09 UTC

svn commit: r612007 - /myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java

Author: matzew
Date: Mon Jan 14 19:57:09 2008
New Revision: 612007

URL: http://svn.apache.org/viewvc?rev=612007&view=rev
Log:
TRINIDAD-878

Modified:
    myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java

Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.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/AbstractConverterTagGenerator.java?rev=612007&r1=612006&r2=612007&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java Mon Jan 14 19:57:09 2008
@@ -116,36 +116,38 @@
   {
     Iterator properties = converter.properties();
     properties = new FilteredIterator(properties, new TagAttributeFilter());
+    
+    String converterFullClass = converter.getConverterClass();
+    String converterClass = Util.getClassFromFullClass(converterFullClass);
+
+    out.println();
+    // TODO: restore coding standards, and make final
+    if (is12()) {
+      out.println("@Override");
+    }
+    out.println("protected Converter createConverter() throws JspException");
+    out.println("{");
+    out.indent();
+    if (is12())
+    {
+      out.println("String converterId = " + converterClass +  ".CONVERTER_ID;");
+      out.println("Application appl = FacesContext.getCurrentInstance().getApplication();");
+      out.println(converterClass + " converter = " +
+                  "(" + converterClass + ")appl.createConverter(converterId);");
+    }
+    else
+    {
+      out.println(converterClass + " converter = " +
+                  "(" + converterClass + ")super.createConverter();");
+    }
     if (properties.hasNext())
     {
-      String converterFullClass = converter.getConverterClass();
-      String converterClass = Util.getClassFromFullClass(converterFullClass);
-
-      out.println();
-      // TODO: restore coding standards, and make final
-      if (is12()) {
-        out.println("@Override");
-      }
-      out.println("protected Converter createConverter() throws JspException");
-      out.println("{");
-      out.indent();
-      if (is12())
-      {
-        out.println("String converterId = " + converterClass +  ".CONVERTER_ID;");
-        out.println("Application appl = FacesContext.getCurrentInstance().getApplication();");
-        out.println(converterClass + " converter = " +
-                    "(" + converterClass + ")appl.createConverter(converterId);");
-      }
-      else
-      {
-        out.println(converterClass + " converter = " +
-                    "(" + converterClass + ")super.createConverter();");
-      }
       out.println("_setProperties(converter);");
-      out.println("return converter;");
-      out.unindent();
-      out.println("}");
     }
+    out.println("return converter;");
+    out.unindent();
+    out.println("}");
+    
   }