svn commit: r739856 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java

[ivaynberg]

Author: ivaynberg
Date: Sun Feb  1 21:57:24 2009
New Revision: 739856

URL: http://svn.apache.org/viewvc?rev=739856&view=rev
Log:
WICKET-2067

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java?rev=739856&r1=739855&r2=739856&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java
 Sun Feb  1 21:57:24 2009
@@ -32,10 +32,11 @@
        private static final String emailPattern = "[\\w\\....@[\\w\\.-]+";
 
        /** URL pattern */
-       private static final String urlPattern = 
"([a-zA-Z]+://[\\w\\.\\-\\:\\/]+)[\\w\\.:\\-/?&=%]*";
+       private static final String urlPattern = 
"([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?&=%]*";
 
        /**
-        * Email address render strategy.<br/> Renders &lt;a 
href="mailto:{EMAIL}"&gt;{EMAIL}&lt;/a&gt;
+        * Email address render strategy.<br/>
+        * Renders &lt;a href="mailto:{EMAIL}"&gt;{EMAIL}&lt;/a&gt;
         */
        public static final ILinkRenderStrategy EMAIL_RENDER_STRATEGY = new 
ILinkRenderStrategy()
        {
@@ -73,17 +74,18 @@
        };
 
        /**
-        * Url render strategy.<br/> Renders &lt;a 
href="{URL}"&gt;{URL}&lt;/a&gt;
+        * Url render strategy.<br/>
+        * Renders &lt;a href="{URL}"&gt;{URL}&lt;/a&gt;
         */
        public static final ILinkRenderStrategy URL_RENDER_STRATEGY = new 
ILinkRenderStrategy()
        {
                public String buildLink(String linkTarget)
                {
                        return "<a href=\"" +
-                                       linkTarget +
-                                       "\">" +
-                                       (linkTarget.indexOf('?') == -1 ? 
linkTarget : linkTarget.substring(0,
-                                                       
linkTarget.indexOf('?'))) + "</a>";
+                               linkTarget +
+                               "\">" +
+                               (linkTarget.indexOf('?') == -1 ? linkTarget : 
linkTarget.substring(0,
+                                       linkTarget.indexOf('?'))) + "</a>";
                }
        };