You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/04/08 21:40:13 UTC

svn commit: r932075 - in /myfaces/trinidad-maven/branches/2.0.x-branch: maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/

Author: jwaldman
Date: Thu Apr  8 19:40:12 2010
New Revision: 932075

URL: http://svn.apache.org/viewvc?rev=932075&view=rev
Log:
TRINIDAD-1727 Tag Doc to list JS Component Class
commit patch for Maria Kaval

Modified:
    myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
    myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
    myfaces/trinidad-maven/branches/2.0.x-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java

Modified: myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java?rev=932075&r1=932074&r2=932075&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java (original)
+++ myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java Thu Apr  8 19:40:12 2010
@@ -170,6 +170,27 @@ public class ComponentBean extends Abstr
   }
 
   /**
+   * Sets the Java Script component class for this component.
+   *
+   * @param jsComponentClass  the JavaScript component class
+   */
+  public void setJsComponentClass(
+    String jsComponentClass)
+  {
+    _jsComponentClass = jsComponentClass;
+  }
+
+  /**
+   * Returns the JavaScript component class for this component.
+   *
+   * @return  the Java Script component class
+   */
+  public String getJsComponentClass()
+  {
+    return _jsComponentClass;
+  }
+  
+  /**
    * Sets the description of this property.
    *
    * @param description  the property description
@@ -1212,6 +1233,7 @@ public class ComponentBean extends Abstr
   private String  _componentType;
   private String  _componentFamily;
   private String  _componentClass;
+  private String  _jsComponentClass;
   private String  _componentSupertype;
   private String  _componentSuperclass;
   private String  _rendererType;

Modified: myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=932075&r1=932074&r2=932075&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Thu Apr  8 19:40:12 2010
@@ -106,6 +106,8 @@ public class FacesConfigParser
                                      "componentType");
       digester.addBeanPropertySetter("faces-config/component/component-class",
                                      "componentClass");
+      digester.addBeanPropertySetter("faces-config/component/js-component-class",
+                                     "jsComponentClass");      
       digester.addBeanPropertySetter("faces-config/component/description");
       digester.addSetNext("faces-config/component", "addComponent",
                           ComponentBean.class.getName());

Modified: myfaces/trinidad-maven/branches/2.0.x-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/2.0.x-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?rev=932075&r1=932074&r2=932075&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/2.0.x-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ myfaces/trinidad-maven/branches/2.0.x-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Thu Apr  8 19:40:12 2010
@@ -676,7 +676,7 @@ public class TagdocReport extends Abstra
     out.write("   <br/>\n");
 
 
-    out.write("   <b>UIComponent class:</b> ");
+    out.write("   <b>Java class:</b> ");
     String javadocURL = _platformAgnosticPath("../apidocs/" +
       bean.getComponentClass().replace('.', '/') + ".html");
     out.write("<a href=\"" + javadocURL + "\">");
@@ -688,6 +688,22 @@ public class TagdocReport extends Abstra
     out.write("   <b>Component type:</b> " + bean.getComponentType() +  "\n");
     out.write("   <br/>\n");
 
+
+    // Write out the corresponding Java Script class for this component with a link to its JavaScript doc
+    String jsClass = bean.getJsComponentClass();
+    if (jsClass != null && !jsClass.isEmpty()) 
+    {
+      out.write("   <b>JavaScript class:</b> ");
+      String jsdocURL = _platformAgnosticPath("../js_docs_out/" + jsClass.replace('.', '/') + ".html");
+      out.write("<a href=\"" + jsdocURL + "\">");
+      out.write(jsClass);
+      out.write("</a>");
+      out.write("\n");
+      out.write("   <br/>\n");
+    }
+
+
+
     if (bean.hasRequiredAncestorContracts())
     {
       String formattedAncestors = _formatTagList ( bean.requiredAncestorContracts(),