Author: ltheussl
Date: Sat Dec 10 23:40:17 2005
New Revision: 355937
URL: http://svn.apache.org/viewcvs?rev=355937&view=rev
Log:
PR: MPJAVADOC-61
StringIndexOutOfBoundsException on parsing the files
Modified:
maven/maven-1/plugins/trunk/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
Modified:
maven/maven-1/plugins/trunk/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java?rev=355937&r1=355936&r2=355937&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
(original)
+++
maven/maven-1/plugins/trunk/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
Sat Dec 10 23:40:17 2005
@@ -265,6 +265,19 @@
int msgStart = warningStart + PADDING;
String msg = line.substring( msgStart );
+ Integer lineNumberInt;
+ try
+ {
+ lineNumberInt = new Integer( lineNumber );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ // Warnings from package.html files don't contain line
numbers
+ fileName = fileNameAndLineNumber.substring( 0, lastColon );
+ System.err.println( "*** WARNING: no line number found in
'" + fileName + "', setting to 0." );
+ lineNumberInt = new Integer( 0 );
+ }
+
// Get the messages for the file
Map fileMessages = (Map) files.get( fileName );
@@ -275,13 +288,13 @@
}
// Get the messages for the line
- Set lineMessages = (Set) fileMessages.get( new Integer(
lineNumber ) );
+ Set lineMessages = (Set) fileMessages.get( lineNumberInt );
if ( lineMessages == null )
{
lineMessages = SetUtils.orderedSet( new TreeSet() );
- fileMessages.put( new Integer( lineNumber ), lineMessages
);
+ fileMessages.put( lineNumberInt, lineMessages );
}
// Put the message into the line messages set
Modified: maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml?rev=355937&r1=355936&r2=355937&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml Sat Dec 10 23:40:17
2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.8-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix"
issue="MPJAVADOC-61">StringIndexOutOfBoundsException on parsing the
files.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-59">Files
package.html and overview.html are not copied when source modifications are
used.</action>
<action dev="carlos" type="add" issue="MPJAVADOC-58">Added
maven.javadoc.failonerror property.</action>
<action dev="aheritier" type="add" issue="MPJAVADOC-54" due-to="Dag
Sverre Seljebotn">Added maven.javadoc.header and maven.javadoc.footer
properties.</action>
