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 19:31:24 UTC

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

Author: hboutemy
Date: Sat Oct 20 10:31:22 2007
New Revision: 586764

URL: http://svn.apache.org/viewvc?rev=586764&view=rev
Log:
enforce HTML tags in lowercase

Modified:
    maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLDoc.java
    maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLIndex.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=586764&r1=586763&r2=586764&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 10:31:22 2007
@@ -56,6 +56,8 @@
                 log.error( "FileNotFoundException: " + fnfe.getMessage(), fnfe );
             }
 
+            out.println( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" " +
+                "\"http://www.w3.org/TR/html4/loose.dtd\">" );
             out.println( "<html>" );
             out.println( "<head>" );
             out.println( "<style type=\"text/css\">" );
@@ -65,14 +67,13 @@
             out.println( "<title>Javascript code documentation</title>" );
             out.println( "</head>" );
             out.println( "<body>" );
-            out.println( "<H2>Filename: " + filename + "</H2>" );
+            out.println( "<h2>Filename: " + filename + "</h2>" );
             out.println( "<br>" );
             out.println( "<br>" );
-            out.println( "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" WIDTH=\"100%\">" );
-            out.println( "<TR CLASS=\"TableHeadingColor\">" );
-            out.println( "<TD ALIGN=\"left\" colspan=\"2\"><FONT SIZE=\"+2\">" );
-            out.println( "<B>Function Summary</B></FONT></TD>" );
-            out.println( "</TR>" );
+            out.println( "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\">" );
+            out.println( "<tr class=\"TableHeadingColor\">" );
+            out.println( "<td align=\"left\" colspan=\"2\"><font size=\"+2\"><b>Function Summary</b></font></td>" );
+            out.println( "</tr>" );
             
             int functionCount = 0;
             String functionName = "";
@@ -89,10 +90,10 @@
                 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%\">" );
+                    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;
@@ -109,10 +110,9 @@
                                     if ( parameterList == false )
                                     {
                                         parameterList = true;
-                                        out.println( "<font size=\"-1\" face=\"Verdana\"><b>Parameters: </b></font>" );
-                                        out.println( "<BR>" );
+                                        out.println( "<font size=\"-1\" face=\"Verdana\"><b>Parameters: </b></font><br>" );
                                     }
-                                    out.println( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
+                                    out.print( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
                                     out.println( content.substring( content.indexOf( "* @param" ) + 9 ) );
                                 }
                                 else if ( content.indexOf( "use" ) != -1 )
@@ -120,7 +120,7 @@
                                     if ( useList == false )
                                     {
                                         useList = true;
-                                        out.println( "<font size=\"-1\" face=\"Verdana\"><b>Uso: </b></font><BR>" );
+                                        out.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 ) );
@@ -130,7 +130,7 @@
                                     out.print( "<font size=\"-1\" face=\"Verdana\"><b>Return type: </b></font>" );
                                     out.print( content.substring( content.indexOf( "* @return" ) + 10 ) );
                                 }
-                                out.println( "<BR>" );
+                                out.println( "<br>" );
                             }
                         }
                         else
@@ -142,7 +142,7 @@
                             }
                             else
                                 out.println( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );
-                            out.println( content.substring( content.indexOf( "*" ) + 1 ) + "<BR>" );
+                            out.println( content.substring( content.indexOf( "*" ) + 1 ) + "<br>" );
                         }
                         content = br.readLine();
                     }
@@ -161,14 +161,14 @@
                             functionName = content.substring( content.indexOf( "function" ) + 9 );
                         }
                     }
-                    out.println( "</TD>" );
+                    out.println( "</td>" );
                     out.println( "<script>document.all.Function" + functionCount + ".innerHTML = \"" + functionName
                         + "\"; </script>" );
                     functionCount++;
-                    out.println( "</TR>" );
+                    out.println( "</tr>" );
                 }
             }
-            out.println( "</TABLE>" );
+            out.println( "</table>" );
             out.println( "<a href=\"javascript:history.back()\"><font size=\"+1\">Back</font></a>" );
             out.println( "</body>" );
             out.println( "</html>" );

Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLIndex.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/GenerateHTMLIndex.java?rev=586764&r1=586763&r2=586764&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLIndex.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-js/src/main/java/org/apache/maven/jxr/js/doc/GenerateHTMLIndex.java Sat Oct 20 10:31:22 2007
@@ -32,7 +32,6 @@
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * Searches all javascript files and creates a index HTML
@@ -121,14 +120,14 @@
             out.println( "<title>JavaScript Code Documentation</title>" );
             out.println( "</head>" );
             out.println( "<body>" );
-            out.println( "<H2>Index</H2>" );
+            out.println( "<h2>Index</h2>" );
             out.println( "<br>" );
             out.println( "<br>" );
-            out.println( "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" WIDTH=\"100%\">" );
-            out.println( "<TR CLASS=\"TableHeadingColor\">" );
-            out.println( "<TD ALIGN=\"left\"><FONT SIZE=\"+2\"><B>Filename</B></FONT></TD>" );
-            out.println( "<TD ALIGN=\"left\"><FONT SIZE=\"+2\"><B>Summary</B></FONT></TD>" );
-            out.println( "</TR>" );
+            out.println( "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\">" );
+            out.println( "<tr class=\"TableHeadingColor\">" );
+            out.println( "<td align=\"left\"><font size=\"+2\"><b>Filename</b></font></td>" );
+            out.println( "<td align=\"left\"><font size=\"+2\"><b>Summary</b></font></td>" );
+            out.println( "</tr>" );
 
             for ( int i = 0; i < files.size(); i++ )
             {
@@ -149,11 +148,11 @@
                     log.info( "file: " + file.getName() );
                 }
 
-                out.println( "<TR>" );
-                out.println( "<TD WIDTH=\"30%\" BGCOLOR=\"#f3f3f3\"><font face=\"Verdana\"><b><a href=\""
+                out.println( "<tr>" );
+                out.println( "<td width=\"30%\" bgcolor=\"#f3f3f3\"><font face=\"Verdana\"><b><a href=\""
                     + file.getName().substring( 0, file.getName().indexOf( "." ) ) + ".htm" + "\">" + file.getName()
-                    + "</a></b></font></TD>" );
-                out.println( "<TD WIDTH=\"70%\">" );
+                    + "</a></b></font></td>" );
+                out.println( "<td width=\"70%\">" );
 
                 try
                 {
@@ -169,13 +168,10 @@
                             content = br.readLine();
                             while ( null != content && content.indexOf( "*/" ) == -1 )
                             {
-                                if ( content.indexOf( "* @" ) != -1 )
+                                if ( content.indexOf( "* @" ) != -1 && content.indexOf( "summary" ) != -1 )
                                 {
-                                    if ( content.indexOf( "summary" ) != -1 )
-                                    {
-                                        out.println( content.substring( content.indexOf( "* @summary" ) + 11 ) );
-                                        out.println( "<BR>" );
-                                    }
+                                    out.println( content.substring( content.indexOf( "* @summary" ) + 11 ) );
+                                    out.println( "<br>" );
                                 }
                                 content = br.readLine();
                             }
@@ -188,11 +184,11 @@
                     log.error( "FileNotFoundException: " + fnfe.getMessage(), fnfe );
                 }
 
-                out.println( "</TD>" );
-                out.println( "</TR>" );
+                out.println( "</td>" );
+                out.println( "</tr>" );
             }
 
-            out.println( "</TABLE>" );
+            out.println( "</table>" );
             out.println( "</body>" );
             out.println( "</html>" );