ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r395304 - in /ant/core/trunk/src/main/org/apache/tools/ant: launch/Launcher.java launch/Locator.java taskdefs/ManifestClassPath.java util/FileUtils.java
Date Wed, 19 Apr 2006 16:31:34 GMT
Author: peterreilly
Date: Wed Apr 19 09:31:30 2006
New Revision: 395304

URL: http://svn.apache.org/viewcvs?rev=395304&view=rev
Log:
change name of Locator.encodeUri to Locator.encodeURI


Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
    ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
    ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java?rev=395304&r1=395303&r2=395304&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java Wed Apr 19 09:31:30
2006
@@ -131,7 +131,7 @@
             }
 
             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());
             }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java?rev=395304&r1=395303&r2=395304&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java Wed Apr 19 09:31:30 2006
@@ -253,7 +253,7 @@
      * @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 @@
                          * 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 @@
         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());
             }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java?rev=395304&r1=395303&r2=395304&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java Wed Apr 19
09:31:30 2006
@@ -129,7 +129,7 @@
                 relPath = relPath + '/';
             }
             try {
-                relPath = Locator.encodeUri(relPath);
+                relPath = Locator.encodeURI(relPath);
             } catch (UnsupportedEncodingException exc) {
                 throw new BuildException(exc);
             }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java?rev=395304&r1=395303&r2=395304&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java Wed Apr 19 09:31:30 2006
@@ -1073,7 +1073,7 @@
         }
         path = path.replace('\\', '/');
         try {
-            sb.append(Locator.encodeUri(path));
+            sb.append(Locator.encodeURI(path));
         } catch (UnsupportedEncodingException exc) {
             throw new BuildException(exc);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message