You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/10/25 15:21:24 UTC
svn commit: r588229 - in
/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src:
./ html/
Author: vsiveton
Date: Thu Oct 25 06:21:19 2007
New Revision: 588229
URL: http://svn.apache.org/viewvc?rev=588229&view=rev
Log:
o moved html related classes in a new html package
o updated references and used default package level
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java
- copied, changed from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/AbstractPass.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ClassFileEntry.java
- copied, changed from r586415, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ClassFileEntry.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/HTMLOutputWriter.java
- copied, changed from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/HTMLOutputWriter.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/LineOutputWriter.java
- copied, changed from r587065, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/LineOutputWriter.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
- copied, changed from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass1.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java
- copied, changed from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass2.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ReferenceEntry.java
- copied, changed from r586415, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ReferenceEntry.java
Removed:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/AbstractPass.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ClassFileEntry.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/HTMLOutputWriter.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/LineOutputWriter.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass1.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass2.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ReferenceEntry.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/JavaSrc.java
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/JavaSrc.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/JavaSrc.java?rev=588229&r1=588228&r2=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/JavaSrc.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/JavaSrc.java Thu Oct 25 06:21:19 2007
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.InputStream;
+import org.apache.maven.jxr.java.src.html.Pass1;
+import org.apache.maven.jxr.java.src.html.Pass2;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java (from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/AbstractPass.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/AbstractPass.java&r1=588222&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/AbstractPass.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,13 +22,15 @@
import java.io.File;
import java.util.StringTokenizer;
+import org.apache.maven.jxr.java.src.JavaSrcOptions;
+
/**
* Abstract class for Pass.
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
-public abstract class AbstractPass
+abstract class AbstractPass
{
protected static final String DEFAULT_EXCLUDES = "**/*~,**/#*#,**/.#*,**/%*%,**/._*,**/CVS,**/CVS/**,"
+ "**/.cvsignore,**/SCCS,**/SCCS/**,**/vssver.scc,**/.svn,**/.svn/**,**/.DS_Store";
@@ -40,7 +42,7 @@
*
* @param options object
*/
- public AbstractPass( JavaSrcOptions options )
+ AbstractPass( JavaSrcOptions options )
{
if ( options == null )
{
@@ -53,7 +55,7 @@
* @return the output dir
* @see JavaSrcOptions#getDestDir()
*/
- protected String getDestDir()
+ String getDestDir()
{
return this.options.getDestDir();
}
@@ -62,7 +64,7 @@
* @return the source dir
* @see JavaSrcOptions#getSrcDir()
*/
- protected String getSrcDir()
+ String getSrcDir()
{
return this.options.getSrcDir();
}
@@ -72,7 +74,7 @@
*
* @return the options
*/
- protected JavaSrcOptions getOptions()
+ JavaSrcOptions getOptions()
{
return this.options;
}
@@ -85,7 +87,7 @@
* @return
* @returns the path from the package to the top level, as a string
*/
- protected static String getBackupPath( String packageName )
+ static String getBackupPath( String packageName )
{
StringTokenizer st = new StringTokenizer( packageName, "." );
String backup = "";
@@ -100,7 +102,7 @@
return backup;
}
- protected static void println( String description )
+ static void println( String description )
{
System.out.print( "\n" );
System.out.print( description );
@@ -111,7 +113,7 @@
*
* @param f
*/
- protected static void createDirs( File f )
+ static void createDirs( File f )
{
String parentDir = f.getParent();
File directory = new File( parentDir );
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ClassFileEntry.java (from r586415, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ClassFileEntry.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ClassFileEntry.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ClassFileEntry.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ClassFileEntry.java&r1=586415&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ClassFileEntry.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ClassFileEntry.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/HTMLOutputWriter.java (from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/HTMLOutputWriter.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/HTMLOutputWriter.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/HTMLOutputWriter.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/HTMLOutputWriter.java&r1=585122&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/HTMLOutputWriter.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/HTMLOutputWriter.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,16 +28,15 @@
*
* @version $Id$
*/
-public class HTMLOutputWriter
+class HTMLOutputWriter
extends OutputStreamWriter
{
-
/**
* Constructor HTMLOutputWriter
*
* @param output
*/
- public HTMLOutputWriter( OutputStream output )
+ HTMLOutputWriter( OutputStream output )
{
super( output );
}
@@ -48,7 +47,7 @@
* @param c
* @throws IOException
*/
- public void writeHTML( int c )
+ void writeHTML( int c )
throws IOException
{
@@ -75,7 +74,7 @@
* @param s
* @throws IOException
*/
- public void writeHTML( String s )
+ void writeHTML( String s )
throws IOException
{
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/LineOutputWriter.java (from r587065, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/LineOutputWriter.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/LineOutputWriter.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/LineOutputWriter.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/LineOutputWriter.java&r1=587065&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/LineOutputWriter.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/LineOutputWriter.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,42 +27,40 @@
*
* @version $Id$
*/
-public class LineOutputWriter
+class LineOutputWriter
extends HTMLOutputWriter
{
-
- /** Field MAXCOLS */
- public static int MAXCOLS = 5;
-
/**
* The max number of line number digits.
* Sadly, the pipe pattern doesn't let us use the real value
* discovered at runtime.
* No class file should have more than 9999 lines anyway.
*/
- public static final int MAX_LINE_NUMBER_DIGITS = 5;
+ private static final int MAX_LINE_NUMBER_DIGITS = 5;
+
+ /** Field _lineNumber */
+ private int _lineNumber;
+
+ /** Field _firstLine */
+ private boolean _firstLine;
/**
* Constructor LineOutputWriter
*
* @param output
*/
- public LineOutputWriter( OutputStream output )
+ LineOutputWriter( OutputStream output )
{
-
super( output );
_lineNumber = 1;
_firstLine = true;
}
- /**
- * @see java.io.OutputStreamWriter#write(int)
- */
+ /** {@inheritDoc} */
public void write( int c )
throws IOException
{
-
if ( _firstLine )
{
_firstLine = false;
@@ -78,13 +76,10 @@
}
}
- /**
- * @see org.apache.maven.jxr.java.src.HTMLOutputWriter#writeHTML(int)
- */
+ /** {@inheritDoc} */
public void writeHTML( int c )
throws IOException
{
-
if ( _firstLine )
{
_firstLine = false;
@@ -100,13 +95,10 @@
}
}
- /**
- * @see java.io.Writer#write(java.lang.String)
- */
+ /** {@inheritDoc} */
public void write( String s )
throws IOException
{
-
int length = s.length();
for ( int i = 0; i < length; i++ )
@@ -115,13 +107,10 @@
}
}
- /**
- * @see org.apache.maven.jxr.java.src.HTMLOutputWriter#writeHTML(java.lang.String)
- */
+ /** {@inheritDoc} */
public void writeHTML( String s )
throws IOException
{
-
int length = s.length();
for ( int i = 0; i < length; i++ )
@@ -135,10 +124,9 @@
*
* @throws IOException
*/
- public void writeLineNumber()
+ void writeLineNumber()
throws IOException
{
-
String lineString = Integer.toString( _lineNumber );
String spacing = "";
@@ -156,10 +144,4 @@
_lineNumber++;
}
-
- /** Field _lineNumber */
- private int _lineNumber;
-
- /** Field _firstLine */
- private boolean _firstLine;
}
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java (from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass1.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass1.java&r1=588222&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass1.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +34,7 @@
import java.util.Vector;
import org.apache.log4j.Logger;
+import org.apache.maven.jxr.java.src.JavaSrcOptions;
import org.apache.maven.jxr.java.src.symtab.HTMLTag;
import org.apache.maven.jxr.java.src.symtab.HTMLTagContainer;
import org.apache.maven.jxr.java.src.symtab.PackageDef;
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java (from r588222, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass2.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass2.java&r1=588222&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/Pass2.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -42,6 +42,7 @@
import java.util.Vector;
import org.apache.log4j.Logger;
+import org.apache.maven.jxr.java.src.JavaSrcOptions;
import org.apache.maven.jxr.java.src.symtab.ReferenceTypes;
import org.codehaus.plexus.util.StringUtils;
Copied: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ReferenceEntry.java (from r586415, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ReferenceEntry.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ReferenceEntry.java?p2=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ReferenceEntry.java&p1=maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ReferenceEntry.java&r1=586415&r2=588229&rev=588229&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/ReferenceEntry.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/ReferenceEntry.java Thu Oct 25 06:21:19 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.java.src;
+package org.apache.maven.jxr.java.src.html;
/*
* Licensed to the Apache Software Foundation (ASF) under one