change name of Locator.encodeUri to Locator.encodeURI

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@395304 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/launch/Launcher.java

@@ -131,7 +131,7 @@ public class Launcher {
             }
 
             try {
-                libPathURLs.add(new URL(Locator.encodeUri(element.toURL().toString())));
+                libPathURLs.add(new URL(Locator.encodeURI(element.toURL().toString())));
             } catch (UnsupportedEncodingException ex) {
                 throw new MalformedURLException(ex.toString());
             }

src/main/org/apache/tools/ant/launch/Locator.java

@@ -253,7 +253,7 @@ public final class Locator {
      * @throws UnsupportedEncodingException if UTF-8 is not available
      * @since Ant 1.7
      */
-    public static String encodeUri(String path) throws UnsupportedEncodingException {
+    public static String encodeURI(String path) throws UnsupportedEncodingException {
         int i = 0;
         int len = path.length();
         int ch = 0;
@@ -409,9 +409,9 @@ public final class Locator {
                          * FileUtils.toURI() cannot be used by Locator.java
                          * Implemented this way.
                          * File.toURL() adds file: and changes '\' to '/' for dos OSes
-                         * encodeUri converts characters like ' ' and '#' to %DD
+                         * encodeURI converts characters like ' ' and '#' to %DD
                          */
-                        urls[0] = new URL(encodeUri(location.toURL().toString()));
+                        urls[0] = new URL(encodeURI(location.toURL().toString()));
                     } catch (UnsupportedEncodingException ex) {
                         throw new MalformedURLException(ex.toString());
                     }
@@ -435,7 +435,7 @@ public final class Locator {
         for (int i = 0; i < matches.length; ++i) {
             try {
                 // See comments above.
-                urls[i] = new URL(encodeUri(matches[i].toURL().toString()));
+                urls[i] = new URL(encodeURI(matches[i].toURL().toString()));
             } catch (UnsupportedEncodingException ex) {
                 throw new MalformedURLException(ex.toString());
             }

src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java

@@ -129,7 +129,7 @@ public class ManifestClassPath
                 relPath = relPath + '/';
             }
             try {
-                relPath = Locator.encodeUri(relPath);
+                relPath = Locator.encodeURI(relPath);
             } catch (UnsupportedEncodingException exc) {
                 throw new BuildException(exc);
             }

src/main/org/apache/tools/ant/util/FileUtils.java

@@ -1073,7 +1073,7 @@ public class FileUtils {
         }
         path = path.replace('\\', '/');
         try {
-            sb.append(Locator.encodeUri(path));
+            sb.append(Locator.encodeURI(path));
         } catch (UnsupportedEncodingException exc) {
             throw new BuildException(exc);
         }