langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
author jlahoda
Mon, 06 Mar 2017 13:17:33 +0100
changeset 44063 5f0cf4126949
parent 44021 3ea5514d9fbe
child 44573 245bb4e6f983
permissions -rw-r--r--
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) Reviewed-by: jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
43267
81e70bde1b96 8165102: incorrect message from javac
jjg
parents: 42837
diff changeset
     2
 * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5007
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5007
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5007
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5007
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5007
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
34752
9c262a013456 8145342: Some copyright notices are inconsistently and ill formatted
vasya
parents: 29780
diff changeset
    25
731
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 171
diff changeset
    26
package com.sun.tools.javac.file;
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 171
diff changeset
    27
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    28
import java.io.Closeable;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    29
import java.io.File;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    30
import java.io.FileNotFoundException;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    31
import java.io.IOException;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
    32
import java.io.UncheckedIOException;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    33
import java.net.URI;
4937
2fc03fb01efa 6927061: Refactor apt implemenation to use code from JSR 269
darcy
parents: 4548
diff changeset
    34
import java.net.URL;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    35
import java.net.URLClassLoader;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    36
import java.nio.file.DirectoryIteratorException;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    37
import java.nio.file.DirectoryStream;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    38
import java.nio.file.FileSystem;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    39
import java.nio.file.FileSystemNotFoundException;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    40
import java.nio.file.FileSystems;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    41
import java.nio.file.Files;
41861
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
    42
import java.nio.file.InvalidPathException;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    43
import java.nio.file.Path;
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    44
import java.nio.file.Paths;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    45
import java.nio.file.ProviderNotFoundException;
43574
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
    46
import java.nio.file.spi.FileSystemProvider;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    47
import java.util.ArrayList;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    48
import java.util.Arrays;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    49
import java.util.Collection;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    50
import java.util.Collections;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    51
import java.util.EnumMap;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    52
import java.util.EnumSet;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
import java.util.HashMap;
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
import java.util.HashSet;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    55
import java.util.Iterator;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    56
import java.util.LinkedHashMap;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    57
import java.util.LinkedHashSet;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    58
import java.util.List;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    59
import java.util.Map;
29291
076c277565f7 8073550: java* tools: replace obj.getClass hacks with Assert.checkNonNull or Objects.requireNonNull
mcimadamore
parents: 29053
diff changeset
    60
import java.util.Objects;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    61
import java.util.NoSuchElementException;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
import java.util.Set;
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
    63
import java.util.function.Predicate;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    64
import java.util.regex.Matcher;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    65
import java.util.regex.Pattern;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
    66
import java.util.stream.Collectors;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    67
import java.util.stream.Stream;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    68
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    69
import javax.lang.model.SourceVersion;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    70
import javax.tools.JavaFileManager;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
import javax.tools.JavaFileManager.Location;
41861
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
    72
import javax.tools.JavaFileObject;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    73
import javax.tools.StandardJavaFileManager;
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
    74
import javax.tools.StandardJavaFileManager.PathFactory;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
    75
import javax.tools.StandardLocation;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
731
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 171
diff changeset
    77
import com.sun.tools.javac.code.Lint;
42837
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
    78
import com.sun.tools.javac.code.Lint.LintCategory;
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
    79
import com.sun.tools.javac.main.Option;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    80
import com.sun.tools.javac.resources.CompilerProperties.Errors;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    81
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
37848
3c8ff4204d2d 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36526
diff changeset
    82
import com.sun.tools.javac.util.DefinedBy;
3c8ff4204d2d 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36526
diff changeset
    83
import com.sun.tools.javac.util.DefinedBy.Api;
41440
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
    84
import com.sun.tools.javac.util.JDK9Wrappers;
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
    85
import com.sun.tools.javac.util.ListBuffer;
731
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 171
diff changeset
    86
import com.sun.tools.javac.util.Log;
41254
08f8dbf7741e 8152911: javac assertion error when compiling overlay sources
jlahoda
parents: 41155
diff changeset
    87
import com.sun.tools.javac.jvm.ModuleNameReader;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
    88
import com.sun.tools.javac.util.Pair;
22153
f9f06fcca59d 8029800: Flags.java uses String.toLowerCase without specifying Locale
jlahoda
parents: 14360
diff changeset
    89
import com.sun.tools.javac.util.StringUtils;
731
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 171
diff changeset
    90
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    91
import static javax.tools.StandardLocation.PLATFORM_CLASS_PATH;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
    93
import static com.sun.tools.javac.main.Option.BOOT_CLASS_PATH;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    94
import static com.sun.tools.javac.main.Option.DJAVA_ENDORSED_DIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    95
import static com.sun.tools.javac.main.Option.DJAVA_EXT_DIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    96
import static com.sun.tools.javac.main.Option.ENDORSEDDIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    97
import static com.sun.tools.javac.main.Option.EXTDIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    98
import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
    99
