Author: imario
Date: Mon Jun 20 12:50:28 2005
New Revision: 191547
URL: http://svn.apache.org/viewcvs?rev=191547&view=rev
Log:
no need to pass the root-uri around, so removed it
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileSystemManager.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileProvider.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/HostFileNameParser.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileNameParser.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/GenericFileNameParser.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileNameParser.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileNameParser.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileSystemManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileSystemManager.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileSystemManager.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileSystemManager.java
Mon Jun 20 12:50:28 2005
@@ -606,7 +606,7 @@
// todo: avoid fallback to this point
// this happens if we have a virtual filesystem (no provider for
scheme)
- return ((AbstractFileName) base).createName(null, resolvedPath);
+ return ((AbstractFileName) base).createName(resolvedPath);
}
public FileName resolveURI(String uri) throws FileSystemException
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java
Mon Jun 20 12:50:28 2005
@@ -26,14 +26,14 @@
*/
public class VirtualFileName extends AbstractFileName
{
- public VirtualFileName(final String rootUri, final String scheme, final
String absPath)
+ public VirtualFileName(final String scheme, final String absPath)
{
- super(rootUri, scheme, absPath);
+ super(scheme, absPath);
}
- public FileName createName(String rootURI, String absPath)
+ public FileName createName(String absPath)
{
- return new VirtualFileName(rootURI, getScheme(), absPath);
+ return new VirtualFileName(getScheme(), absPath);
}
protected void appendRootUri(StringBuffer buffer)
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileProvider.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileProvider.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileProvider.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileProvider.java
Mon Jun 20 12:50:28 2005
@@ -52,7 +52,7 @@
public FileObject createFileSystem(final String rootUri) throws
FileSystemException
{
final FileName rootName =
- new VirtualFileName(null, rootUri, FileName.ROOT_PATH);
+ new VirtualFileName(rootUri, FileName.ROOT_PATH);
// final FileName rootName =
// new BasicFileName(rootUri, FileName.ROOT_PATH);
final VirtualFileSystem fs = new VirtualFileSystem(rootName, null);
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java
Mon Jun 20 12:50:28 2005
@@ -34,16 +34,14 @@
// Cached stuff
private String uri;
private String baseName;
- // will be set by BasicFileName too
- protected String rootUri;
+ private String rootUri;
private String extension;
private String decodedAbsPath;
- public AbstractFileName(final String rootUri,
- final String scheme,
+ public AbstractFileName(final String scheme,
final String absPath)
{
- this.rootUri = rootUri;
+ this.rootUri = null;
this.scheme = scheme;
if (absPath != null && absPath.length() > 0)
{
@@ -109,7 +107,7 @@
/**
* Factory method for creating name instances.
*/
- public abstract FileName createName(String rootURI, String absPath);
+ public abstract FileName createName(String absPath);
/**
* Builds the root URI for this file name. Note that the root URI must not
@@ -178,7 +176,7 @@
{
parentPath = getPath().substring(0, idx);
}
- return createName(getRootURI(), parentPath);
+ return createName(parentPath);
}
/**
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java
Mon Jun 20 12:50:28 2005
@@ -35,8 +35,7 @@
private static final char[] USERNAME_RESERVED = {':', '@'};
private static final char[] PASSWORD_RESERVED = {'@'};
- protected GenericFileName(final String rootUri,
- final String scheme,
+ protected GenericFileName(final String scheme,
final String hostName,
final int port,
final int defaultPort,
@@ -44,7 +43,7 @@
final String password,
final String path)
{
- super(rootUri, scheme, path);
+ super(scheme, path);
this.hostName = hostName;
this.defaultPort = defaultPort;
this.password = password;
@@ -99,9 +98,9 @@
return defaultPort;
}
- public FileName createName(String rootURI, String absPath)
+ public FileName createName(String absPath)
{
- return new GenericFileName(rootURI,
+ return new GenericFileName(
getScheme(),
hostName,
port,
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/HostFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/HostFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/HostFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/HostFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -58,7 +58,6 @@
final String path = normalizePath(name);
return new GenericFileName(
- base!=null?base.getRootURI():null,
auth.scheme,
auth.hostName,
auth.port,
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java
Mon Jun 20 12:50:28 2005
@@ -31,7 +31,7 @@
final FileName outerUri,
final String path)
{
- super(null, scheme, path);
+ super(scheme, path);
this.outerUri = outerUri;
}
@@ -43,7 +43,7 @@
return outerUri;
}
- public FileName createName(String rootURI, String path)
+ public FileName createName(String path)
{
return new LayeredFileName(getScheme(), getOuterName(), path);
}
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java
Mon Jun 20 12:50:28 2005
@@ -9,8 +9,7 @@
{
private final String queryString;
- public URLFileName(final String rootUri,
- final String scheme,
+ public URLFileName(final String scheme,
final String hostName,
final int port,
final int defaultPort,
@@ -19,7 +18,7 @@
final String path,
final String queryString)
{
- super(rootUri, scheme, hostName, port, defaultPort, userName,
password, path);
+ super(scheme, hostName, port, defaultPort, userName, password, path);
this.queryString = queryString;
}
@@ -78,10 +77,9 @@
return sb.toString();
}
- public FileName createName(final String rootURI, final String absPath)
+ public FileName createName(final String absPath)
{
- return new URLFileName(getRootURI(),
- getScheme(),
+ return new URLFileName(getScheme(),
getHostName(),
getPort(),
getDefaultPort(),
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -52,7 +52,6 @@
final String path = normalizePath(name);
return new URLFileName(
- base!=null?base.getRootURI():null,
auth.scheme,
auth.hostName,
auth.port,
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/GenericFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/GenericFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/GenericFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/GenericFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -62,8 +62,8 @@
* here the rootFilename can only be "/" (see above) put this "/" is also
in the pathname
* so its of no value for the LocalFileName instance
*/
- protected FileName createFileName(String rootURI, String scheme, final
String rootFile, final String path)
+ protected FileName createFileName(String scheme, final String rootFile,
final String path)
{
- return new LocalFileName(rootURI, scheme, "", path);
+ return new LocalFileName(scheme, "", path);
}
}
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java
Mon Jun 20 12:50:28 2005
@@ -28,12 +28,11 @@
{
private final String rootFile;
- protected LocalFileName(final String rootUri,
- final String scheme,
+ protected LocalFileName(final String scheme,
final String rootFile,
final String path)
{
- super(rootUri, scheme, path);
+ super(scheme, path);
this.rootFile = rootFile;
}
@@ -48,9 +47,9 @@
/**
* Factory method for creating name instances.
*/
- public FileName createName(final String rootURI, final String path)
+ public FileName createName(final String path)
{
- return new LocalFileName(rootURI, getScheme(), rootFile, path);
+ return new LocalFileName(getScheme(), rootFile, path);
}
/**
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -79,11 +79,10 @@
final String path = name.toString();
return createFileName(
- base!=null?base.getRootURI():null,
scheme,
rootFile,
path);
}
- protected abstract FileName createFileName(String rootURI, String scheme,
final String rootFile, final String path);
+ protected abstract FileName createFileName(String scheme, final String
rootFile, final String path);
}
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -37,9 +37,9 @@
return extractWindowsRootPrefix(uri, name);
}
- protected FileName createFileName(String rootURI, String scheme, final
String rootFile, final String path)
+ protected FileName createFileName(String scheme, final String rootFile,
final String path)
{
- return new LocalFileName(rootURI, scheme, rootFile, path);
+ return new LocalFileName(scheme, rootFile, path);
}
/**
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java
Mon Jun 20 12:50:28 2005
@@ -32,7 +32,6 @@
private final String share;
protected SmbFileName(
- final String rootUri,
final String scheme,
final String hostName,
final int port,
@@ -41,7 +40,7 @@
final String share,
final String path)
{
- super(rootUri, scheme, hostName, port, DEFAULT_PORT, userName,
password, path);
+ super(scheme, hostName, port, DEFAULT_PORT, userName, password, path);
this.share = share;
}
@@ -66,9 +65,9 @@
/**
* Factory method for creating name instances.
*/
- public FileName createName(final String rootURI, final String path)
+ public FileName createName(final String path)
{
- return new SmbFileName(getRootURI(),
+ return new SmbFileName(
getScheme(),
getHostName(),
getPort(),
Modified:
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java?rev=191547&r1=191546&r2=191547&view=diff
==============================================================================
---
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
(original)
+++
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
Mon Jun 20 12:50:28 2005
@@ -63,7 +63,6 @@
final String path = name.toString();
return new SmbFileName(
- base!=null?base.getRootURI():null,
auth.scheme,
auth.hostName,
auth.port,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
