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