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/27 01:33:49 UTC
svn commit: r588801 - in
/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main: antlr/
java/org/apache/maven/jxr/java/src/html/
java/org/apache/maven/jxr/java/src/symtab/
resources/org/apache/maven/jxr/java/src/css/
Author: vsiveton
Date: Fri Oct 26 16:33:48 2007
New Revision: 588801
URL: http://svn.apache.org/viewvc?rev=588801&view=rev
Log:
o make the difference between single and multi lines comments
o prevent a NPE in Pass1#writeHTMLTag()
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/antlr/javaG.g
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/HTMLTag.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/SymbolTable.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/src/css/styles.css
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/antlr/javaG.g
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/antlr/javaG.g?rev=588801&r1=588800&r2=588801&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/antlr/javaG.g (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/antlr/javaG.g Fri Oct 26 16:33:48 2007
@@ -1604,11 +1604,24 @@
* @param line
* @param column
* @param text
- * @see SymbolTable#defineComment(int, int, String)
+ * @see SymbolTable#defineMultiLinesComment(int, int, String)
*/
- public void defineComment( int line, int column, String text )
+ public void defineMultiLinesComment( int line, int column, String text )
{
- symbolTable.defineComment(line, column, text);
+ symbolTable.defineMultiLinesComment(line, column, text);
+ }
+
+ /**
+ * <code>SymbolTable</code> adapter method.
+ *
+ * @param line
+ * @param column
+ * @param text
+ * @see SymbolTable#defineSingleLineComment(int, int, String)
+ */
+ public void defineSingleLineComment( int line, int column, String text )
+ {
+ symbolTable.defineSingleLineComment(line, column, text);
}
/**
@@ -1710,7 +1723,7 @@
SL_COMMENT
: { clStart=getLine(); ccStart=getColumn(); } "//"
(~('\n'|'\r'))*
- {defineComment(clStart,ccStart, getText());}
+ {defineSingleLineComment(clStart,ccStart, getText());}
('\n'|'\r'('\n')?)
{$setType(Token.SKIP); newline();}
;
@@ -1736,7 +1749,7 @@
| ~('*'|'\n'|'\r')
)*
"*/"
- {defineComment(clStart,ccStart,getText());}
+ {defineMultiLinesComment(clStart,ccStart,getText());}
{$setType(Token.SKIP);}
;
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/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?rev=588801&r1=588800&r2=588801&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java Fri Oct 26 16:33:48 2007
@@ -166,7 +166,8 @@
// Generate the HTML tags for all references in this file
// I.e. generate HTML mark-up of this .java file
SymbolTable.createReferenceTags( f, tempFileTags );
- SymbolTable.getCommentTags( f, tempFileTags );
+ SymbolTable.getMultiLinesCommentTags( f, tempFileTags );
+ SymbolTable.getSingleLineCommentTags( f, tempFileTags );
SymbolTable.getLiteralTags( f, tempFileTags );
SymbolTable.getKeywordTags( f, tempFileTags );
createClassFiles( tempFileTags );
@@ -257,8 +258,8 @@
HTMLOutputWriter output = new LineOutputWriter( new BufferedOutputStream( new FileOutputStream( f ) ) );
String backup = getBackupPath( tagList, element );
- String encoding = ( StringUtils.isNotEmpty( getOptions().getDocencoding() ) ? getOptions()
- .getDocencoding() : DEFAULT_DOCENCODING );
+ String encoding = ( StringUtils.isNotEmpty( getOptions().getDocencoding() ) ? getOptions().getDocencoding()
+ : DEFAULT_DOCENCODING );
String header = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
+ "<HTML>\n"
@@ -405,9 +406,13 @@
}
// Check for comment
- if ( t.isComment() )
+ if ( t.isMultiLinesComment() )
{
- writeComment( t, input, output );
+ writeMultiLinesComment( t, input, output );
+ }
+ if ( t.isSingleLineComment() )
+ {
+ writeSingleLineComment( t, input, output );
}
else if ( t.isLiteral() )
{
@@ -420,7 +425,10 @@
else
{
// Write HTML tag
- output.write( t.getText() );
+ if ( t.getText() != null )
+ {
+ output.write( t.getText() );
+ }
if ( log.isDebugEnabled() )
{
@@ -469,13 +477,56 @@
* @param output
* @throws IOException
*/
- private void writeComment( HTMLTag t, LineNumberReader input, HTMLOutputWriter output )
+ private void writeMultiLinesComment( HTMLTag t, LineNumberReader input, HTMLOutputWriter output )
+ throws IOException
+ {
+ int length = t.getLength();
+ int i = 0;
+
+ output.write( "<SPAN CLASS=\"multiLinesComment\">" );
+
+ while ( i < length )
+ {
+ if ( currentChar == '\n' )
+ {
+ output.write( "</SPAN>" );
+ }
+ output.writeHTML( (char) currentChar );
+
+ if ( currentChar == '\n' )
+ {
+ output.write( "<SPAN CLASS=\"multiLinesComment\">" );
+ currentColumn = 0;
+ }
+
+ currentChar = input.read();
+ currentColumn++;
+ i++;
+ }
+
+ output.write( "</SPAN>" );
+
+ if ( currentChar == '\n' )
+ {
+ currentColumn = 0;
+ }
+ }
+
+ /**
+ * Method writeSingleComment
+ *
+ * @param t
+ * @param input
+ * @param output
+ * @throws IOException
+ */
+ private void writeSingleLineComment( HTMLTag t, LineNumberReader input, HTMLOutputWriter output )
throws IOException
{
int length = t.getLength();
int i = 0;
- output.write( "<SPAN CLASS=\"comment\">" );
+ output.write( "<SPAN CLASS=\"singleLineComment\">" );
while ( i < length )
{
@@ -487,7 +538,7 @@
if ( currentChar == '\n' )
{
- output.write( "<SPAN CLASS=\"comment\">" );
+ output.write( "<SPAN CLASS=\"singleLineComment\">" );
currentColumn = 0;
}
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/HTMLTag.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/symtab/HTMLTag.java?rev=588801&r1=588800&r2=588801&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/HTMLTag.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/HTMLTag.java Fri Oct 26 16:33:48 2007
@@ -32,7 +32,6 @@
public class HTMLTag
implements JSComparable
{
-
// ==========================================================================
// == Class Variables
// ==========================================================================
@@ -60,12 +59,14 @@
public static int TYPE_NONE = 0;
- public static int TYPE_COMMENT = 1;
+ public static int TYPE_MULTI_LINES_COMMENT = 1;
public static int TYPE_LITERAL = 2;
public static int TYPE_KEYWORD = 3;
+ public static int TYPE_SINGLE_LINE_COMMENT = 4;
+
private int type = TYPE_NONE;
/** Field numBreaks */
@@ -149,13 +150,23 @@
}
/**
- * Method isComment
+ * Method isMultiLinesComment
+ *
+ * @return
+ */
+ public boolean isMultiLinesComment()
+ {
+ return ( type == TYPE_MULTI_LINES_COMMENT );
+ }
+
+ /**
+ * Method isSingleLineComment()
*
* @return
*/
- public boolean isComment()
+ public boolean isSingleLineComment()
{
- return ( type == TYPE_COMMENT );
+ return ( type == TYPE_SINGLE_LINE_COMMENT );
}
/**
@@ -207,7 +218,6 @@
*/
HTMLTag( Occurrence o, String origText, String replaceText )
{
-
this.file = o.getFile();
this.line = o.getLine();
this.startColumn = o.getColumn();
@@ -238,7 +248,6 @@
*/
HTMLTag( File f, int l, int c, String packageName, String origText, String replaceText )
{
-
this.file = f;
this.line = l;
this.startColumn = c;
@@ -266,29 +275,8 @@
* @param packageName
* @param length
*/
- HTMLTag( File f, int l, int c, String packageName, int length )
- {
-
- this.file = f;
- this.line = l;
- this.startColumn = c;
- this.length = length;
- this.packageName = packageName;
- this.type = TYPE_COMMENT;
- }
-
- /**
- * Constructor for comment. Doesn't store text
- *
- * @param f
- * @param l
- * @param c
- * @param packageName
- * @param length
- */
HTMLTag( File f, int l, int c, String packageName, int length, int type )
{
-
this.file = f;
this.line = l;
this.startColumn = c;
@@ -310,7 +298,6 @@
*/
public int compareTo( Object o )
{
-
HTMLTag t = (HTMLTag) o;
if ( getLine() < t.getLine() )
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/SymbolTable.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/symtab/SymbolTable.java?rev=588801&r1=588800&r2=588801&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/SymbolTable.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/symtab/SymbolTable.java Fri Oct 26 16:33:48 2007
@@ -103,8 +103,11 @@
/** Hashtable holds Vectors mapping symbol references to files */
private static Hashtable _fileReferences = new Hashtable();
- /** Hashtable holds Vectors mapping comments to files */
- private static Hashtable _fileComments = new Hashtable();
+ /** Hashtable holds Vectors mapping multi lines comments to files */
+ private static Hashtable _fileMultiLinesComments = new Hashtable();
+
+ /** Hashtable holds Vectors mapping single line comments to files */
+ private static Hashtable _fileSingleLineComments = new Hashtable();
/** Hashtable holds Vectors mapping literals to files */
private static Hashtable _fileLiterals = new Hashtable();
@@ -134,7 +137,6 @@
*/
public static void createReferenceTags( File f, Vector tagList )
{
-
Vector v = (Vector) _fileReferences.get( f );
if ( v != null )
@@ -161,7 +163,6 @@
*/
public static void addFileReference( Occurrence occ )
{
-
File f = occ.getFile();
Vector v = (Vector) _fileReferences.get( f );
@@ -176,15 +177,30 @@
}
/**
- * Method getCommentTags
+ * Method getMultiLinesCommentTags
*
* @param f
* @param tagList
*/
- public static void getCommentTags( File f, Vector tagList )
+ public static void getMultiLinesCommentTags( File f, Vector tagList )
{
+ Vector commentList = (Vector) _fileMultiLinesComments.get( f );
- Vector commentList = (Vector) _fileComments.get( f );
+ if ( commentList != null )
+ {
+ tagList.addAll( commentList );
+ }
+ }
+
+ /**
+ * Method getSingleLineCommentTags
+ *
+ * @param f
+ * @param tagList
+ */
+ public static void getSingleLineCommentTags( File f, Vector tagList )
+ {
+ Vector commentList = (Vector) _fileSingleLineComments.get( f );
if ( commentList != null )
{
@@ -200,7 +216,6 @@
*/
public static void getLiteralTags( File f, Vector tagList )
{
-
Vector literalList = (Vector) _fileLiterals.get( f );
if ( literalList != null )
@@ -217,7 +232,6 @@
*/
public static void getKeywordTags( File f, Vector tagList )
{
-
Vector keywordList = (Vector) _fileKeywords.get( f );
if ( keywordList != null )
@@ -273,7 +287,6 @@
*/
public static SymbolTable getSymbolTable()
{
-
if ( singleton == null )
{
singleton = new SymbolTable();
@@ -287,7 +300,6 @@
*/
private SymbolTable()
{
-
// allocate storage for the packages and scope lists
packages = new JavaHashtable();
activeScopes = new JavaStack();
@@ -374,7 +386,6 @@
*/
public static void createDirs( File f )
{
-
String parentDir = f.getParent();
File directory = new File( parentDir );
@@ -392,7 +403,6 @@
*/
public static void addFileClassDef( File f, ClassDef classDef )
{
-
if ( _fileClassDefs == null )
{
_fileClassDefs = new Hashtable( 2 );
@@ -418,7 +428,6 @@
*/
public static String getClassList( File f )
{
-
if ( _fileClassDefs == null )
{
return null;
@@ -432,7 +441,6 @@
}
String list = "";
-
for ( int i = 0; i < v.size(); i++ )
{
Definition d = (Definition) v.elementAt( i );
@@ -458,7 +466,6 @@
*/
public void addImport( JavaToken tok, String className, String packageName )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "addImport(JavaToken, String, String) - String className=" + className );
@@ -477,7 +484,6 @@
return;
}
-
// otherwise, chop the extra "." that the parser adds...
else
{
@@ -507,7 +513,6 @@
// otherwise, create a placeholder class for class/interface ref
else
{
-
if ( log.isDebugEnabled() )
{
log.debug( "addImport(JavaToken, String, String) - Created placeholder for:"
@@ -531,7 +536,6 @@
*/
void addToCurrentScope( Definition def )
{
-
// add the definition to the current scope
getCurrentScope().add( def );
@@ -556,7 +560,6 @@
*/
public Definition defineBlock( JavaToken tok )
{
-
// create a new block definition and push it
// as the current scope
BlockDef def = new BlockDef( null, getOccurrence( tok ), getCurrentScope() );
@@ -584,7 +587,6 @@
ClassDef def = new ClassDef( getUniqueName( theClass ), getOccurrence( theClass ),
( superClass == null ) ? null : getDummyClass( superClass ), interfaces,
getCurrentScope() );
-
def.setType( ClassDef.CLASS );
// add the imported classes/packages to the class
@@ -606,13 +608,11 @@
*/
public void defineInterface( JavaToken theInterface, JavaVector superInterfaces )
{
-
// note -- we leave superInterfaces as a vector of JavaTokens for now.
// we'll resolve in pass 2.
// create the new interface object
ClassDef def = new ClassDef( getUniqueName( theInterface ), getOccurrence( theInterface ), null, // no super class...
superInterfaces, getCurrentScope() );
-
def.setType( ClassDef.INTERFACE );
// add it to the current scope
@@ -630,22 +630,19 @@
*/
public void defineLabel( JavaToken theLabel )
{
-
addToCurrentScope( new LabelDef( getUniqueName( theLabel ), getOccurrence( theLabel ), getCurrentScope() ) );
}
/**
- * Define a new comment object
+ * Define a new multi lines comment object
*
* @param line
* @param column
* @param text
*/
- public void defineComment( int line, int column, String text )
+ public void defineMultiLinesComment( int line, int column, String text )
{
-
int length = text.length();
-
/*
* Removing since we now skip carriage returns
* if (text.indexOf("\r\n")>0) {
@@ -655,17 +652,39 @@
* }
*/
String packageName = getCurrentPackageName();
- HTMLTag t = new HTMLTag( currentFile, line, column, packageName, length );
- Vector commentList = (Vector) _fileComments.get( currentFile );
+ HTMLTag t = new HTMLTag( currentFile, line, column, packageName, length, HTMLTag.TYPE_MULTI_LINES_COMMENT );
+ Vector multiLinesCommentList = (Vector) _fileMultiLinesComments.get( currentFile );
+ if ( multiLinesCommentList == null )
+ {
+ multiLinesCommentList = new Vector();
+
+ _fileMultiLinesComments.put( currentFile, multiLinesCommentList );
+ }
+
+ multiLinesCommentList.addElement( t );
+ }
- if ( commentList == null )
+ /**
+ * Define a new single line comment object
+ *
+ * @param line
+ * @param column
+ * @param text
+ */
+ public void defineSingleLineComment( int line, int column, String text )
+ {
+ int length = text.length();
+ String packageName = getCurrentPackageName();
+ HTMLTag t = new HTMLTag( currentFile, line, column, packageName, length, HTMLTag.TYPE_SINGLE_LINE_COMMENT );
+ Vector singleLineCommentList = (Vector) _fileSingleLineComments.get( currentFile );
+ if ( singleLineCommentList == null )
{
- commentList = new Vector();
+ singleLineCommentList = new Vector();
- _fileComments.put( currentFile, commentList );
+ _fileSingleLineComments.put( currentFile, singleLineCommentList );
}
- commentList.addElement( t );
+ singleLineCommentList.addElement( t );
}
/**
@@ -677,12 +696,10 @@
*/
public void defineLiteral( int line, int column, String text )
{
-
int length = text.length();
String packageName = getCurrentPackageName();
HTMLTag t = new HTMLTag( currentFile, line, column, packageName, length, HTMLTag.TYPE_LITERAL );
Vector literalList = (Vector) _fileLiterals.get( currentFile );
-
if ( literalList == null )
{
literalList = new Vector();
@@ -702,12 +719,10 @@
*/
public void defineKeyword( int line, int column, String text )
{
-
int length = text.length();
String packageName = getCurrentPackageName();
HTMLTag t = new HTMLTag( currentFile, line, column, packageName, length, HTMLTag.TYPE_KEYWORD );
Vector keywordList = (Vector) _fileKeywords.get( currentFile );
-
if ( keywordList == null )
{
keywordList = new Vector();
@@ -726,7 +741,6 @@
*/
public void defineMethod( JavaToken theMethod, JavaToken type )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "defineMethod(JavaToken, JavaToken) - JavaToken theMethod=" + theMethod.getText() );
@@ -804,7 +818,6 @@
*/
public void defineVar( JavaToken theVariable, JavaToken type )
{
-
// create the variable definition
VariableDef v = new VariableDef( getUniqueName( theVariable ), getOccurrence( theVariable ),
getDummyClass( type ), getCurrentScope() );
@@ -829,7 +842,6 @@
*/
public void endMethodHead( JavaVector exceptions )
{
-
// set its thrown exception list
currentMethod.setExceptions( exceptions );
@@ -849,7 +861,6 @@
*/
Definition findInImports( String name, Class type )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "findInImports(String, Class) - String name=" + name );
@@ -934,7 +945,6 @@
*/
PackageDef lookupPackage( String name )
{
-
PackageDef result = (PackageDef) packages.get( name );
if ( result == null )
@@ -954,7 +964,6 @@
*/
ScopedDef getCurrentScope()
{
-
if ( activeScopes.empty() )
{
return null;
@@ -970,7 +979,6 @@
*/
PackageDef getDefaultPackage()
{
-
// if the default package has not yet been defined, create it
// (lazy instantiation)
if ( defaultPackage == null )
@@ -992,7 +1000,6 @@
*/
public DummyClass getDummyClass( JavaToken tok )
{
-
if ( tok == null )
{
return null;
@@ -1008,7 +1015,6 @@
*/
ClassDef getObject()
{
-
if ( object == null )
{ // lazy instantiation
object = new DummyClass();
@@ -1030,7 +1036,6 @@
*/
Occurrence getOccurrence( JavaToken tok )
{
-
if ( tok == null )
{
return new Occurrence( null, 0 );
@@ -1096,7 +1101,6 @@
*/
Definition lookup( String name, int numParams, Class type )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "lookup(String, int, Class) - String name=" + name );
@@ -1358,7 +1362,6 @@
*/
ClassDef lookupDummy( Definition d )
{
-
// construct a qualified class name
String className;
String pkg = ( (DummyClass) d ).getPackage();
@@ -1407,7 +1410,6 @@
*/
void openImports( JavaHashtable imports )
{
-
// start a new demand list
demand = new JavaVector();
@@ -1419,20 +1421,17 @@
// if this class has something to import...
if ( imports != null )
{
-
// walk through the list of imports
Enumeration e = imports.elements();
while ( e.hasMoreElements() )
{
-
// add the package or class to the demand or import list
// based on the type of import it was
Definition d = (Definition) e.nextElement();
if ( d instanceof PackageDef )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "openImports(JavaHashtable) - Adding package " + d.getName() + " to imports" );
@@ -1443,7 +1442,6 @@
{
if ( d instanceof DummyClass )
{
-
if ( log.isDebugEnabled() )
{
log.debug( "openImports(JavaHashtable) - found DummyClass " + d.getName() + " package "
@@ -1474,7 +1472,6 @@
*/
public void popAllScopes()
{
-
while ( activeScopes.peek() != baseScope )
{
activeScopes.pop();
@@ -1499,7 +1496,6 @@
*/
Definition pushScope( Definition scope )
{
-
if ( !( scope instanceof ScopedDef ) )
{
throw new RuntimeException( "Not a ScopedDef" );
@@ -1517,7 +1513,6 @@
*/
String getCurrentPackageName()
{
-
String packageName = "";
if ( activeScopes == null )
@@ -1549,7 +1544,6 @@
*/
String getCurrentClassName()
{
-
String className = "?";
if ( activeScopes == null )
@@ -1581,7 +1575,6 @@
*/
String getCurrentMethodName()
{
-
String methodName = "?";
if ( activeScopes == null )
@@ -1613,7 +1606,6 @@
*/
public void reference( JavaToken t )
{
-
t.setFile( currentFile );
t.setPackageName( getCurrentPackageName() );
t.setClassName( getCurrentClassName() );
@@ -1628,7 +1620,6 @@
*/
public Hashtable generatePackageTags()
{
-
Vector tagList;
Vector sortedList;
Hashtable tagTable = new Hashtable( 2 );
@@ -1677,7 +1668,6 @@
*/
public void resolveTypes()
{
-
// for each package, resolve its references
if ( defaultPackage != null )
{
@@ -1692,7 +1682,6 @@
*/
public void resolveRefs()
{
-
// for each package, resolve its references
if ( defaultPackage != null )
{
@@ -1709,7 +1698,6 @@
*/
public void persistRefs( String outDirPath )
{
-
ReferencePersistor rp = new ReferencePersistor( outDirPath );
if ( defaultPackage != null )
@@ -1736,7 +1724,6 @@
*/
public void setNearestClassScope()
{
-
// find the nearest class scope
setScope( activeScopes.findTopmostClass() );
}
@@ -1750,7 +1737,6 @@
*/
void setScope( JavaToken t )
{
-
Definition def = lookup( t.getText(), null );
if ( def != null )
@@ -1768,7 +1754,6 @@
*/
void setScope( Definition d )
{
-
while ( ( d != null ) && ( d instanceof TypedDef ) )
{
d = ( (TypedDef) d ).getType();
@@ -1789,7 +1774,6 @@
*/
void setScope( String name )
{
-
Definition def = lookup( name, null );
if ( def != null )
@@ -1803,7 +1787,6 @@
*/
public String toString()
{
-
String str = "";
Enumeration e = packages.elements();
@@ -1837,7 +1820,6 @@
*/
static public void startReadExternal( String name )
{
-
// for (int i=0; i<readLevel; i++)
// System.out.print(' ');
// System.out.println("reading "+name);
@@ -1849,7 +1831,6 @@
*/
static public void endReadExternal()
{
-
// readLevel--;
}
}
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/src/css/styles.css
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/src/css/styles.css?rev=588801&r1=588800&r2=588801&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/src/css/styles.css (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/src/css/styles.css Fri Oct 26 16:33:48 2007
@@ -44,7 +44,8 @@
.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
/* JavaSrc style sheet */
-.comment { color:#007d00; font-style:italic }
+.multiLinesComment { color:#3f5fbf; font-style:italic }
+.singleLineComment { color:#007d00; font-style:italic }
.linenum { color:#888 font-weight:normal; }
.string { color: #009;}
.keywords { color: #7f0055;}