You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/08/26 18:26:24 UTC
[commons-vfs] branch master updated: Replaced VFS.getManager()
calls to more local FileSystemManager access. (#69)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 9b5c04d Replaced VFS.getManager() calls to more local FileSystemManager access. (#69)
9b5c04d is described below
commit 9b5c04db14c0b73110d7b41a24714bd81c558405
Author: Michiel Hendriks <el...@users.noreply.github.com>
AuthorDate: Mon Aug 26 20:26:19 2019 +0200
Replaced VFS.getManager() calls to more local FileSystemManager access. (#69)
@elmuerte,
For the follow up, you can give yourself credit in the changes.xml file ;-)
---
.../main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java | 2 +-
.../java/org/apache/commons/vfs2/provider/CompositeFileProvider.java | 2 +-
.../java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java | 2 +-
.../java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java | 2 +-
.../java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java | 2 +-
.../org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index bad8896..8459431 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -1393,7 +1393,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
@Override
public URL run() throws MalformedURLException, FileSystemException {
final StringBuilder buf = new StringBuilder();
- final String scheme = UriParser.extractScheme(VFS.getManager().getSchemes(), fileName.getURI(), buf);
+ final String scheme = UriParser.extractScheme(fileSystem.getContext().getFileSystemManager().getSchemes(), fileName.getURI(), buf);
return new URL(scheme, "", -1, buf.toString(),
new DefaultURLStreamHandler(fileSystem.getContext(), fileSystem.getFileSystemOptions()));
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
index 90c8d8e..8ac81d5 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
@@ -53,7 +53,7 @@ public abstract class CompositeFileProvider extends AbstractFileProvider {
throws FileSystemException {
final StringBuilder buf = new StringBuilder(INITIAL_BUFSZ);
- UriParser.extractScheme(VFS.getManager().getSchemes(), uri, buf);
+ UriParser.extractScheme(getContext().getFileSystemManager().getSchemes(), uri, buf);
final String[] schemes = getSchemes();
for (final String scheme : schemes) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
index 6423de1..a352b80 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
@@ -67,7 +67,7 @@ public class DefaultURLStreamHandler extends URLStreamHandler {
final String url = newURL.getName().getURI();
final StringBuilder filePart = new StringBuilder();
- final String protocolPart = UriParser.extractScheme(VFS.getManager().getSchemes(), url, filePart);
+ final String protocolPart = UriParser.extractScheme(context.getFileSystemManager().getSchemes(), url, filePart);
setURL(u, protocolPart, "", -1, null, null, filePart.toString(), null, null);
} catch (final FileSystemException fse) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
index 7f11d57..57c286f 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
@@ -65,7 +65,7 @@ public class LayeredFileNameParser extends AbstractFileNameParser {
final StringBuilder name = new StringBuilder();
// Extract the scheme
- final String scheme = UriParser.extractScheme(VFS.getManager().getSchemes(), fileName, name);
+ final String scheme = UriParser.extractScheme(context.getFileSystemManager().getSchemes(), fileName, name);
// Extract the Layered file URI
final String rootUriName = extractRootName(name);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
index 86f8cfd..0534c69 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
@@ -59,7 +59,7 @@ public class ResourceFileProvider extends AbstractFileProvider {
public FileObject findFile(final FileObject baseFile, final String uri, final FileSystemOptions fileSystemOptions)
throws FileSystemException {
final StringBuilder buf = new StringBuilder(BUFFER_SIZE);
- UriParser.extractScheme(VFS.getManager().getSchemes(), uri, buf);
+ UriParser.extractScheme(getContext().getFileSystemManager().getSchemes(), uri, buf);
final String resourceName = buf.toString();
ClassLoader classLoader = ResourceFileSystemConfigBuilder.getInstance().getClassLoader(fileSystemOptions);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
index dbdc626..f9c7952 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
@@ -83,7 +83,7 @@ public class TemporaryFileProvider extends AbstractFileProvider implements Compa
final FileSystemOptions properties) throws FileSystemException {
// Parse the name
final StringBuilder buffer = new StringBuilder(uri);
- final String scheme = UriParser.extractScheme(VFS.getManager().getSchemes(), uri, buffer);
+ final String scheme = UriParser.extractScheme(getContext().getFileSystemManager().getSchemes(), uri, buffer);
UriParser.fixSeparators(buffer);
UriParser.normalisePath(buffer);
final String path = buffer.toString();