/hg/icedtea-web: 2 new changesets

[omajid at icedtea.classpath.org]

changeset fce39c02c702 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fce39c02c702
author: Omair Majid <omajid at redhat.com>
date: Wed Apr 02 15:48:00 2014 -0400

	Fix typo in email addresses


changeset aa4ee1301885 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=aa4ee1301885
author: Omair Majid <omajid at redhat.com>
date: Wed Apr 02 15:52:42 2014 -0400

	Rename a method in ClasspathMatcher

	2014-04-02  Omair Majid  <omajid at redhat.com>

	    * netx/net/sourceforge/jnlp/util/ClasspathMatcher.java
	    (quote): Rename to ..
	    (convertWildcardToRegEx): New method. Adjust all callers.


diffstat:

 ChangeLog                                            |  10 ++++++++--
 netx/net/sourceforge/jnlp/util/ClasspathMatcher.java |  13 +++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diffs (63 lines):

diff -r f2066fcc2550 -r aa4ee1301885 ChangeLog
--- a/ChangeLog	Wed Apr 02 11:58:46 2014 +0200
+++ b/ChangeLog	Wed Apr 02 15:52:42 2014 -0400
@@ -1,3 +1,9 @@
+2014-04-02  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/util/ClasspathMatcher.java
+	(quote): Rename to ..
+	(convertWildcardToRegEx): New method. Adjust all callers.
+
 2014-04-02  Jiri Vanek  <jvanek at redhat.com>
 
 	* NEWS: Added 1.6 section
@@ -1914,7 +1920,7 @@
 	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
 	centerDialog called in init rather than on windowOpened event
 
-2013-10-09  Omair Majid  <oamjid at redhat.com>
+2013-10-09  Omair Majid  <omajid at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
 	(computeKey): New method.
@@ -2189,7 +2195,7 @@
 	(testHttpFallsBackToManualSocksProxy): New method.
 	(testManualSameProxy): Remove test for socket protocol.
 
-2013-09-23  Omair Majid  <omajid at rehdat.com>
+2013-09-23  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
 	(BrowserAwareProxySelector): Rename to...
diff -r f2066fcc2550 -r aa4ee1301885 netx/net/sourceforge/jnlp/util/ClasspathMatcher.java
--- a/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java	Wed Apr 02 11:58:46 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java	Wed Apr 02 15:52:42 2014 -0400
@@ -152,7 +152,7 @@
                 //this is handling case, when *.abc.xy
                 //should match also abc.xy except whatever.abc.xz
                 //but NOT whatewerabc.xy
-                pre = "(" + quote(domain.substring(2)) + ")|(";
+                pre = "(" + convertWildcardToRegEx(domain.substring(2)) + ")|(";
                 post = ")";
             }
             return Pattern.compile(pre + ClasspathMatcher.sourceToRegExString(domain) + post);
@@ -320,17 +320,10 @@
         if (s.equals("*")) {
             return ".*";
         }
-        return quote(s);
+        return convertWildcardToRegEx(s);
     }
     
-    private static String quote(String s) {
-        /*
-         * coment for lazybones:
-         *  Pattern.quote - all characters in citation are threated as are without any special meaning
-         *   Citation is based on \Q and \E marks wwith escapped inner \Q and \E
-         * ^ is start of th e line
-         * $ is end of the line
-         */
+    private static String convertWildcardToRegEx(String s) {
         if (s.startsWith("*") && s.endsWith("*")) {
             return "^.*" + Pattern.quote(s.substring(1, s.length() - 1)) + ".*$";
         } else if (s.endsWith("*")) {