You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2007/04/27 18:54:17 UTC

svn commit: r533190 - /incubator/adffaces/branches/faces-1_2-070316/plugins/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java

Author: awiner
Date: Fri Apr 27 11:54:14 2007
New Revision: 533190

URL: http://svn.apache.org/viewvc?view=rev&rev=533190
Log:
Fix two problems with JSF 1.2 tagdoc generation:
- MethodExpressions (other than action) were not listed as requiring EL
- action was getting written out as actionExpression

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

Modified: incubator/adffaces/branches/faces-1_2-070316/plugins/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-070316/plugins/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?view=diff&rev=533190&r1=533189&r2=533190
==============================================================================
--- incubator/adffaces/branches/faces-1_2-070316/plugins/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ incubator/adffaces/branches/faces-1_2-070316/plugins/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Fri Apr 27 11:54:14 2007
@@ -752,10 +752,17 @@
         out.write("</tr>\n");
       }
 
+      String propertyName = attr.getPropertyName();
+      // Quick fix of problems with actionExpression vs. action
+      // actionExpression is the MethodExpression on the component,
+      // but on the tag it's 'action'
+      if ("actionExpression".equals(propertyName))
+        propertyName = "action";
+
       out.write("<tr>\n");
-      out.write("<td>" + attr.getPropertyName() + "</td>");
+      out.write("<td>" + propertyName + "</td>");
       String type = _getDisplayType(className,
-                                    attr.getPropertyName(),
+                                    propertyName,
                                     attr.getPropertyClass());
 
       out.write("<td>" + type + "</td>");
@@ -764,10 +771,11 @@
       // MethodBindings, "binding", and some other attributes
       // require EL support
       if (attr.isMethodBinding() || 
-          "binding".equals(attr.getPropertyName()))
+          attr.isMethodExpression() ||
+          "binding".equals(propertyName))
       {
         // "action" doesn't require EL; all else do.
-        elSupported = "action".equals(attr.getPropertyName()) ? "Yes" : "Only EL";
+        elSupported = "action".equals(propertyName) ? "Yes" : "Only EL";
       }
       else
       {