Author: rfscholte
Date: Fri Mar 29 20:50:10 2013
New Revision: 1462638
URL: http://svn.apache.org/r1462638
Log:
[DOXIA-399] Links with '_' and '-' don't work
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/link.confluence
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.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/ConfluenceParser.java?rev=1462638&r1=1462637&r2=1462638&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
Fri Mar 29 20:50:10 2013
@@ -76,10 +76,8 @@ public class ConfluenceParser
{
//boolean accepted = false;
- for ( int i = 0; i < parsers.length; i++ )
+ for ( BlockParser parser : parsers )
{
- BlockParser parser = parsers[i];
-
if ( line.trim().length() == 0 )
{
continue;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.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/ChildBlocksBuilder.java?rev=1462638&r1=1462637&r2=1462638&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
Fri Mar 29 20:50:10 2013
@@ -95,6 +95,10 @@ public class ChildBlocksBuilder
specialBlocks = getList( new ItalicBlock( getChildren(
text, specialBlocks ) ), specialBlocks );
text = new StringBuilder();
}
+ else if ( insideLink )
+ {
+ text.append( '_' );
+ }
else
{
text = addTextBlockIfNecessary( blocks, specialBlocks,
text );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java?rev=1462638&r1=1462637&r2=1462638&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
Fri Mar 29 20:50:10 2013
@@ -274,10 +274,11 @@ public class ConfluenceParserTest
assertContainsLines( result, "begin:link, name: #simple\ntext:
simple\nend:link" );
assertContainsLines( result, "begin:link, name: resource.pdf\ntext:
resource.pdf\nend:link" );
assertContainsLines( result, "begin:link, name: resource.pdf\ntext:
alias pdf\nend:link" );
+ assertContainsLines( result, "begin:link, name:
http://link.to/page_with_underscore-and-dash\ntext: underscore_-dash\nend:link"
);
// 5 paragraphs in the input...
- assertEquals( 5, result.split( "end:paragraph\n" ).length );
+ assertEquals( 6, result.split( "end:paragraph\n" ).length );
// 8 links in the input...
- assertEquals( 8, result.split( "end:link\n" ).length );
+ assertEquals( 9, result.split( "end:link\n" ).length );
}
/** @throws Exception */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/link.confluence
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/link.confluence?rev=1462638&r1=1462637&r2=1462638&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/link.confluence
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/link.confluence
Fri Mar 29 20:50:10 2013
@@ -1,7 +1,9 @@
-Line with [middle] link
-
-Line with link at the [end]
-
-Line with [link#anchor] and [#simple] anchor and [alias|link]
-
-Line with [^resource.pdf] file and with [alias pdf|^resource.pdf]
+Line with [middle] link
+
+Line with link at the [end]
+
+Line with [link#anchor] and [#simple] anchor and [alias|link]
+
+Line with [^resource.pdf] file and with [alias pdf|^resource.pdf]
+
+Line with [underscore_-dash|http://link.to/page_with_underscore-and-dash]
