You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/10/20 23:21:46 UTC

svn commit: r586803 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java

Author: hboutemy
Date: Sat Oct 20 14:21:46 2007
New Revision: 586803

URL: http://svn.apache.org/viewvc?rev=586803&view=rev
Log:
avoid generated JavaScript where static content can be sufficient

Modified:
    maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java

Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java?rev=586803&r1=586802&r2=586803&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java Sat Oct 20 14:21:46 2007
@@ -28,6 +28,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.StringWriter;
 
 /**
  * Class that mounts a Document in HTML as document
@@ -75,7 +76,6 @@
             out.println( "<td align=\"left\" colspan=\"2\"><font size=\"+2\"><b>Function Summary</b></font></td>" );
             out.println( "</tr>" );
             
-            int functionCount = 0;
             String functionName = "";
             boolean summary = true;
             
@@ -90,15 +90,14 @@
                 summary = false;
                 if ( null != content && content.indexOf( "/**" ) != -1 )
                 {
-                    out.println( "<tr>" );
-                    out.println( "<td width=\"30%\" bgcolor=\"#f3f3f3\"><font face=\"Verdana\"><b><span id=\"Function"
-                        + functionCount + "\"></span></b></font></td>" );
-                    out.println( "<td width=\"70%\">" );
-                    content = br.readLine();
-
                     boolean description = true;
                     boolean parameterList = false;
                     boolean useList = false;
+
+                    StringWriter docBuffer = new StringWriter();
+                    PrintWriter doc = new PrintWriter( docBuffer );
+
+                    content = br.readLine();
                     while ( null != content && content.indexOf( "*/" ) == -1 )
                     {
                         if ( content.indexOf( "* @" ) != -1 )
@@ -110,27 +109,27 @@
                                     if ( parameterList == false )
                                     {
                                         parameterList = true;
-                                        out.println( "<font size=\"-1\" face=\"Verdana\"><b>Parameters: </b></font><br>" );
+                                        doc.println( "<font size=\"-1\" face=\"Verdana\"><b>Parameters: </b></font><br>" );
                                     }
-                                    out.print( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
-                                    out.println( content.substring( content.indexOf( "* @param" ) + 9 ) );
+                                    doc.print( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
+                                    doc.println( content.substring( content.indexOf( "* @param" ) + 9 ) );
                                 }
                                 else if ( content.indexOf( "use" ) != -1 )
                                 {
                                     if ( useList == false )
                                     {
                                         useList = true;
-                                        out.println( "<font size=\"-1\" face=\"Verdana\"><b>Uso: </b></font><br>" );
+                                        doc.println( "<font size=\"-1\" face=\"Verdana\"><b>Uso: </b></font><br>" );
                                     }
-                                    out.print( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
-                                    out.println( content.substring( content.indexOf( "* @use" ) + 7 ) );
+                                    doc.print( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
+                                    doc.println( content.substring( content.indexOf( "* @use" ) + 7 ) );
                                 }
                                 else if ( content.indexOf( "return" ) != -1 )
                                 {
-                                    out.print( "<font size=\"-1\" face=\"Verdana\"><b>Return type: </b></font>" );
-                                    out.print( content.substring( content.indexOf( "* @return" ) + 10 ) );
+                                    doc.print( "<font size=\"-1\" face=\"Verdana\"><b>Return type: </b></font>" );
+                                    doc.print( content.substring( content.indexOf( "* @return" ) + 10 ) );
                                 }
-                                out.println( "<br>" );
+                                doc.println( "<br>" );
                             }
                         }
                         else
@@ -138,11 +137,11 @@
                             if ( description )
                             {
                                 description = false;
-                                out.println( "<font size=\"-1\" face=\"Verdana\"><b>Description: </b></font>" );
+                                doc.println( "<font size=\"-1\" face=\"Verdana\"><b>Description: </b></font>" );
                             }
                             else
-                                out.println( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
-                            out.println( content.substring( content.indexOf( "*" ) + 1 ) + "<br>" );
+                                doc.println( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
+                            doc.println( content.substring( content.indexOf( "*" ) + 1 ) + "<br>" );
                         }
                         content = br.readLine();
                     }
@@ -161,10 +160,13 @@
                             functionName = content.substring( content.indexOf( "function" ) + 9 );
                         }
                     }
+
+                    out.println( "<tr>" );
+                    out.println( "<td width=\"30%\" bgcolor=\"#f3f3f3\"><font face=\"Verdana\"><b>" + functionName + 
+                                 "</b></font></td>" );
+                    out.println( "<td width=\"70%\">" );
+                    out.println( docBuffer.getBuffer() );
                     out.println( "</td>" );
-                    out.println( "<script>document.all.Function" + functionCount + ".innerHTML = \"" + functionName
-                        + "\"; </script>" );
-                    functionCount++;
                     out.println( "</tr>" );
                 }
             }