From 47705d54f9003cd864ba0e3d1de09fd2ad72d4bc Mon Sep 17 00:00:00 2001 From: ltheussl Date: Sun, 11 Dec 2005 07:40:17 +0000 Subject: [PATCH] PR: MPJAVADOC-61 StringIndexOutOfBoundsException on parsing the files git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@355937 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/javadoc/JavadocWarningsTextToXml.java | 17 +++++++++++++++-- javadoc/xdocs/changes.xml | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java b/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java index 47e20ff3..4bc868a0 100644 --- a/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java +++ b/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java @@ -265,6 +265,19 @@ public class JavadocWarningsTextToXml 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 @@ public class JavadocWarningsTextToXml } // 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 diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml index 869bd436..47835f69 100644 --- a/javadoc/xdocs/changes.xml +++ b/javadoc/xdocs/changes.xml @@ -27,6 +27,7 @@ + StringIndexOutOfBoundsException on parsing the files. Files package.html and overview.html are not copied when source modifications are used. Added maven.javadoc.failonerror property. Added maven.javadoc.header and maven.javadoc.footer properties.