jdk-sandbox: comparison jdk/src/share/classes/java/nio/file/FileSystems.java

equal deleted inserted replaced

-:d31b7cc371ef
+:77d9c0f1c19f
 * by invoking it with a reference to the system-default provider.
 * The second provider class is instantiated by invoking it with a reference
 * to the first provider instance. The third provider class is instantiated
 * by invoking it with a reference to the second instance, and so on. The
 * last provider to be instantiated becomes the default provider; its {@code
-* getFileSystem} method is invoked with the URI {@code "file:///"} to create
+* getFileSystem} method is invoked with the URI {@code "file:///"} to
-* the default file system.
+* get a reference to the default file system.
 *
 * <p> Subsequent invocations of this method return the file system that was
 * returned by the first invocation.
 *
 * @return  the default file system
 *
 * <p> <b>Usage Example:</b>
 * Suppose there is a provider identified by the scheme {@code "memory"}
 * installed:
 * <pre>
-*   Map&lt;String,String&gt; env = new HashMap&lt;String,String&gt;();
+*   Map&lt;String,String&gt; env = new HashMap&lt;&gt;();
 *   env.put("capacity", "16G");
 *   env.put("blockSize", "4k");
 *   FileSystem fs = FileSystems.newFileSystem(URI.create("memory:///?name=logfs"), env);
 * </pre>
 *
 * Constructs a new {@code FileSystem} to access the contents of a file as a
 * file system.
 *
 * <p> This method makes use of specialized providers that create pseudo file
 * systems where the contents of one or more files is treated as a file
-* system. The {@code file} parameter is a reference to an existing file
+* system.
-* and the {@code env} parameter is a map of provider specific properties to
-* configure the file system.
 *
 * <p> This method iterates over the {@link FileSystemProvider#installedProviders()
 * installed} providers. It invokes, in turn, each provider's {@link
-* FileSystemProvider#newFileSystem(FileRef,Map) newFileSystem(FileRef,Map)} method.
+* FileSystemProvider#newFileSystem(Path,Map) newFileSystem(Path,Map)} method
-* If a provider returns a file system then the iteration terminates
+* with an empty map. If a provider returns a file system then the iteration
-* and the file system is returned. If none of the installed providers return
+* terminates and the file system is returned. If none of the installed
-* a {@code FileSystem} then an attempt is made to locate the provider using
+* providers return a {@code FileSystem} then an attempt is made to locate
-* the given class loader. If a provider returns a file system then the lookup
+* the provider using the given class loader. If a provider returns a file
-* terminates and the file system is returned.
+* system then the lookup terminates and the file system is returned.
 *
-* @param   file
+* @param   path
-*          a reference to a file
+*          the path to the file
-* @param   env
-*          a map of provider specific properties to configure the file system;
-*          may be empty
 * @param   loader
 *          the class loader to locate the provider or {@code null} to only
 *          attempt to locate an installed provider
 *
 * @return  a new file system
 *
-* @throws  IllegalArgumentException
-*          if the {@code env} parameter does not contain properties required
-*          by the provider, or a property value is invalid
 * @throws  ProviderNotFoundException
 *          if a provider supporting this file type cannot be located
 * @throws  ServiceConfigurationError
 *          when an error occurs while loading a service provider
 * @throws  IOException
 *          if an I/O error occurs
 * @throws  SecurityException
 *          if a security manager is installed and it denies an unspecified
 *          permission
 */
-public static FileSystem newFileSystem(FileRef file,
+public static FileSystem newFileSystem(Path path,
-Map<String,?> env,
 ClassLoader loader)
 throws IOException
 {
-if (file == null)
+if (path == null)
 throw new NullPointerException();
+Map<String,?> env = Collections.emptyMap();
 // check installed providers
 for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
 try {
-return provider.newFileSystem(file, env);
+return provider.newFileSystem(path, env);
 } catch (UnsupportedOperationException uoe) {
 }
 }
 // if not found, use service-provider loading facility
 if (loader != null) {
 ServiceLoader<FileSystemProvider> sl = ServiceLoader
 .load(FileSystemProvider.class, loader);
 for (FileSystemProvider provider: sl) {
 try {
-return provider.newFileSystem(file, env);
+return provider.newFileSystem(path, env);
 } catch (UnsupportedOperationException uoe) {
 }
 }
 }

changeset 8158	77d9c0f1c19f
parent 5506	202f599c92aa
child 9035	1255eb81cc2f