import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_APPEND;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   100
import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_PREPEND;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   101
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   102
/**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   103
 * This class converts command line arguments, environment variables and system properties (in
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   104
 * File.pathSeparator-separated String form) into a boot class path, user class path, and source
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   105
 * path (in {@code Collection<String>} form).
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
 *
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   107
 * <p>
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   108
 * <b>This is NOT part of any supported API. If you write code that depends on this, you do so at
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   109
 * your own risk. This code and its internal interfaces are subject to change or deletion without
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   110
 * notice.</b>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   111
 */
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   112
public class Locations {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   114
    /**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   115
     * The log to use for warning output
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   116
     */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
    private Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
   118
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   119
    /**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   120
     * Access to (possibly cached) file info
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   121
     */
1208
5072b0dd3d52 6743107: clean up use of static caches in file manager
jjg
parents: 735
diff changeset
   122
    private FSInfo fsInfo;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   123
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   124
    /**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   125
     * Whether to warn about non-existent path elements
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   126
     */
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   127
    private boolean warn;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   128
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   129
    private ModuleNameReader moduleNameReader;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   130
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   131
    private PathFactory pathFactory = Paths::get;
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   132
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   133
    static final Path javaHome = FileSystems.getDefault().getPath(System.getProperty("java.home"));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   134
    static final Path thisSystemModules = javaHome.resolve("lib").resolve("modules");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   135
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   136
    Map<Path, FileSystem> fileSystems = new LinkedHashMap<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   137
    List<Closeable> closeables = new ArrayList<>();
41155
93dad90c22c1 8156568: Update javac to support compiling against a modular JAR that is a multi-release JAR
sadayapalam
parents: 40762
diff changeset
   138
    private Map<String,String> fsEnv = Collections.emptyMap();
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   139
29780
8f8e54a1fa20 8076420: Consolidate javac file handling in javac.file package
jjg
parents: 29291
diff changeset
   140
    Locations() {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   141
        initHandlers();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   142
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   143
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   144
    Path getPath(String first, String... more) {
41861
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
   145
        try {
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
   146
            return pathFactory.getPath(first, more);
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
   147
        } catch (InvalidPathException ipe) {
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
   148
            throw new IllegalArgumentException(ipe);
8c58faf4f03b 8132562: javac fails with CLASSPATH with double-quotes as an environment variable
vromero
parents: 41637
diff changeset
   149
        }
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   150
    }
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   151
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   152
    public void close() throws IOException {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   153
        ListBuffer<IOException> list = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   154
        closeables.forEach(closeable -> {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   155
            try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   156
                closeable.close();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   157
            } catch (IOException ex) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   158
                list.add(ex);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   159
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   160
        });
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   161
        if (list.nonEmpty()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   162
            IOException ex = new IOException();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   163
            for (IOException e: list)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   164
                ex.addSuppressed(e);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   165
            throw ex;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   166
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   167
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   168
41637
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41440
diff changeset
   169
    void update(Log log, boolean warn, FSInfo fsInfo) {
10813
95b39a692cd0 7101146: Paths should more directly managed by BaseFileManager
jjg
parents: 8424
diff changeset
   170
        this.log = log;
41637
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41440
diff changeset
   171
        this.warn = warn;
10813
95b39a692cd0 7101146: Paths should more directly managed by BaseFileManager
jjg
parents: 8424
diff changeset
   172
        this.fsInfo = fsInfo;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   173
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   174
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   175
    void setPathFactory(PathFactory f) {
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   176
        pathFactory = f;
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   177
    }
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   178
29780
8f8e54a1fa20 8076420: Consolidate javac file handling in javac.file package
jjg
parents: 29291
diff changeset
   179
    boolean isDefaultBootClassPath() {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   180
        BootClassPathLocationHandler h
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   181
                = (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   182
        return h.isDefault();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   183
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   184
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   185
    /**
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   186
     * Split a search path into its elements. Empty path elements will be ignored.
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   187
     *
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   188
     * @param searchPath The search path to be split
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   189
     * @return The elements of the path
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   190
     */
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   191
    private Iterable<Path> getPathEntries(String searchPath) {
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   192
        return getPathEntries(searchPath, null);
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   193
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   194
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   195
    /**
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   196
     * Split a search path into its elements. If emptyPathDefault is not null, all empty elements in the
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   197
     * path, including empty elements at either end of the path, will be replaced with the value of
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   198
     * emptyPathDefault.
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   199
     *
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   200
     * @param searchPath The search path to be split
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   201
     * @param emptyPathDefault The value to substitute for empty path elements, or null, to ignore
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   202
     * empty path elements
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   203
     * @return The elements of the path
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   204
     */
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   205
    private Iterable<Path> getPathEntries(String searchPath, Path emptyPathDefault) {
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   206
        ListBuffer<Path> entries = new ListBuffer<>();
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   207
        for (String s: searchPath.split(Pattern.quote(File.pathSeparator), -1)) {
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   208
            if (s.isEmpty()) {
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   209
                if (emptyPathDefault != null) {
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   210
                    entries.add(emptyPathDefault);
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   211
                }
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   212
            } else {
42837
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   213
                try {
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   214
                    entries.add(getPath(s));
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   215
                } catch (IllegalArgumentException e) {
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   216
                    if (warn) {
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   217
                        log.warning(LintCategory.PATH, "invalid.path", s);
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   218
                    }
03ee805ba348 8169005: tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java fails after fix to JDK-8132562
vromero
parents: 42827
diff changeset
   219
                }
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   220
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   221
        }
1486
a7d1338ca96e 6759996: ignore empty entries on paths
jjg
parents: 1208
diff changeset
   222
        return entries;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   223
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   224
41155
93dad90c22c1 8156568: Update javac to support compiling against a modular JAR that is a multi-release JAR
sadayapalam
parents: 40762
diff changeset
   225
    public void setMultiReleaseValue(String multiReleaseValue) {
93dad90c22c1 8156568: Update javac to support compiling against a modular JAR that is a multi-release JAR
sadayapalam
parents: 40762
diff changeset
   226
        fsEnv = Collections.singletonMap("multi-release", multiReleaseValue);
93dad90c22c1 8156568: Update javac to support compiling against a modular JAR that is a multi-release JAR
sadayapalam
parents: 40762
diff changeset
   227
    }
93dad90c22c1 8156568: Update javac to support compiling against a modular JAR that is a multi-release JAR
sadayapalam
parents: 40762
diff changeset
   228
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   229
    /**
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   230
     * Utility class to help evaluate a path option. Duplicate entries are ignored, jar class paths
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   231
     * can be expanded.
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   232
     */
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   233
    private class SearchPath extends LinkedHashSet<Path> {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   234
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   235
        private static final long serialVersionUID = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   236
06bc494ca11e Initial load
duke
parents:
diff changeset
   237
        private boolean expandJarClassPaths = false;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   238
        private final Set<Path> canonicalValues = new HashSet<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   239
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   240
        public SearchPath expandJarClassPaths(boolean x) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   241
            expandJarClassPaths = x;
06bc494ca11e Initial load
duke
parents:
diff changeset
   242
            return this;
06bc494ca11e Initial load
duke
parents:
diff changeset
   243
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   244
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   245
        /**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   246
         * What to use when path element is the empty string
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   247
         */
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   248
        private Path emptyPathDefault = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   250
        public SearchPath emptyPathDefault(Path x) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   251
            emptyPathDefault = x;
06bc494ca11e Initial load
duke
parents:
diff changeset
   252
            return this;
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   254
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   255
        public SearchPath addDirectories(String dirs, boolean warn) {
8424
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   256
            boolean prev = expandJarClassPaths;
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   257
            expandJarClassPaths = true;
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   258
            try {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   259
                if (dirs != null) {
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   260
                    for (Path dir : getPathEntries(dirs)) {
8424
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   261
                        addDirectory(dir, warn);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   262
                    }
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   263
                }
8424
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   264
                return this;
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   265
            } finally {
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   266
                expandJarClassPaths = prev;
5e31b2eb5aa3 6485027: javac incorrectly handles relative paths in manifest classpath
jjg
parents: 8034
diff changeset
   267
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   270
        public SearchPath addDirectories(String dirs) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
            return addDirectories(dirs, warn);
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   274
        private void addDirectory(Path dir, boolean warn) {
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   275
            if (!Files.isDirectory(dir)) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   276
                if (warn) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   277
                    log.warning(Lint.LintCategory.PATH,
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   278
                            "dir.path.element.not.found", dir);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   279
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   283
            try (Stream<Path> s = Files.list(dir)) {
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42814
diff changeset
   284
                s.filter(Locations.this::isArchive)
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   285
                        .forEach(dirEntry -> addFile(dirEntry, warn));
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   286
            } catch (IOException ignore) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   290
        public SearchPath addFiles(String files, boolean warn) {
7335
8b390fd27190 6900037: javac should warn if earlier -source is used and bootclasspath not set
jjg
parents: 6151
diff changeset
   291
            if (files != null) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   292
                addFiles(getPathEntries(files, emptyPathDefault), warn);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   293
            }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   294
            return this;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   295
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   296
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   297
        public SearchPath addFiles(String files) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   298
            return addFiles(files, warn);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   299
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   300
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   301
        public SearchPath addFiles(Iterable<? extends Path> files, boolean warn) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   302
            if (files != null) {
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   303
                for (Path file : files) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
                    addFile(file, warn);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   305
                }
7335
8b390fd27190 6900037: javac should warn if earlier -source is used and bootclasspath not set
jjg
parents: 6151
diff changeset
   306
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   307
            return this;
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   310
        public SearchPath addFiles(Iterable<? extends Path> files) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   311
            return addFiles(files, warn);
06bc494ca11e Initial load
duke
parents:
diff changeset
   312
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   313
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   314
        public void addFile(Path file, boolean warn) {
7839
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   315
            if (contains(file)) {
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   316
                // discard duplicates
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   317
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   318
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   319
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   320
            if (!fsInfo.exists(file)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   321
                /* No such file or directory exists */
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   322
                if (warn) {
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   323
                    log.warning(Lint.LintCategory.PATH,
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   324
                            "path.element.not.found", file);
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   325
                }
7839
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   326
                super.add(file);
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   327
                return;
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   328
            }
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   329
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   330
            Path canonFile = fsInfo.getCanonicalFile(file);
7839
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   331
            if (canonicalValues.contains(canonFile)) {
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   332
                /* Discard duplicates and avoid infinite recursion */
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   333
                return;
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   334
            }
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   335
a1ca72d05b20 6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
jjh
parents: 7336
diff changeset
   336
            if (fsInfo.isFile(file)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
                /* File is an ordinary file. */
40513
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   338
                if (   !file.getFileName().toString().endsWith(".jmod")
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   339
                    && !file.endsWith("modules")) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   340
                    if (!isArchive(file)) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   341
                        /* Not a recognized extension; open it to see if
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   342
                         it looks like a valid zip file. */
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   343
                        try {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   344
                            FileSystems.newFileSystem(file, null).close();
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   345
                            if (warn) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   346
                                log.warning(Lint.LintCategory.PATH,
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   347
                                        "unexpected.archive.file", file);
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   348
                            }
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   349
                        } catch (IOException | ProviderNotFoundException e) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   350
                            // FIXME: include e.getLocalizedMessage in warning
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   351
                            if (warn) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   352
                                log.warning(Lint.LintCategory.PATH,
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   353
                                        "invalid.archive.file", file);
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   354
                            }
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   355
                            return;
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   356
                        }
40513
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   357
                    } else {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   358
                        if (fsInfo.getJarFSProvider() == null) {
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   359
                            log.error(Errors.NoZipfsForArchive(file));
39b67170b045 8153391: an image created for \"jdk.compiler\" fails to run javac
jlahoda
parents: 40308
diff changeset
   360
                            return ;
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5847
diff changeset
   361
                        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
            /* Now what we have left is either a directory or a file name
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   367
             conforming to archive naming convention */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
            super.add(file);
1208
5072b0dd3d52 6743107: clean up use of static caches in file manager
jjg
parents: 735
diff changeset
   369
            canonicalValues.add(canonFile);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   371
            if (expandJarClassPaths && fsInfo.isFile(file) && !file.endsWith("modules")) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
                addJarClassPath(file, warn);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   373
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
        // Adds referenced classpath elements from a jar's Class-Path
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
        // Manifest entry.  In some future release, we may want to
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
        // update this code to recognize URLs rather than simple
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
        // filenames, but if we do, we should redo all path-related code.
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   380
        private void addJarClassPath(Path jarFile, boolean warn) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
            try {
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   382
                for (Path f : fsInfo.getJarClassPath(jarFile)) {
1208
5072b0dd3d52 6743107: clean up use of static caches in file manager
jjg
parents: 735
diff changeset
   383
                    addFile(f, warn);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
            } catch (IOException e) {
5007
28dee2489196 6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file
jjg
parents: 4937
diff changeset
   386
                log.error("error.reading.file", jarFile, JavacFileManager.getMessage(e));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   391
    /**
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   392
     * Base class for handling support for the representation of Locations.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   393
     *
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   394
     * Locations are (by design) opaque handles that can easily be implemented
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   395
     * by enums like StandardLocation. Within JavacFileManager, each Location
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   396
     * has an associated LocationHandler, which provides much of the appropriate
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   397
     * functionality for the corresponding Location.
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   398
     *
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   399
     * @see #initHandlers
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   400
     * @see #getHandler
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   401
     */
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   402
    protected static abstract class LocationHandler {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   403
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   404
        /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   405
         * @see JavaFileManager#handleOption
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   406
         */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   407
        abstract boolean handleOption(Option option, String value);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   408
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   409
        /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   410
         * @see StandardJavaFileManager#hasLocation
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   411
         */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   412
        boolean isSet() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   413
            return (getPaths() != null);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   414
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   415
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   416
        /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   417
         * @see StandardJavaFileManager#getLocation
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   418
         */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   419
        abstract Collection<Path> getPaths();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   420
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   421
        /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   422
         * @see StandardJavaFileManager#setLocation
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   423
         */
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   424
        abstract void setPaths(Iterable<? extends Path> paths) throws IOException;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   425
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   426
        /**
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   427
         * @see StandardJavaFileManager#setLocationForModule
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   428
         */
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   429
        abstract void setPathsForModule(String moduleName, Iterable<? extends Path> paths)
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   430
                throws IOException;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   431
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   432
        /**
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   433
         * @see JavaFileManager#getLocationForModule(Location, String)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   434
         */
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   435
        Location getLocationForModule(String moduleName) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   436
            return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   437
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   438
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   439
        /**
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   440
         * @see JavaFileManager#getLocationForModule(Location, JavaFileObject, String)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   441
         */
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   442
        Location getLocationForModule(Path file) throws IOException  {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   443
            return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   444
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   445
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   446
        /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   447
         * @see JavaFileManager#inferModuleName
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   448
         */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   449
        String inferModuleName() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   450
            return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   451
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   452
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   453
        /**
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   454
         * @see JavaFileManager#listLocationsForModules
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   455
         */
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   456
        Iterable<Set<Location>> listLocationsForModules() throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   457
            return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   458
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   459
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   460
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   461
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   462
     * A LocationHandler for a given Location, and associated set of options.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   463
     */
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   464
    private static abstract class BasicLocationHandler extends LocationHandler {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   465
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   466
        final Location location;
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   467
        final Set<Option> options;
7335
8b390fd27190 6900037: javac should warn if earlier -source is used and bootclasspath not set
jjg
parents: 6151
diff changeset
   468
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   469
        /**
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   470
         * Create a handler. The location and options provide a way to map from a location or an
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   471
         * option to the corresponding handler.
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   472
         *
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   473
         * @param location the location for which this is the handler
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   474
         * @param options the options affecting this location
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   475
         * @see #initHandlers
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   476
         */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   477
        protected BasicLocationHandler(Location location, Option... options) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   478
            this.location = location;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   479
            this.options = options.length == 0
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   480
                    ? EnumSet.noneOf(Option.class)
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   481
                    : EnumSet.copyOf(Arrays.asList(options));
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   482
        }
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   483
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   484
        @Override
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   485
        void setPathsForModule(String moduleName, Iterable<? extends Path> files) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   486
            // should not happen: protected by check in JavacFileManager
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   487
            throw new UnsupportedOperationException("not supported for " + location);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   488
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   489
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   490
        protected Path checkSingletonDirectory(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   491
            Iterator<? extends Path> pathIter = paths.iterator();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   492
            if (!pathIter.hasNext()) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   493
                throw new IllegalArgumentException("empty path for directory");
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   494
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   495
            Path path = pathIter.next();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   496
            if (pathIter.hasNext()) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   497
                throw new IllegalArgumentException("path too long for directory");
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   498
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   499
            checkDirectory(path);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   500
            return path;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   501
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   502
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   503
        protected Path checkDirectory(Path path) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   504
            Objects.requireNonNull(path);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   505
            if (!Files.exists(path)) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   506
                throw new FileNotFoundException(path + ": does not exist");
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   507
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   508
            if (!Files.isDirectory(path)) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   509
                throw new IOException(path + ": not a directory");
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   510
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   511
            return path;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   512
        }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   513
    }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   514
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   515
    /**
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   516
     * General purpose implementation for output locations, such as -d/CLASS_OUTPUT and
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   517
     * -s/SOURCE_OUTPUT. All options are treated as equivalent (i.e. aliases.)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   518
     * The value is a single file, possibly null.
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   519
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   520
    private class OutputLocationHandler extends BasicLocationHandler {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   521
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   522
        private Path outputDir;
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   523
        private ModuleTable moduleTable;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   524
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   525
        OutputLocationHandler(Location location, Option... options) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   526
            super(location, options);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   527
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   528
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   529
        @Override
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   530
        boolean handleOption(Option option, String value) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   531
            if (!options.contains(option)) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   532
                return false;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   533
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   535
            // TODO: could/should validate outputDir exists and is a directory
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   536
            // need to decide how best to report issue for benefit of
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   537
            // direct API call on JavaFileManager.handleOption(specifies IAE)
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   538
            // vs. command line decoding.
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   539
            outputDir = (value == null) ? null : getPath(value);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   540
            return true;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   541
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   542
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   543
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   544
        Collection<Path> getPaths() {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   545
            return (outputDir == null) ? null : Collections.singleton(outputDir);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   546
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   548
        @Override
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   549
        void setPaths(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   550
            if (paths == null) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   551
                outputDir = null;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   552
            } else {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   553
                outputDir = checkSingletonDirectory(paths);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   554
            }
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   555
            moduleTable = null;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   556
            listed = false;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   557
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   558
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   559
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
   560
        Location getLocationForModule(String name) {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   561
            if (moduleTable == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   562
                moduleTable = new ModuleTable();
42814
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   563
            }
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   564
            ModuleLocationHandler l = moduleTable.get(name);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   565
            if (l == null) {
42814
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   566
                Path out = outputDir.resolve(name);
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   567
                l = new ModuleLocationHandler(this, location.getName() + "[" + name + "]",
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   568
                        name, Collections.singletonList(out), true);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   569
                moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   570
            }
42814
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   571
            return l;
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   572
        }
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   573
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   574
        @Override
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   575
        void setPathsForModule(String name, Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   576
            Path out = checkSingletonDirectory(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   577
            if (moduleTable == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   578
                moduleTable = new ModuleTable();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   579
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   580
            ModuleLocationHandler l = moduleTable.get(name);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   581
            if (l == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   582
                l = new ModuleLocationHandler(this, location.getName() + "[" + name + "]",
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   583
                        name, Collections.singletonList(out), true);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   584
                moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   585
           } else {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   586
                l.searchPath = Collections.singletonList(out);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   587
                moduleTable.updatePaths(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   588
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   589
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   590
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   591
        @Override
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   592
        Location getLocationForModule(Path file) {
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   593
            return (moduleTable == null) ? null : moduleTable.get(file);
42814
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   594
        }
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   595
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   596
        private boolean listed;
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   597
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   598
        @Override
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   599
        Iterable<Set<Location>> listLocationsForModules() throws IOException {
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   600
            if (!listed && outputDir != null) {
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   601
                try (DirectoryStream<Path> stream = Files.newDirectoryStream(outputDir)) {
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   602
                    for (Path p : stream) {
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   603
                        getLocationForModule(p.getFileName().toString());
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   604
                    }
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   605
                }
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   606
                listed = true;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   607
            }
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   608
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   609
            if (moduleTable == null || moduleTable.isEmpty())
42814
058fc03646d9 8171005: Fix JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName) to work with location == CLASS_OUTPUT
jlahoda
parents: 42414
diff changeset
   610
                return Collections.emptySet();
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   611
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   612
            return Collections.singleton(moduleTable.locations());
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   613
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   615
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   616
    /**
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   617
     * General purpose implementation for search path locations,
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   618
     * such as -sourcepath/SOURCE_PATH and -processorPath/ANNOTATION_PROCESSOR_PATH.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   619
     * All options are treated as equivalent (i.e. aliases.)
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   620
     * The value is an ordered set of files and/or directories.
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   621
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   622
    private class SimpleLocationHandler extends BasicLocationHandler {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   623
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   624
        protected Collection<Path> searchPath;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   625
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   626
        SimpleLocationHandler(Location location, Option... options) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   627
            super(location, options);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   628
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   629
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   630
        @Override
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   631
        boolean handleOption(Option option, String value) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   632
            if (!options.contains(option)) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   633
                return false;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   634
            }
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   635
            searchPath = value == null ? null
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   636
                    : Collections.unmodifiableCollection(createPath().addFiles(value));
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   637
            return true;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   638
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   639
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   640
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   641
        Collection<Path> getPaths() {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   642
            return searchPath;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   643
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   644
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   645
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   646
        void setPaths(Iterable<? extends Path> files) {
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   647
            SearchPath p;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   648
            if (files == null) {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   649
                p = computePath(null);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   650
            } else {
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   651
                p = createPath().addFiles(files);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   652
            }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   653
            searchPath = Collections.unmodifiableCollection(p);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   654
        }
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   655
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   656
        protected SearchPath computePath(String value) {
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   657
            return createPath().addFiles(value);
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   658
        }
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   659
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   660
        protected SearchPath createPath() {
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   661
            return new SearchPath();
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   662
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   663
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   664
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   665
    /**
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   666
     * Subtype of SimpleLocationHandler for -classpath/CLASS_PATH.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   667
     * If no value is given, a default is provided, based on system properties and other values.
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   668
     */
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   669
    private class ClassPathLocationHandler extends SimpleLocationHandler {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   670
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   671
        ClassPathLocationHandler() {
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
   672
            super(StandardLocation.CLASS_PATH, Option.CLASS_PATH);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   673
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   674
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   675
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   676
        Collection<Path> getPaths() {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   677
            lazy();
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   678
            return searchPath;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   679
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   680
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   681
        @Override
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   682
        protected SearchPath computePath(String value) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   683
            String cp = value;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   684
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   685
            // CLASSPATH environment variable when run from `javac'.
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   686
            if (cp == null) {
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   687
                cp = System.getProperty("env.class.path");
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   688
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   689
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   690
            // If invoked via a java VM (not the javac launcher), use the
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   691
            // platform class path
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   692
            if (cp == null && System.getProperty("application.home") == null) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   693
                cp = System.getProperty("java.class.path");
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   694
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   695
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   696
            // Default to current working directory.
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   697
            if (cp == null) {
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   698
                cp = ".";
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   699
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   700
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   701
            return createPath().addFiles(cp);
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   702
        }
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   703
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   704
        @Override
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   705
        protected SearchPath createPath() {
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   706
            return new SearchPath()
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   707
                    .expandJarClassPaths(true) // Only search user jars for Class-Paths
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
   708
                    .emptyPathDefault(getPath("."));  // Empty path elt ==> current directory
14360
2a8304e421ed 6725230: Java Compilation with Jsr199 ignores Class-Path in manifest
jjg
parents: 14259
diff changeset
   709
        }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   710
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   711
        private void lazy() {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   712
            if (searchPath == null) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   713
                setPaths(null);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   714
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   715
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   716
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   717
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   718
    /**
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   719
     * Custom subtype of LocationHandler for PLATFORM_CLASS_PATH.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   720
     * Various options are supported for different components of the
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   721
     * platform class path.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   722
     * Setting a value with setLocation overrides all existing option values.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   723
     * Setting any option overrides any value set with setLocation, and
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   724
     * reverts to using default values for options that have not been set.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   725
     * Setting -bootclasspath or -Xbootclasspath overrides any existing
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   726
     * value for -Xbootclasspath/p: and -Xbootclasspath/a:.
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   727
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   728
    private class BootClassPathLocationHandler extends BasicLocationHandler {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   729
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   730
        private Collection<Path> searchPath;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22153
diff changeset
   731
        final Map<Option, String> optionValues = new EnumMap<>(Option.class);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   732
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   733
        /**
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   734
         * Is the bootclasspath the default?
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   735
         */
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   736
        private boolean isDefault;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   737
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   738
        BootClassPathLocationHandler() {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   739
            super(StandardLocation.PLATFORM_CLASS_PATH,
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
   740
                    Option.BOOT_CLASS_PATH, Option.XBOOTCLASSPATH,
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   741
                    Option.XBOOTCLASSPATH_PREPEND,
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   742
                    Option.XBOOTCLASSPATH_APPEND,
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   743
                    Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   744
                    Option.EXTDIRS, Option.DJAVA_EXT_DIRS);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   745
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   746
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   747
        boolean isDefault() {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   748
            lazy();
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   749
            return isDefault;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   750
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   751
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   752
        @Override
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
   753
        boolean handleOption(Option option, String value) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   754
            if (!options.contains(option)) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   755
                return false;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   756
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   757
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   758
            option = canonicalize(option);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   759
            optionValues.put(option, value);
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
   760
            if (option == BOOT_CLASS_PATH) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   761
                optionValues.remove(XBOOTCLASSPATH_PREPEND);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   762
                optionValues.remove(XBOOTCLASSPATH_APPEND);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   763
            }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   764
            searchPath = null;  // reset to "uninitialized"
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   765
            return true;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   766
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   767
        // where
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   768
        // TODO: would be better if option aliasing was handled at a higher
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   769
        // level
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   770
        private Option canonicalize(Option option) {
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   771
            switch (option) {
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   772
                case XBOOTCLASSPATH:
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
   773
                    return Option.BOOT_CLASS_PATH;
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   774
                case DJAVA_ENDORSED_DIRS:
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   775
                    return Option.ENDORSEDDIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   776
                case DJAVA_EXT_DIRS:
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   777
                    return Option.EXTDIRS;
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   778
                default:
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   779
                    return option;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   780
            }
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   781
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   782
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   783
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   784
        Collection<Path> getPaths() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   785
            lazy();
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   786
            return searchPath;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   787
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   788
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   789
        @Override
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   790
        void setPaths(Iterable<? extends Path> files) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   791
            if (files == null) {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   792
                searchPath = null;  // reset to "uninitialized"
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   793
            } else {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   794
                isDefault = false;
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   795
                SearchPath p = new SearchPath().addFiles(files, false);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   796
                searchPath = Collections.unmodifiableCollection(p);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   797
                optionValues.clear();
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   798
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   799
        }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   800
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   801
        SearchPath computePath() throws IOException {
27118
3c8314271af7 8060043: Rename Locations.Path to Locations.SearchPath
jjg
parents: 25874
diff changeset
   802
            SearchPath path = new SearchPath();
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   803
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
   804
            String bootclasspathOpt = optionValues.get(BOOT_CLASS_PATH);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   805
            String endorseddirsOpt = optionValues.get(ENDORSEDDIRS);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   806
            String extdirsOpt = optionValues.get(EXTDIRS);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   807
            String xbootclasspathPrependOpt = optionValues.get(XBOOTCLASSPATH_PREPEND);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   808
            String xbootclasspathAppendOpt = optionValues.get(XBOOTCLASSPATH_APPEND);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   809
            path.addFiles(xbootclasspathPrependOpt);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   810
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   811
            if (endorseddirsOpt != null) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   812
                path.addDirectories(endorseddirsOpt);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   813
            } else {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   814
                path.addDirectories(System.getProperty("java.endorsed.dirs"), false);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   815
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   816
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   817
            if (bootclasspathOpt != null) {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   818
                path.addFiles(bootclasspathOpt);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   819
            } else {
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   820
                // Standard system classes for this compiler's release.
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   821
                Collection<Path> systemClasses = systemClasses();
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   822
                if (systemClasses != null) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   823
                    path.addFiles(systemClasses, false);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   824
                } else {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   825
                    // fallback to the value of sun.boot.class.path
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   826
                    String files = System.getProperty("sun.boot.class.path");
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   827
                    path.addFiles(files, false);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   828
                }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   829
            }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   830
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   831
            path.addFiles(xbootclasspathAppendOpt);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   832
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   833
            // Strictly speaking, standard extensions are not bootstrap
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   834
            // classes, but we treat them identically, so we'll pretend
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   835
            // that they are.
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   836
            if (extdirsOpt != null) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   837
                path.addDirectories(extdirsOpt);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   838
            } else {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   839
                // Add lib/jfxrt.jar to the search path
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   840
               Path jfxrt = javaHome.resolve("lib/jfxrt.jar");
27858
chegar
parents: 27579 27852
diff changeset
   841
                if (Files.exists(jfxrt)) {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   842
                    path.addFile(jfxrt, false);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   843
                }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   844
                path.addDirectories(System.getProperty("java.ext.dirs"), false);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   845
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   846
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   847
            isDefault =
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   848
                       (xbootclasspathPrependOpt == null)
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   849
                    && (bootclasspathOpt == null)
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   850
                    && (xbootclasspathAppendOpt == null);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   851
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   852
            return path;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   853
        }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   854
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   855
        /**
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   856
         * Return a collection of files containing system classes.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   857
         * Returns {@code null} if not running on a modular image.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   858
         *
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   859
         * @throws UncheckedIOException if an I/O errors occurs
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   860
         */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   861
        private Collection<Path> systemClasses() throws IOException {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   862
            // Return "modules" jimage file if available
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   863
            if (Files.isRegularFile(thisSystemModules)) {
40302
8c0d8d2c3519 8143048: Re-examine dependency on property sun.boot.class.path
jlahoda
parents: 38536
diff changeset
   864
                return Collections.singleton(thisSystemModules);
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   865
            }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   866
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   867
            // Exploded module image
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   868
            Path modules = javaHome.resolve("modules");
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   869
            if (Files.isDirectory(modules.resolve("java.base"))) {
29053
5c1f1d6b40f6 8067445: New modular image-based file manager skips boot classes
jlahoda
parents: 28707
diff changeset
   870
                try (Stream<Path> listedModules = Files.list(modules)) {
40302
8c0d8d2c3519 8143048: Re-examine dependency on property sun.boot.class.path
jlahoda
parents: 38536
diff changeset
   871
                    return listedModules.collect(Collectors.toList());
29053
5c1f1d6b40f6 8067445: New modular image-based file manager skips boot classes
jlahoda
parents: 28707
diff changeset
   872
                }
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   873
            }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   874
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   875
            // not a modular image that we know about
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   876
            return null;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   877
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   878
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   879
        private void lazy() {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   880
            if (searchPath == null) {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   881
                try {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   882
                searchPath = Collections.unmodifiableCollection(computePath());
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   883
                } catch (IOException e) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   884
                    // TODO: need better handling here, e.g. javac Abort?
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   885
                    throw new UncheckedIOException(e);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27226
diff changeset
   886
                }
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
   887
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
   888
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   889
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   890
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   891
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   892
     * A LocationHander to represent modules found from a module-oriented
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   893
     * location such as MODULE_SOURCE_PATH, UPGRADE_MODULE_PATH,
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   894
     * SYSTEM_MODULES and MODULE_PATH.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   895
     *
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   896
     * The Location can be specified to accept overriding classes from the
40762
f8883aa0053c 8160851: Remove old launcher module-related options
mchung
parents: 40513
diff changeset
   897
     * {@code --patch-module <module>=<path> } parameter.
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   898
     */
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   899
    private static class ModuleLocationHandler extends LocationHandler implements Location {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   900
        private final LocationHandler parent;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   901
        private final String name;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   902
        private final String moduleName;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   903
        private final boolean output;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   904
        Collection<Path> searchPath;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   905
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   906
        ModuleLocationHandler(LocationHandler parent, String name, String moduleName,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   907
                Collection<Path> searchPath, boolean output) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   908
            this.parent = parent;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   909
            this.name = name;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   910
            this.moduleName = moduleName;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   911
            this.searchPath = searchPath;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   912
            this.output = output;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   913
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   914
37848
3c8ff4204d2d 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36526
diff changeset
   915
        @Override @DefinedBy(Api.COMPILER)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   916
        public String getName() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   917
            return name;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   918
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   919
37848
3c8ff4204d2d 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36526
diff changeset
   920
        @Override @DefinedBy(Api.COMPILER)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   921
        public boolean isOutputLocation() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   922
            return output;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   923
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   924
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   925
        @Override // defined by LocationHandler
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   926
        boolean handleOption(Option option, String value) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   927
            throw new UnsupportedOperationException();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   928
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   929
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   930
        @Override // defined by LocationHandler
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   931
        Collection<Path> getPaths() {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   932
            return Collections.unmodifiableCollection(searchPath);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   933
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   934
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   935
        @Override // defined by LocationHandler
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   936
        void setPaths(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   937
            // defer to the parent to determine if this is acceptable
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   938
            parent.setPathsForModule(moduleName, paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   939
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   940
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   941
        @Override // defined by LocationHandler
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   942
        void setPathsForModule(String moduleName, Iterable<? extends Path> paths) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   943
            throw new UnsupportedOperationException("not supported for " + name);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   944
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   945
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   946
        @Override // defined by LocationHandler
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   947
        String inferModuleName() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   948
            return moduleName;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
   949
        }
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   950
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   951
        @Override
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   952
        public String toString() {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   953
            return name;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   954
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   955
    }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   956
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   957
    /**
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   958
     * A table of module location handlers, indexed by name and path.
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   959
     */
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   960
    private static class ModuleTable {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   961
        private final Map<String, ModuleLocationHandler> nameMap = new LinkedHashMap<>();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   962
        private final Map<Path, ModuleLocationHandler> pathMap = new LinkedHashMap<>();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   963
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   964
        void add(ModuleLocationHandler h) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   965
            nameMap.put(h.moduleName, h);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   966
            for (Path p : h.searchPath) {
44021
3ea5514d9fbe 8175990: Javac fails to find module-info.java if module source path contains symlinks
ksrini
parents: 44019
diff changeset
   967
                pathMap.put(normalize(p), h);
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   968
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   969
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   970
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   971
        void updatePaths(ModuleLocationHandler h) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   972
            // use iterator, to be able to remove old entries
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   973
            for (Iterator<Map.Entry<Path, ModuleLocationHandler>> iter = pathMap.entrySet().iterator();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   974
                    iter.hasNext(); ) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   975
                Map.Entry<Path, ModuleLocationHandler> e = iter.next();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   976
                if (e.getValue() == h) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   977
                    iter.remove();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   978
                }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   979
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   980
            for (Path p : h.searchPath) {
44021
3ea5514d9fbe 8175990: Javac fails to find module-info.java if module source path contains symlinks
ksrini
parents: 44019
diff changeset
   981
                pathMap.put(normalize(p), h);
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   982
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   983
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   984
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   985
        ModuleLocationHandler get(String name) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   986
            return nameMap.get(name);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   987
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   988
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
   989
        ModuleLocationHandler get(Path path) {
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   990
            while (path != null) {
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   991
                ModuleLocationHandler l = pathMap.get(path);
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   992
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   993
                if (l != null)
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   994
                    return l;
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   995
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   996
                path = path.getParent();
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   997
            }
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   998
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
   999
            return null;
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1000
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1001
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1002
        void clear() {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1003
            nameMap.clear();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1004
            pathMap.clear();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1005
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1006
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1007
        boolean isEmpty() {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1008
            return nameMap.isEmpty();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1009
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1010
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1011
        Set<Location> locations() {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1012
            return Collections.unmodifiableSet(nameMap.values().stream().collect(Collectors.toSet()));
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1013
        }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1014
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1015
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1016
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1017
     * A LocationHandler for simple module-oriented search paths,
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1018
     * like UPGRADE_MODULE_PATH and MODULE_PATH.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1019
     */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1020
    private class ModulePathLocationHandler extends SimpleLocationHandler {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1021
        private ModuleTable moduleTable;
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1022
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1023
        ModulePathLocationHandler(Location location, Option... options) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1024
            super(location, options);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1025
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1026
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1027
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1028
        public boolean handleOption(Option option, String value) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1029
            if (!options.contains(option)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1030
                return false;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1031
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1032
            setPaths(value == null ? null : getPathEntries(value));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1033
            return true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1034
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1035
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1036
        @Override
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1037
        public Location getLocationForModule(String moduleName) {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1038
            initModuleLocations();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1039
            return moduleTable.get(moduleName);
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1040
        }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1041
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1042
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1043
        Iterable<Set<Location>> listLocationsForModules() {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1044
            if (searchPath == null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1045
                return Collections.emptyList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1046
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42814
diff changeset
  1047
            return ModulePathIterator::new;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1048
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1049
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1050
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1051
        void setPaths(Iterable<? extends Path> paths) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1052
            if (paths != null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1053
                for (Path p: paths) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1054
                    checkValidModulePathEntry(p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1055
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1056
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1057
            super.setPaths(paths);
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1058
            moduleTable = null;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1059
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1060
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1061
        @Override
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1062
        void setPathsForModule(String name, Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1063
            List<Path> checkedPaths = checkPaths(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1064
            // how far should we go to validate the paths provide a module?
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1065
            // e.g. contain module-info with the correct name?
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1066
            initModuleLocations();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1067
            ModuleLocationHandler l = moduleTable.get(name);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1068
            if (l == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1069
                l = new ModuleLocationHandler(this, location.getName() + "[" + name + "]",
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1070
                        name, checkedPaths, true);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1071
                moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1072
           } else {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1073
                l.searchPath = checkedPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1074
                moduleTable.updatePaths(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1075
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1076
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1077
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1078
        private List<Path> checkPaths(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1079
            Objects.requireNonNull(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1080
            List<Path> validPaths = new ArrayList<>();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1081
            for (Path p : paths) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1082
                validPaths.add(checkDirectory(p));
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1083
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1084
            return validPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1085
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1086
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1087
        private void initModuleLocations() {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1088
            if (moduleTable != null) {
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1089
                return;
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1090
            }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1091
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1092
            moduleTable = new ModuleTable();
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1093
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1094
            for (Set<Location> set : listLocationsForModules()) {
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1095
                for (Location locn : set) {
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1096
                    if (locn instanceof ModuleLocationHandler) {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1097
                        ModuleLocationHandler l = (ModuleLocationHandler) locn;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1098
                        if (!moduleTable.nameMap.containsKey(l.moduleName)) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1099
                            moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1100
                        }
42414
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1101
                    }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1102
                }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1103
            }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1104
        }
0ae183c295a0 8162712: StandardJavaFileManager.getModuleLocation() can't find a module
jjg
parents: 42408
diff changeset
  1105
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1106
        private void checkValidModulePathEntry(Path p) {
43771
25ddac537bb5 8174104: Compiler does not allow non-existent module path entry
jjg
parents: 43574
diff changeset
  1107
            if (!Files.exists(p)) {
25ddac537bb5 8174104: Compiler does not allow non-existent module path entry
jjg
parents: 43574
diff changeset
  1108
                // warning may be generated later
25ddac537bb5 8174104: Compiler does not allow non-existent module path entry
jjg
parents: 43574
diff changeset
  1109
                return;
25ddac537bb5 8174104: Compiler does not allow non-existent module path entry
jjg
parents: 43574
diff changeset
  1110
            }
25ddac537bb5 8174104: Compiler does not allow non-existent module path entry
jjg
parents: 43574
diff changeset
  1111
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1112
            if (Files.isDirectory(p)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1113
                // either an exploded module or a directory of modules
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1114
                return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1115
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1116
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1117
            String name = p.getFileName().toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1118
            int lastDot = name.lastIndexOf(".");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1119
            if (lastDot > 0) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1120
                switch (name.substring(lastDot)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1121
                    case ".jar":
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1122
                    case ".jmod":
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1123
                        return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1124
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1125
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1126
            throw new IllegalArgumentException(p.toString());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1127
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1128
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1129
        class ModulePathIterator implements Iterator<Set<Location>> {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1130
            Iterator<Path> pathIter = searchPath.iterator();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1131
            int pathIndex = 0;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1132
            Set<Location> next = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1133
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1134
            @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1135
            public boolean hasNext() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1136
                if (next != null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1137
                    return true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1138
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1139
                while (next == null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1140
                    if (pathIter.hasNext()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1141
                        Path path = pathIter.next();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1142
                        if (Files.isDirectory(path)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1143
                            next = scanDirectory(path);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1144
                        } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1145
                            next = scanFile(path);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1146
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1147
                        pathIndex++;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1148
                    } else
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1149
                        return false;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1150
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1151
                return true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1152
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1153
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1154
            @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1155
            public Set<Location> next() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1156
                hasNext();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1157
                if (next != null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1158
                    Set<Location> result = next;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1159
                    next = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1160
                    return result;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1161
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1162
                throw new NoSuchElementException();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1163
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1164
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1165
            private Set<Location> scanDirectory(Path path) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1166
                Set<Path> paths = new LinkedHashSet<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1167
                Path moduleInfoClass = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1168
                try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1169
                    for (Path entry: stream) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1170
                        if (entry.endsWith("module-info.class")) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1171
                            moduleInfoClass = entry;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1172
                            break;  // no need to continue scanning
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1173
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1174
                        paths.add(entry);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1175
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1176
                } catch (DirectoryIteratorException | IOException ignore) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1177
                    log.error(Errors.LocnCantReadDirectory(path));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1178
                    return Collections.emptySet();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1179
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1180
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1181
                if (moduleInfoClass != null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1182
                    // It's an exploded module directly on the module path.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1183
                    // We can't infer module name from the directory name, so have to
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1184
                    // read module-info.class.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1185
                    try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1186
                        String moduleName = readModuleName(moduleInfoClass);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1187
                        String name = location.getName()
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1188
                                + "[" + pathIndex + ":" + moduleName + "]";
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1189
                        ModuleLocationHandler l = new ModuleLocationHandler(
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1190
                                ModulePathLocationHandler.this, name, moduleName,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1191
                                Collections.singletonList(path), false);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1192
                        return Collections.singleton(l);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1193
                    } catch (ModuleNameReader.BadClassFile e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1194
                        log.error(Errors.LocnBadModuleInfo(path));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1195
                        return Collections.emptySet();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1196
                    } catch (IOException e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1197
                        log.error(Errors.LocnCantReadFile(path));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1198
                        return Collections.emptySet();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1199
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1200
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1201
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1202
                // A directory of modules
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1203
                Set<Location> result = new LinkedHashSet<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1204
                int index = 0;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1205
                for (Path entry : paths) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1206
                    Pair<String,Path> module = inferModuleName(entry);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1207
                    if (module == null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1208
                        // diagnostic reported if necessary; skip to next
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1209
                        continue;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1210
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1211
                    String moduleName = module.fst;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1212
                    Path modulePath = module.snd;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1213
                    String name = location.getName()
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1214
                            + "[" + pathIndex + "." + (index++) + ":" + moduleName + "]";
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1215
                    ModuleLocationHandler l = new ModuleLocationHandler(
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1216
                            ModulePathLocationHandler.this, name, moduleName,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1217
                            Collections.singletonList(modulePath), false);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1218
                    result.add(l);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1219
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1220
                return result;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1221
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1222
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1223
            private Set<Location> scanFile(Path path) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1224
                Pair<String,Path> module = inferModuleName(path);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1225
                if (module == null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1226
                    // diagnostic reported if necessary
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1227
                    return Collections.emptySet();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1228
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1229
                String moduleName = module.fst;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1230
                Path modulePath = module.snd;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1231
                String name = location.getName()
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1232
                        + "[" + pathIndex + ":" + moduleName + "]";
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1233
                ModuleLocationHandler l = new ModuleLocationHandler(
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1234
                        ModulePathLocationHandler.this, name, moduleName,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1235
                        Collections.singletonList(modulePath), false);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1236
                return Collections.singleton(l);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1237
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1238
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1239
            private Pair<String,Path> inferModuleName(Path p) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1240
                if (Files.isDirectory(p)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1241
                    if (Files.exists(p.resolve("module-info.class"))) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1242
                        String name = p.getFileName().toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1243
                        if (SourceVersion.isName(name))
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1244
                            return new Pair<>(name, p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1245
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1246
                    return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1247
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1248
38536
42569f7fe4e6 8154824: Compiler should handle java.nio.file.FileSystemNotFoundException gracefully and not abort
sadayapalam
parents: 38519
diff changeset
  1249
                if (p.getFileName().toString().endsWith(".jar") && fsInfo.exists(p)) {
43574
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1250
                    FileSystemProvider jarFSProvider = fsInfo.getJarFSProvider();
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1251
                    if (jarFSProvider == null) {
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1252
                        log.error(Errors.NoZipfsForArchive(p));
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1253
                        return null;
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1254
                    }
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1255
                    try (FileSystem fs = jarFSProvider.newFileSystem(p, fsEnv)) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1256
                        Path moduleInfoClass = fs.getPath("module-info.class");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1257
                        if (Files.exists(moduleInfoClass)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1258
                            String moduleName = readModuleName(moduleInfoClass);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1259
                            return new Pair<>(moduleName, p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1260
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1261
                    } catch (ModuleNameReader.BadClassFile e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1262
                        log.error(Errors.LocnBadModuleInfo(p));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1263
                        return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1264
                    } catch (IOException e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1265
                        log.error(Errors.LocnCantReadFile(p));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1266
                        return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1267
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1268
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1269
                    //automatic module:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1270
                    String fn = p.getFileName().toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1271
                    //from ModulePath.deriveModuleDescriptor:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1272
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1273
                    // drop .jar
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1274
                    String mn = fn.substring(0, fn.length()-4);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1275
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1276
                    // find first occurrence of -${NUMBER}. or -${NUMBER}$
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1277
                    Matcher matcher = Pattern.compile("-(\\d+(\\.|$))").matcher(mn);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1278
                    if (matcher.find()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1279
                        int start = matcher.start();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1280
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1281
                        mn = mn.substring(0, start);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1282
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1283
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1284
                    // finally clean up the module name
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41861
diff changeset
  1285
                    mn =  mn.replaceAll("(\\.|\\d)*$", "")    // remove trailing version
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41861
diff changeset
  1286
                            .replaceAll("[^A-Za-z0-9]", ".")  // replace non-alphanumeric
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1287
                            .replaceAll("(\\.)(\\1)+", ".")   // collapse repeating dots
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1288
                            .replaceAll("^\\.", "")           // drop leading dots
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1289
                            .replaceAll("\\.$", "");          // drop trailing dots
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1290
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1291
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1292
                    if (!mn.isEmpty()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1293
                        return new Pair<>(mn, p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1294
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1295
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1296
                    log.error(Errors.LocnCantGetModuleNameForJar(p));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1297
                    return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1298
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1299
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1300
                if (p.getFileName().toString().endsWith(".jmod")) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1301
                    try {
41440
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
  1302
                        // check if the JMOD file is valid
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
  1303
                        JDK9Wrappers.JmodFile.checkMagic(p);
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
  1304
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
  1305
                        // No JMOD file system.  Use JarFileSystem to
abd777fa486c 8166860: Add magic number to jmod file
mchung
parents: 41254
diff changeset
  1306
                        // workaround for now
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1307
                        FileSystem fs = fileSystems.get(p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1308
                        if (fs == null) {
43574
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1309
                            FileSystemProvider jarFSProvider = fsInfo.getJarFSProvider();
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1310
                            if (jarFSProvider == null) {
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1311
                                log.error(Errors.LocnCantReadFile(p));
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1312
                                return null;
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1313
                            }
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1314
                            fs = jarFSProvider.newFileSystem(p, Collections.emptyMap());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1315
                            try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1316
                                Path moduleInfoClass = fs.getPath("classes/module-info.class");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1317
                                String moduleName = readModuleName(moduleInfoClass);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1318
                                Path modulePath = fs.getPath("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1319
                                fileSystems.put(p, fs);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1320
                                closeables.add(fs);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1321
                                fs = null; // prevent fs being closed in the finally clause
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1322
                                return new Pair<>(moduleName, modulePath);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1323
                            } finally {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1324
                                if (fs != null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1325
                                    fs.close();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1326
                            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1327
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1328
                    } catch (ModuleNameReader.BadClassFile e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1329
                        log.error(Errors.LocnBadModuleInfo(p));
43574
042e694725f7 8166675: Latent bug in jar file handling during module path processing.
jjg
parents: 43267
diff changeset
  1330
                    } catch (IOException e) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1331
                        log.error(Errors.LocnCantReadFile(p));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1332
                        return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1333
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1334
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1335
38519
d70d50ec27bb 8154997: Add examples for jigsaw diagnostics
sadayapalam
parents: 37944
diff changeset
  1336
                if (warn && false) {  // temp disable, when enabled, massage examples.not-yet.txt suitably.
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1337
                    log.warning(Warnings.LocnUnknownFileOnModulePath(p));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1338
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1339
                return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1340
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1341
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1342
            private String readModuleName(Path path) throws IOException, ModuleNameReader.BadClassFile {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1343
                if (moduleNameReader == null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1344
                    moduleNameReader = new ModuleNameReader();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1345
                return moduleNameReader.readModuleName(path);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1346
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1347
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1348
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1349
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1350
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1351
    private class ModuleSourcePathLocationHandler extends BasicLocationHandler {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1352
        private ModuleTable moduleTable;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1353
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1354
        ModuleSourcePathLocationHandler() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1355
            super(StandardLocation.MODULE_SOURCE_PATH,
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1356
                    Option.MODULE_SOURCE_PATH);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1357
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1358
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1359
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1360
        boolean handleOption(Option option, String value) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1361
            init(value);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1362
            return true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1363
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1364
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1365
        void init(String value) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1366
            Collection<String> segments = new ArrayList<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1367
            for (String s: value.split(File.pathSeparator)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1368
                expandBraces(s, segments);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1369
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1370
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1371
            Map<String, List<Path>> map = new LinkedHashMap<>();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1372
            final String MARKER = "*";
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1373
            for (String seg: segments) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1374
                int markStart = seg.indexOf(MARKER);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1375
                if (markStart == -1) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1376
                    add(map, getPath(seg), null);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1377
                } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1378
                    if (markStart == 0 || !isSeparator(seg.charAt(markStart - 1))) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1379
                        throw new IllegalArgumentException("illegal use of " + MARKER + " in " + seg);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1380
                    }
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1381
                    Path prefix = getPath(seg.substring(0, markStart - 1));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1382
                    Path suffix;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1383
                    int markEnd = markStart + MARKER.length();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1384
                    if (markEnd == seg.length()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1385
                        suffix = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1386
                    } else if (!isSeparator(seg.charAt(markEnd))
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1387
                            || seg.indexOf(MARKER, markEnd) != -1) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1388
                        throw new IllegalArgumentException("illegal use of " + MARKER + " in " + seg);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1389
                    } else {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1390
                        suffix = getPath(seg.substring(markEnd + 1));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1391
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1392
                    add(map, prefix, suffix);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1393
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1394
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1395
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1396
            moduleTable = new ModuleTable();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1397
            map.forEach((modName, modPath) -> {
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1398
                boolean hasModuleInfo = modPath.stream().anyMatch(checkModuleInfo);
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1399
                if (hasModuleInfo) {
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1400
                    String locnName = location.getName() + "[" + modName + "]";
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1401
                    ModuleLocationHandler l = new ModuleLocationHandler(this, locnName, modName,
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1402
                            modPath, false);
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1403
                    moduleTable.add(l);
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1404
                }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1405
            });
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1406
        }
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1407
        //where:
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1408
            private final Predicate<Path> checkModuleInfo =
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1409
                    p -> Files.exists(p.resolve("module-info.java"));
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1410
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1411
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1412
        private boolean isSeparator(char ch) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1413
            // allow both separators on Windows
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1414
            return (ch == File.separatorChar) || (ch == '/');
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1415
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1416
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1417
        void add(Map<String, List<Path>> map, Path prefix, Path suffix) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1418
            if (!Files.isDirectory(prefix)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1419
                if (warn) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1420
                    String key = Files.exists(prefix)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1421
                            ? "dir.path.element.not.directory"
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1422
                            : "dir.path.element.not.found";
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1423
                    log.warning(Lint.LintCategory.PATH, key, prefix);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1424
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1425
                return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1426
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1427
            try (DirectoryStream<Path> stream = Files.newDirectoryStream(prefix, path -> Files.isDirectory(path))) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1428
                for (Path entry: stream) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1429
                    Path path = (suffix == null) ? entry : entry.resolve(suffix);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1430
                    if (Files.isDirectory(path)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1431
                        String name = entry.getFileName().toString();
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1432
                        List<Path> paths = map.get(name);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1433
                        if (paths == null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1434
                            map.put(name, paths = new ArrayList<>());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1435
                        paths.add(path);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1436
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1437
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1438
            } catch (IOException e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1439
                // TODO? What to do?
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1440
                System.err.println(e);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1441
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1442
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1443
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1444
        private void expandBraces(String value, Collection<String> results) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1445
            int depth = 0;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1446
            int start = -1;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1447
            String prefix = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1448
            String suffix = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1449
            for (int i = 0; i < value.length(); i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1450
                switch (value.charAt(i)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1451
                    case '{':
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1452
                        depth++;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1453
                        if (depth == 1) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1454
                            prefix = value.substring(0, i);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1455
                            suffix = value.substring(getMatchingBrace(value, i) + 1);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1456
                            start = i + 1;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1457
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1458
                        break;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1459
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1460
                    case ',':
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1461
                        if (depth == 1) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1462
                            String elem = value.substring(start, i);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1463
                            expandBraces(prefix + elem + suffix, results);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1464
                            start = i + 1;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1465
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1466
                        break;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1467
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1468
                    case '}':
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1469
                        switch (depth) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1470
                            case 0:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1471
                                throw new IllegalArgumentException("mismatched braces");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1472
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1473
                            case 1:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1474
                                String elem = value.substring(start, i);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1475
                                expandBraces(prefix + elem + suffix, results);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1476
                                return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1477
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1478
                            default:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1479
                                depth--;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1480
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1481
                        break;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1482
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1483
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1484
            if (depth > 0)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1485
                throw new IllegalArgumentException("mismatched braces");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1486
            results.add(value);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1487
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1488
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1489
        int getMatchingBrace(String value, int offset) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1490
            int depth = 1;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1491
            for (int i = offset + 1; i < value.length(); i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1492
                switch (value.charAt(i)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1493
                    case '{':
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1494
                        depth++;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1495
                        break;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1496
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1497
                    case '}':
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1498
                        if (--depth == 0)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1499
                            return i;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1500
                        break;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1501
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1502
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1503
            throw new IllegalArgumentException("mismatched braces");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1504
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1505
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1506
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1507
        boolean isSet() {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1508
            return (moduleTable != null);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1509
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1510
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1511
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1512
        Collection<Path> getPaths() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1513
            throw new UnsupportedOperationException();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1514
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1515
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1516
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1517
        void setPaths(Iterable<? extends Path> files) throws IOException {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1518
            throw new UnsupportedOperationException();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1519
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1520
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1521
        @Override
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1522
        void setPathsForModule(String name, Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1523
            List<Path> validPaths = checkPaths(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1524
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1525
            if (moduleTable == null)
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1526
                moduleTable = new ModuleTable();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1527
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1528
            ModuleLocationHandler l = moduleTable.get(name);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1529
            if (l == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1530
                l = new ModuleLocationHandler(this,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1531
                        location.getName() + "[" + name + "]",
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1532
                        name,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1533
                        validPaths,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1534
                        true);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1535
                moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1536
           } else {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1537
                l.searchPath = validPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1538
                moduleTable.updatePaths(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1539
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1540
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1541
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1542
        private List<Path> checkPaths(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1543
            Objects.requireNonNull(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1544
            List<Path> validPaths = new ArrayList<>();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1545
            for (Path p : paths) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1546
                validPaths.add(checkDirectory(p));
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1547
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1548
            return validPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1549
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1550
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1551
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1552
        Location getLocationForModule(String name) {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1553
            return (moduleTable == null) ? null : moduleTable.get(name);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1554
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1555
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1556
        @Override
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1557
        Location getLocationForModule(Path file) {
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1558
            return (moduleTable == null) ? null : moduleTable.get(file);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1559
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1560
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1561
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1562
        Iterable<Set<Location>> listLocationsForModules() {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1563
            if (moduleTable == null)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1564
                return Collections.emptySet();
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1565
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1566
            return Collections.singleton(moduleTable.locations());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1567
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1568
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1569
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1570
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1571
    private class SystemModulesLocationHandler extends BasicLocationHandler {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1572
        private Path systemJavaHome;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1573
        private Path modules;
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1574
        private ModuleTable moduleTable;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1575
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1576
        SystemModulesLocationHandler() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1577
            super(StandardLocation.SYSTEM_MODULES, Option.SYSTEM);
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1578
            systemJavaHome = Locations.javaHome;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1579
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1580
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1581
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1582
        boolean handleOption(Option option, String value) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1583
            if (!options.contains(option)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1584
                return false;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1585
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1586
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1587
            if (value == null) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1588
                systemJavaHome = Locations.javaHome;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1589
            } else if (value.equals("none")) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1590
                systemJavaHome = null;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1591
            } else {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1592
                update(getPath(value));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1593
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1594
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1595
            modules = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1596
            return true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1597
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1598
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1599
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1600
        Collection<Path> getPaths() {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1601
            return (systemJavaHome == null) ? null : Collections.singleton(systemJavaHome);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1602
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1603
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1604
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1605
        void setPaths(Iterable<? extends Path> files) throws IOException {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1606
            if (files == null) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1607
                systemJavaHome = null;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1608
            } else {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1609
                Path dir = checkSingletonDirectory(files);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1610
                update(dir);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1611
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1612
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1613
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1614
        @Override
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1615
        void setPathsForModule(String name, Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1616
            List<Path> checkedPaths = checkPaths(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1617
            initSystemModules();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1618
            ModuleLocationHandler l = moduleTable.get(name);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1619
            if (l == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1620
                l = new ModuleLocationHandler(this,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1621
                        location.getName() + "[" + name + "]",
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1622
                        name,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1623
                        checkedPaths,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1624
                        true);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1625
                moduleTable.add(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1626
           } else {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1627
                l.searchPath = checkedPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1628
                moduleTable.updatePaths(l);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1629
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1630
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1631
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1632
        private List<Path> checkPaths(Iterable<? extends Path> paths) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1633
            Objects.requireNonNull(paths);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1634
            List<Path> validPaths = new ArrayList<>();
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1635
            for (Path p : paths) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1636
                validPaths.add(checkDirectory(p));
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1637
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1638
            return validPaths;
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1639
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1640
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1641
        private void update(Path p) {
42404
c4a34c2a656c 8169816: Move src.zip and jrt-fs.jar under the lib directory
mchung
parents: 42261
diff changeset
  1642
            if (!isCurrentPlatform(p) && !Files.exists(p.resolve("lib").resolve("jrt-fs.jar")) &&
c4a34c2a656c 8169816: Move src.zip and jrt-fs.jar under the lib directory
mchung
parents: 42261
diff changeset
  1643
                    !Files.exists(systemJavaHome.resolve("modules")))
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1644
                throw new IllegalArgumentException(p.toString());
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1645
            systemJavaHome = p;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1646
            modules = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1647
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1648
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1649
        private boolean isCurrentPlatform(Path p) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1650
            try {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1651
                return Files.isSameFile(p, Locations.javaHome);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1652
            } catch (IOException ex) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1653
                throw new IllegalArgumentException(p.toString(), ex);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1654
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1655
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1656
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1657
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1658
        Location getLocationForModule(String name) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1659
            initSystemModules();
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1660
            return moduleTable.get(name);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1661
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1662
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1663
        @Override
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1664
        Location getLocationForModule(Path file) throws IOException {
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1665
            initSystemModules();
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1666
            return moduleTable.get(file);
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1667
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1668
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1669
        @Override
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1670
        Iterable<Set<Location>> listLocationsForModules() throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1671
            initSystemModules();
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1672
            return Collections.singleton(moduleTable.locations());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1673
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1674
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1675
        private void initSystemModules() throws IOException {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1676
            if (moduleTable != null)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1677
                return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1678
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1679
            if (systemJavaHome == null) {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1680
                moduleTable = new ModuleTable();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1681
                return;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1682
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1683
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1684
            if (modules == null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1685
                try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1686
                    URI jrtURI = URI.create("jrt:/");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1687
                    FileSystem jrtfs;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1688
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1689
                    if (isCurrentPlatform(systemJavaHome)) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1690
                        jrtfs = FileSystems.getFileSystem(jrtURI);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1691
                    } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1692
                        try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1693
                            Map<String, String> attrMap =
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1694
                                    Collections.singletonMap("java.home", systemJavaHome.toString());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1695
                            jrtfs = FileSystems.newFileSystem(jrtURI, attrMap);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1696
                        } catch (ProviderNotFoundException ex) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1697
                            URL javaHomeURL = systemJavaHome.resolve("jrt-fs.jar").toUri().toURL();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1698
                            ClassLoader currentLoader = Locations.class.getClassLoader();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1699
                            URLClassLoader fsLoader =
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1700
                                    new URLClassLoader(new URL[] {javaHomeURL}, currentLoader);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1701
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1702
                            jrtfs = FileSystems.newFileSystem(jrtURI, Collections.emptyMap(), fsLoader);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1703
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1704
                            closeables.add(fsLoader);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1705
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1706
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1707
                        closeables.add(jrtfs);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1708
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1709
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1710
                    modules = jrtfs.getPath("/modules");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1711
                } catch (FileSystemNotFoundException | ProviderNotFoundException e) {
37944
1153fab98d25 8149843: StandardJavaFileManager should provide a way to get paths from strings
jjg
parents: 37848
diff changeset
  1712
                    modules = systemJavaHome.resolve("modules");
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1713
                    if (!Files.exists(modules))
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1714
                        throw new IOException("can't find system classes", e);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1715
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1716
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1717
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1718
            moduleTable = new ModuleTable();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1719
            try (DirectoryStream<Path> stream = Files.newDirectoryStream(modules, Files::isDirectory)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1720
                for (Path entry : stream) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1721
                    String moduleName = entry.getFileName().toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1722
                    String name = location.getName() + "[" + moduleName + "]";
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1723
                    ModuleLocationHandler h = new ModuleLocationHandler(this,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1724
                            name, moduleName, Collections.singletonList(entry), false);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1725
                    moduleTable.add(h);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1726
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1727
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1728
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1729
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1730
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1731
    private class PatchModulesLocationHandler extends BasicLocationHandler {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1732
        private final ModuleTable moduleTable = new ModuleTable();
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1733
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1734
        PatchModulesLocationHandler() {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1735
            super(StandardLocation.PATCH_MODULE_PATH, Option.PATCH_MODULE);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1736
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1737
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1738
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1739
        boolean handleOption(Option option, String value) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1740
            if (!options.contains(option)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1741
                return false;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1742
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1743
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1744
            moduleTable.clear();
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1745
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1746
            // Allow an extended syntax for --patch-module consisting of a series
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1747
            // of values separated by NULL characters. This is to facilitate
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1748
            // supporting deferred file manager options on the command line.
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1749
            // See Option.PATCH_MODULE for the code that composes these multiple
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1750
            // values.
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1751
            for (String v : value.split("\0")) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1752
                int eq = v.indexOf('=');
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1753
                if (eq > 0) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1754
                    String moduleName = v.substring(0, eq);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1755
                    SearchPath mPatchPath = new SearchPath()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1756
                            .addFiles(v.substring(eq + 1));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1757
                    String name = location.getName() + "[" + moduleName + "]";
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1758
                    ModuleLocationHandler h = new ModuleLocationHandler(this, name,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1759
                            moduleName, mPatchPath, false);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1760
                    moduleTable.add(h);
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1761
                } else {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1762
                    // Should not be able to get here;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1763
                    // this should be caught and handled in Option.PATCH_MODULE
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1764
                    log.error(Errors.LocnInvalidArgForXpatch(value));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1765
                }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1766
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1767
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1768
            return true;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1769
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1770
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1771
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1772
        boolean isSet() {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1773
            return !moduleTable.isEmpty();
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1774
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1775
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1776
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1777
        Collection<Path> getPaths() {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1778
            throw new UnsupportedOperationException();
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1779
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1780
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1781
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1782
        void setPaths(Iterable<? extends Path> files) throws IOException {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1783
            throw new UnsupportedOperationException();
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1784
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1785
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1786
        @Override // defined by LocationHandler
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1787
        void setPathsForModule(String moduleName, Iterable<? extends Path> files) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1788
            throw new UnsupportedOperationException(); // not yet
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1789
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1790
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1791
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1792
        Location getLocationForModule(String name) throws IOException {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1793
            return moduleTable.get(name);
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1794
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1795
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1796
        @Override
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1797
        Location getLocationForModule(Path file) throws IOException {
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1798
            return moduleTable.get(file);
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1799
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1800
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1801
        @Override
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1802
        Iterable<Set<Location>> listLocationsForModules() throws IOException {
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1803
            return Collections.singleton(moduleTable.locations());
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1804
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1805
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1806
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1807
    Map<Location, LocationHandler> handlersForLocation;
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 10819
diff changeset
  1808
    Map<Option, LocationHandler> handlersForOption;
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1809
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1810
    void initHandlers() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22153
diff changeset
  1811
        handlersForLocation = new HashMap<>();
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22153
diff changeset
  1812
        handlersForOption = new EnumMap<>(Option.class);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1813
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1814
        BasicLocationHandler[] handlers = {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1815
            new BootClassPathLocationHandler(),
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1816
            new ClassPathLocationHandler(),
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1817
            new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCE_PATH),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1818
            new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSOR_PATH),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1819
            new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, Option.PROCESSOR_MODULE_PATH),
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1820
            new OutputLocationHandler(StandardLocation.CLASS_OUTPUT, Option.D),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1821
            new OutputLocationHandler(StandardLocation.SOURCE_OUTPUT, Option.S),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1822
            new OutputLocationHandler(StandardLocation.NATIVE_HEADER_OUTPUT, Option.H),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1823
            new ModuleSourcePathLocationHandler(),
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1824
            new PatchModulesLocationHandler(),
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1825
            new ModulePathLocationHandler(StandardLocation.UPGRADE_MODULE_PATH, Option.UPGRADE_MODULE_PATH),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 40302
diff changeset
  1826
            new ModulePathLocationHandler(StandardLocation.MODULE_PATH, Option.MODULE_PATH),
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1827
            new SystemModulesLocationHandler(),
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1828
        };
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1829
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1830
        for (BasicLocationHandler h : handlers) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1831
            handlersForLocation.put(h.location, h);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1832
            for (Option o : h.options) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1833
                handlersForOption.put(o, h);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1834
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
        }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1836
    }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1837
29780
8f8e54a1fa20 8076420: Consolidate javac file handling in javac.file package
jjg
parents: 29291
diff changeset
  1838
    boolean handleOption(Option option, String value) {
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1839
        LocationHandler h = handlersForOption.get(option);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43771
diff changeset
  1840
        return (h == null ? false : h.handleOption(option, value));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1841
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1842
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1843
    boolean hasLocation(Location location) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1844
        LocationHandler h = getHandler(location);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1845
        return (h == null ? false : h.isSet());
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1846
    }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1847
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
  1848
    Collection<Path> getLocation(Location location) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1849
        LocationHandler h = getHandler(location);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1850
        return (h == null ? null : h.getPaths());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1851
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
  1853
    Path getOutputLocation(Location location) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1854
        if (!location.isOutputLocation()) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1855
            throw new IllegalArgumentException();
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1856
        }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1857
        LocationHandler h = getHandler(location);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1858
        return ((OutputLocationHandler) h).outputDir;
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1859
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1860
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
  1861
    void setLocation(Location location, Iterable<? extends Path> files) throws IOException {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1862
        LocationHandler h = getHandler(location);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1863
        if (h == null) {
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1864
            if (location.isOutputLocation()) {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1865
                h = new OutputLocationHandler(location);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1866
            } else {
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1867
                h = new SimpleLocationHandler(location);
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1868
            }
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1869
            handlersForLocation.put(location, h);
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1870
        }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1871
        h.setPaths(files);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1872
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1873
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1874
    Location getLocationForModule(Location location, String name) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1875
        LocationHandler h = getHandler(location);
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1876
        return (h == null ? null : h.getLocationForModule(name));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1877
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1878
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1879
    Location getLocationForModule(Location location, Path file) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1880
        LocationHandler h = getHandler(location);
44063
5f0cf4126949 8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents: 44021
diff changeset
  1881
        return (h == null ? null : h.getLocationForModule(file));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1882
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1883
44019
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1884
    void setLocationForModule(Location location, String moduleName,
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1885
            Iterable<? extends Path> files) throws IOException {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1886
        LocationHandler h = getHandler(location);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1887
        if (h == null) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1888
            if (location.isOutputLocation()) {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1889
                h = new OutputLocationHandler(location);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1890
            } else {
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1891
                h = new ModulePathLocationHandler(location);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1892
            }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1893
            handlersForLocation.put(location, h);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1894
        }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1895
        h.setPathsForModule(moduleName, files);
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1896
    }
284fa2ebd030 8173914: StandardJavaFileManager.setLocationForModule
jjg
parents: 43772
diff changeset
  1897
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1898
    String inferModuleName(Location location) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1899
        LocationHandler h = getHandler(location);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1900
        return (h == null ? null : h.inferModuleName());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1901
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1902
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1903
    Iterable<Set<Location>> listLocationsForModules(Location location) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1904
        LocationHandler h = getHandler(location);
42261
bb52b5514ad5 8163190: Clarify JavaFileManager use of \"module location\"
jjg
parents: 41861
diff changeset
  1905
        return (h == null ? null : h.listLocationsForModules());
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1906
    }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1907
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1908
    protected LocationHandler getHandler(Location location) {
29291
076c277565f7 8073550: java* tools: replace obj.getClass hacks with Assert.checkNonNull or Objects.requireNonNull
mcimadamore
parents: 29053
diff changeset
  1909
        Objects.requireNonNull(location);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1910
        return (location instanceof LocationHandler)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1911
                ? (LocationHandler) location
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1912
                : handlersForLocation.get(location);
10818
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1913
    }
e95eb04c68cc 7104039: refactor/cleanup javac Paths class
jjg
parents: 10813
diff changeset
  1914
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1915
    /**
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1916
     * Is this the name of an archive file?
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1917
     */
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
  1918
    private boolean isArchive(Path file) {
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
  1919
        String n = StringUtils.toLowerCase(file.getFileName().toString());
1208
5072b0dd3d52 6743107: clean up use of static caches in file manager
jjg
parents: 735
diff changeset
  1920
        return fsInfo.isFile(file)
24897
655b72d7b96e 7026941: 199: path options ignored when reusing filemanager across tasks
jjg
parents: 22163
diff changeset
  1921
                && (n.endsWith(".jar") || n.endsWith(".zip"));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1922
    }
4937
2fc03fb01efa 6927061: Refactor apt implemenation to use code from JSR 269
darcy
parents: 4548
diff changeset
  1923
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1924
    static Path normalize(Path p) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1925
        try {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1926
            return p.toRealPath();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1927
        } catch (IOException e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1928
            return p.toAbsolutePath().normalize();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1929
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 34752
diff changeset
  1930
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1931
}