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