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:20:15 UTC
svn commit: r586762 - 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:20:14 2007
New Revision: 586762
URL: http://svn.apache.org/viewvc?rev=586762&view=rev
Log:
o changed remaining private static fields to local variables
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=586762&r1=586761&r2=586762&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:20:14 2007
@@ -36,35 +36,20 @@
*/
public class GenerateHTMLDoc
{
-
/** Logger for this class */
private static final Logger log = Logger.getLogger( GenerateHTMLDoc.class );
- private static PrintWriter out;
-
- private static BufferedReader br;
-
- private static int functionCount = 0;
-
- private static String functionName = "";
-
- private static boolean parameterList = false;
-
- private static boolean useList = false;
-
- private boolean summary = true;
-
- private boolean description = true;
-
- public GenerateHTMLDoc( File fis, String destDir )
+ public GenerateHTMLDoc( File file, String destDir )
{
try
{
- String nomeArquivo = fis.getName();
+ String filename = file.getName();
+ PrintWriter out = null;
+ BufferedReader br = null;
try
{
- out = new PrintWriter( new FileWriter( destDir + nomeArquivo.substring( 0, nomeArquivo.indexOf( "." ) ) + ".htm" ) );
- br = new BufferedReader( new FileReader( fis ) );
+ out = new PrintWriter( new FileWriter( destDir + filename.substring( 0, filename.indexOf( "." ) ) + ".htm" ) );
+ br = new BufferedReader( new FileReader( file ) );
}
catch ( FileNotFoundException fnfe )
{
@@ -80,7 +65,7 @@
out.println( "<title>Javascript code documentation</title>" );
out.println( "</head>" );
out.println( "<body>" );
- out.println( "<H2>Filename: " + nomeArquivo + "</H2>" );
+ out.println( "<H2>Filename: " + filename + "</H2>" );
out.println( "<br>" );
out.println( "<br>" );
out.println( "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" WIDTH=\"100%\">" );
@@ -89,6 +74,10 @@
out.println( "<B>Function Summary</B></FONT></TD>" );
out.println( "</TR>" );
+ int functionCount = 0;
+ String functionName = "";
+ boolean summary = true;
+
while ( br.ready() )
{
String content = br.readLine();
@@ -106,6 +95,9 @@
out.println( "<TD WIDTH=\"70%\">" );
content = br.readLine();
+ boolean description = true;
+ boolean parameterList = false;
+ boolean useList = false;
while ( null != content && content.indexOf( "*/" ) == -1 )
{
if ( content.indexOf( "* @" ) != -1 )
@@ -154,9 +146,6 @@
}
content = br.readLine();
}
- description = true;
- parameterList = false;
- useList = false;
while ( null != content && content.indexOf( "function" ) == -1 )
{
content = br.readLine();
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=586762&r1=586761&r2=586762&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:20:14 2007
@@ -30,6 +30,8 @@
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Vector;
/**
@@ -43,8 +45,6 @@
/** Logger for this class */
private static final Logger log = Logger.getLogger( GenerateHTMLIndex.class );
- private static Vector v = new Vector();
-
public GenerateHTMLIndex( String jSDir, String destDir )
throws IllegalArgumentException
{
@@ -84,30 +84,22 @@
destDir = destDir + "/";
}
- File file = new File( jSDir );
-
- if ( !file.isDirectory() )
- {
- throw new IllegalArgumentException( "destDir has to be a directory" );
- }
-
- collectFiles( file, v );
+ List files = new ArrayList();
+ collectFiles( js, files );
try
{
Writer writer = null;
try
{
- writer = new FileWriter( destDir + "index.htm" ); // platform encoding
-
+ writer = new FileWriter( new File( dest, "index.htm" ) ); // platform encoding
}
catch ( FileNotFoundException fnfe )
{
try
{
- file = new File( destDir );
- file.mkdir();
- writer = new FileWriter( destDir + "index.htm" );
+ dest.mkdir();
+ writer = new FileWriter( new File( dest, "index.htm" ) );
}
catch ( FileNotFoundException e )
{
@@ -138,24 +130,24 @@
out.println( "<TD ALIGN=\"left\"><FONT SIZE=\"+2\"><B>Summary</B></FONT></TD>" );
out.println( "</TR>" );
- for ( int i = 0; i < v.size(); i++ )
+ for ( int i = 0; i < files.size(); i++ )
{
- file = (File) v.get( i );
+ File file = (File) files.get( i );
GenerateHTMLDoc docGenerator = new GenerateHTMLDoc( file, destDir );
}
if ( log.isInfoEnabled() )
{
- log.info( "Number of .js files: " + v.size() );
+ log.info( "Number of .js files: " + files.size() );
}
- for ( int i = 0; i < v.size(); i++ )
+ for ( int i = 0; i < files.size(); i++ )
{
+ File file = (File) files.get( i );
if ( log.isInfoEnabled() )
{
log.info( "file: " + file.getName() );
}
- file = (File) v.get( i );
out.println( "<TR>" );
out.println( "<TD WIDTH=\"30%\" BGCOLOR=\"#f3f3f3\"><font face=\"Verdana\"><b><a href=\""
@@ -213,18 +205,18 @@
}
- private void collectFiles( File baseDir, Vector fileVector )
+ private static void collectFiles( File baseDir, List files )
{
File[] fileList = baseDir.listFiles();
for ( int i = 0; i < fileList.length; i++ )
{
if ( fileList[i].isDirectory() )
{
- collectFiles( fileList[i], fileVector );
+ collectFiles( fileList[i], files );
}
- else if ( fileList[i].getName().indexOf( ".js" ) != -1 )
+ else if ( fileList[i].getName().endsWith( ".js" ) )
{
- v.addElement( fileList[i] );
+ files.add( fileList[i] );
}
}
}