Images.java && Links.java (bug fix) : regex modified to properly parse the respective mark-up when the marked-uped a a

whole runs into more than one line. Before this modification the "marked-uped" lines which ran into two (or more) 
different lines were not properly parsed, by these parsers, and thus was not properly converted. With this fix, things 
_seem_ to work good.

1 files changed, 16 insertions, 3 deletions

diff --git a/parsers/Links.java b/parsers/Links.java
index caa258d..87e4109 100644
--- a/parsers/Links.java
+++ b/parsers/Links.java
@@ -3,13 +3,26 @@ package scruf.parsers;
 import java.util.regex.*;
 
 public class Links implements Parser {
+    // set of strings to build the html link
+    private String openTag = "<a href=\"$1\" target=\"_blank\">";
+    private String closeTag = "</a>";
     public String parse(String fileContent) {
-	Pattern pattern = Pattern.compile("\\[\\[(.+?)\\|(.+?)\\]\\]");
+	Pattern pattern = Pattern.compile("\\[\\[(.+?)(\\|(.+?))\\]\\]", Pattern.DOTALL);
 	Matcher matcher = pattern.matcher(fileContent);
 	StringBuffer sbuffer = new StringBuffer();
-	String replacementString = "<a href=\"$1\" target=\"_blank\">$2</a>";
+	StringBuilder replacementString = new StringBuilder();
 	while(matcher.find()) {
-	    matcher.appendReplacement(sbuffer,replacementString);
+	    // delete text already there.
+	    replacementString.delete(0,replacementString.length());
+	    // start the <a> tag.
+	    replacementString.append(openTag);
+	    // add link name, if given
+	    if(matcher.group(3)!=null) {
+		replacementString.append(matcher.group(3));
+	    }
+	    // close the <a> tag
+	    replacementString.append(closeTag);
+	    matcher.appendReplacement(sbuffer,replacementString.toString());
 	}
 	matcher.appendTail(sbuffer);
 	return sbuffer.toString();