svn commit: r1409634 - in /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider: FileNameParser.java local/LocalFileNameParser.java url/UrlFileNameParser.java

[ggregory]

Author: ggregory
Date: Thu Nov 15 01:42:48 2012
New Revision: 1409634

URL: http://svn.apache.org/viewvc?rev=1409634&view=rev
Log:
Rename the parameter name in parseUri() to 'uri' from 'rename'.

Modified:
    
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileNameParser.java
    
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
    
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java

Modified: 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileNameParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileNameParser.java?rev=1409634&r1=1409633&r2=1409634&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileNameParser.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileNameParser.java
 Thu Nov 15 01:42:48 2012
@@ -35,10 +35,10 @@ public interface FileNameParser
      * parses a String into a filename.
      * @param context The component context.
      * @param base The base FileName.
-     * @param filename The target file name.
+     * @param uri The target file name.
      * @return A FileName that represents the taret file.
      * @throws FileSystemException if an error occurs parsing the URI.
      */
-    FileName parseUri(final VfsComponentContext context, final FileName base, 
final String filename)
+    FileName parseUri(final VfsComponentContext context, final FileName base, 
final String uri)
             throws FileSystemException;
 }

Modified: 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java?rev=1409634&r1=1409633&r2=1409634&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
 Thu Nov 15 01:42:48 2012
@@ -58,13 +58,13 @@ public abstract class LocalFileNameParse
 
 
     @Override
-    public FileName parseUri(final VfsComponentContext context, FileName base, 
final String filename)
+    public FileName parseUri(final VfsComponentContext context, FileName base, 
final String uri)
         throws FileSystemException
     {
         final StringBuilder name = new StringBuilder();
 
         // Extract the scheme
-        String scheme = UriParser.extractScheme(filename, name);
+        String scheme = UriParser.extractScheme(uri, name);
         if (scheme == null)
         {
             scheme = "file";
@@ -76,7 +76,7 @@ public abstract class LocalFileNameParse
         UriParser.fixSeparators(name);
 
         // Extract the root prefix
-        final String rootFile = extractRootPrefix(filename, name);
+        final String rootFile = extractRootPrefix(uri, name);
 
         // Normalise the path
         FileType fileType = UriParser.normalisePath(name);

Modified: 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java?rev=1409634&r1=1409633&r2=1409634&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
 Thu Nov 15 01:42:48 2012
@@ -48,20 +48,20 @@ public class UrlFileNameParser extends A
    * Parse a URI.
    * @param context The component context.
    * @param base The base FileName.
-   * @param filename The target file name.
+   * @param uri The target file name.
    * @return The FileName.
    * @throws FileSystemException if an error occurs
    */
     @Override
-    public FileName parseUri(final VfsComponentContext context, final FileName 
base, final String filename)
+    public FileName parseUri(final VfsComponentContext context, final FileName 
base, final String uri)
         throws FileSystemException
     {
-        if (isUrlBased(base, filename))
+        if (isUrlBased(base, uri))
         {
-            return url.parseUri(context, base, filename);
+            return url.parseUri(context, base, uri);
         }
 
-        return generic.parseUri(context, base, filename);
+        return generic.parseUri(context, base, uri);
     }
 
     /**