Updated Branches: refs/heads/wicket-1.5.x bbfaa564d -> d9c48eb7a
WICKET-4477 SmartLinkLabel escape minus in pattern Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d9c48eb7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d9c48eb7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d9c48eb7 Branch: refs/heads/wicket-1.5.x Commit: d9c48eb7a66fe9d180b7d34324326fcee75b84ba Parents: bbfaa56 Author: Sven Meier <[email protected]> Authored: Tue Mar 27 12:24:53 2012 +0200 Committer: Sven Meier <[email protected]> Committed: Tue Mar 27 12:24:53 2012 +0200 ---------------------------------------------------------------------- .../markup/html/basic/DefaultLinkParser.java | 2 +- .../markup/html/basic/DefaultLinkParserTest.java | 17 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d9c48eb7/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java index 54705e4..515bba9 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java @@ -29,7 +29,7 @@ import org.apache.wicket.util.string.AppendingStringBuffer; public class DefaultLinkParser extends LinkParser { /** Email address pattern */ - private static final String emailPattern = "[\\w\\.-\\\\+]+@[\\w\\.-]+"; + private static final String emailPattern = "[\\w\\.\\-\\\\+]+@[\\w\\.\\-]+"; /** URL pattern */ private static final String urlPattern = "([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?&=%]*"; http://git-wip-us.apache.org/repos/asf/wicket/blob/d9c48eb7/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java index 992509b..8968097 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java @@ -76,7 +76,7 @@ public class DefaultLinkParserTest extends Assert } /** - * testEmailWithPlusChar() + * WICKET-3174 */ @Test public void testEmailWithPlusChar() @@ -89,4 +89,19 @@ public class DefaultLinkParserTest extends Assert assertEquals("Expected chars to left of + to be included in the link.", testExpectedLink, result); } + + /** + * WICKET-4477 + */ + @Test + public void testEmailWithMinusChar() + { + final String testEmailAddress = "[email protected]"; + final String testExpectedLink = "<a href=\"mailto:[email protected]\";>[email protected]</a>"; + + ILinkParser parser = new DefaultLinkParser(); + final String result = parser.parse(testEmailAddress); + assertEquals("Expected chars to left of - to be included in the link.", testExpectedLink, + result); + } }
