svn commit: r604690 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src: main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java

[ltheussl]

Author: ltheussl
Date: Sun Dec 16 12:16:27 2007
New Revision: 604690

URL: http://svn.apache.org/viewvc?rev=604690&view=rev
Log:
[DOXIA-127] Twiki module cannot parse two forced links in the same paragraph
Submitted by: Juan F. Codagnone, Christian Nardi

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java?rev=604690&r1=604689&r2=604690&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
 Sun Dec 16 12:16:27 2007
@@ -43,7 +43,7 @@
      * pattern to detect SpecificLinks links [[reference][text]]
      */
     private static final Pattern SPECIFICLINK_PATTERN =
-        Pattern.compile( "!?\\[\\[(.+)\\]\\[(.+)\\]\\]" );
+        Pattern.compile( "!?\\[\\[([^\\]]+)\\]\\[([^\\]]+)\\]\\]" );
     /**
      * pattern to detect ForcedLinks links [[reference asd]]
      */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java?rev=604690&r1=604689&r2=604690&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
 Sun Dec 16 12:16:27 2007
@@ -146,6 +146,19 @@
         blocks = (Block[]) textParser.
             parse( " foo [[http://reference.com][text]] bar " ).toArray( 
TOARRAY );
         assertTrue( Arrays.equals( expected, blocks ) );
+        
+        expected = new Block[]{
+                new LinkBlock( "http://www.apache.org/licenses/LICENSE-2.0";, 
+                        "Apache License, version 2.0" ),
+                new TextBlock( ". You can download it " ),
+                new WikiWordBlock( "DoxiaDownload", "here", resolver ),
+            };
+            blocks = (Block[]) textParser.
+                parse( "[[http://www.apache.org/licenses/LICENSE-2.0]"; 
+                        + "[Apache License, version 2.0]]. You can download it 
"
+                        + "[[DoxiaDownload][here]]" ).toArray( TOARRAY );
+            assertTrue( Arrays.equals( expected, blocks ) );
+         
     }
     
     /**