Author: bentmann Date: Fri Apr 10 08:57:55 2009 New Revision: 763889 URL: http://svn.apache.org/viewvc?rev=763889&view=rev Log: o Restored Java 1.4 compat
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java?rev=763889&r1=763888&r2=763889&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java Fri Apr 10 08:57:55 2009 @@ -347,7 +347,7 @@ } catch ( XmlPullParserException e ) { - throw new IOException( "Error parsing document descriptor", e ); + throw (IOException) new IOException( "Error parsing document descriptor" ).initCause( e ); } finally { Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java?rev=763889&r1=763888&r2=763889&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java Fri Apr 10 08:57:55 2009 @@ -42,7 +42,7 @@ throws ParseException { String image = line.substring( 1, line.lastIndexOf( "!" ) ); - if ( image.contains( "|" ) ) + if ( image.indexOf( "|" ) >= 0 ) { // DOXIA-303: handle figure attributes image = image.substring( 0, image.indexOf( "|" ) );