langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
author chegar
Wed, 03 Dec 2014 19:28:40 +0000
changeset 27858 443efec4bf09
parent 27579 d1a63c99cdd5
parent 27857 7e913a535736
child 29842 826ac2519523
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     1
/*
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     2
 * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     4
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    10
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    15
 * accompanied this code).
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    16
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    20
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    23
 * questions.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    24
 */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    25
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    26
package com.sun.tools.javac.code;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    27
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    28
import java.io.*;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    29
import java.util.EnumSet;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    30
import java.util.HashMap;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    31
import java.util.Map;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    32
import java.util.Set;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    33
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    34
import javax.lang.model.SourceVersion;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    35
import javax.tools.JavaFileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    36
import javax.tools.JavaFileManager.Location;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    37
import javax.tools.JavaFileObject;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    38
import javax.tools.StandardJavaFileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    39
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
    40
import com.sun.tools.javac.code.Scope.WriteableScope;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    41
import com.sun.tools.javac.code.Symbol.*;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    42
import com.sun.tools.javac.code.Symbol.ClassSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    43
import com.sun.tools.javac.code.Symbol.Completer;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    44
import com.sun.tools.javac.code.Symbol.CompletionFailure;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    45
import com.sun.tools.javac.code.Symbol.PackageSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    46
import com.sun.tools.javac.code.Symbol.TypeSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    47
import com.sun.tools.javac.comp.Annotate;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    48
import com.sun.tools.javac.file.JRTIndex;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    49
import com.sun.tools.javac.file.JavacFileManager;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    50
import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    51
import com.sun.tools.javac.jvm.ClassReader;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    52
import com.sun.tools.javac.jvm.Profile;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    53
import com.sun.tools.javac.util.*;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    54
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    55
import static javax.tools.StandardLocation.*;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    56
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    57
import static com.sun.tools.javac.code.Flags.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
    58
import static com.sun.tools.javac.code.Kinds.Kind.*;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    59
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    60
import static com.sun.tools.javac.main.Option.*;
27857
7e913a535736 7101822: Compiling depends on order of imports
jlahoda
parents: 27224
diff changeset
    61
import com.sun.tools.javac.util.Dependencies.CompletionCause;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    62
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    63
/**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    64
 *  This class provides operations to locate class definitions
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    65
 *  from the source and class files on the paths provided to javac.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    66
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    67
 *  <p><b>This is NOT part of any supported API.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    68
 *  If you write code that depends on this, you do so at your own risk.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    69
 *  This code and its internal interfaces are subject to change or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    70
 *  deletion without notice.</b>
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    71
 */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    72
public class ClassFinder {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    73
    /** The context key for the class finder. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    74
    protected static final Context.Key<ClassFinder> classFinderKey = new Context.Key<>();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    75
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    76
    ClassReader reader;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    77
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    78
    Annotate annotate;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    79
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    80
    /** Switch: verbose output.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    81
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    82
    boolean verbose;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    83
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    84
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    85
     * Switch: cache completion failures unless -XDdev is used
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    86
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    87
    private boolean cacheCompletionFailure;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    88
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    89
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    90
     * Switch: prefer source files instead of newer when both source
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    91
     * and class are available
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    92
     **/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    93
    protected boolean preferSource;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    94
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    95
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    96
     * Switch: Search classpath and sourcepath for classes before the
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    97
     * bootclasspath
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    98
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    99
    protected boolean userPathsFirst;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   100
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   101
    /** The log to use for verbose output
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   102
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   103
    final Log log;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   104
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   105
    /** The symbol table. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   106
    Symtab syms;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   107
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   108
    /** The name table. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   109
    final Names names;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   110
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   111
    /** Force a completion failure on this name
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   112
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   113
    final Name completionFailureName;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   114
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   115
    /** Access to files
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   116
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   117
    private final JavaFileManager fileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   118
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   119
    /** Dependency tracker
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   120
     */
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   121
    private final Dependencies dependencies;
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   122
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   123
    /** Factory for diagnostics
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   124
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   125
    JCDiagnostic.Factory diagFactory;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   126
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   127
    /** Can be reassigned from outside:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   128
     *  the completer to be used for ".java" files. If this remains unassigned
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   129
     *  ".java" files will not be loaded.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   130
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   131
    public Completer sourceCompleter = null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   132
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   133
    /** The path name of the class file currently being read.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   134
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   135
    protected JavaFileObject currentClassFile = null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   136
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   137
    /** The class or method currently being read.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   138
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   139
    protected Symbol currentOwner = null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   140
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   141
    /**
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   142
     * The currently selected profile.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   143
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   144
    private final Profile profile;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   145
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   146
    /**
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   147
     * Use direct access to the JRTIndex to access the temporary
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   148
     * replacement for the info that used to be in ct.sym.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   149
     * In time, this will go away and be replaced by the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   150
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   151
    private final JRTIndex jrtIndex;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   152
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   153
    /**
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   154
     * Completer that delegates to the complete-method of this class.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   155
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   156
    private final Completer thisCompleter = new Completer() {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   157
        @Override
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   158
        public void complete(Symbol sym) throws CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   159
            ClassFinder.this.complete(sym);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   160
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   161
    };
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   162
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   163
    public Completer getCompleter() {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   164
        return thisCompleter;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   165
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   166
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   167
    /** Get the ClassFinder instance for this invocation. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   168
    public static ClassFinder instance(Context context) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   169
        ClassFinder instance = context.get(classFinderKey);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   170
        if (instance == null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   171
            instance = new ClassFinder(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   172
        return instance;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   173
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   174
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   175
    /** Construct a new class reader. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   176
    protected ClassFinder(Context context) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   177
        context.put(classFinderKey, this);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   178
        reader = ClassReader.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   179
        names = Names.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   180
        syms = Symtab.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   181
        fileManager = context.get(JavaFileManager.class);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   182
        dependencies = Dependencies.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   183
        if (fileManager == null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   184
            throw new AssertionError("FileManager initialization error");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   185
        diagFactory = JCDiagnostic.Factory.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   186
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   187
        log = Log.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   188
        annotate = Annotate.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   189
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   190
        Options options = Options.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   191
        verbose = options.isSet(VERBOSE);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   192
        cacheCompletionFailure = options.isUnset("dev");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   193
        preferSource = "source".equals(options.get("-Xprefer"));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   194
        userPathsFirst = options.isSet(XXUSERPATHSFIRST);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   195
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   196
        completionFailureName =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   197
            options.isSet("failcomplete")
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   198
            ? names.fromString(options.get("failcomplete"))
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   199
            : null;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   200
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   201
        // Temporary, until more info is available from the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   202
        boolean useCtProps;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   203
        JavaFileManager fm = context.get(JavaFileManager.class);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   204
        if (fm instanceof JavacFileManager) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   205
            JavacFileManager jfm = (JavacFileManager) fm;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   206
            useCtProps = jfm.isDefaultBootClassPath() && jfm.isSymbolFileEnabled();
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   207
        } else if (fm.getClass().getName().equals("com.sun.tools.sjavac.comp.SmartFileManager")) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   208
            useCtProps = !options.isSet("ignore.symbol.file");
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   209
        } else {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   210
            useCtProps = false;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   211
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   212
        jrtIndex = useCtProps && JRTIndex.isAvailable() ? JRTIndex.getSharedInstance() : null;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   213
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   214
        profile = Profile.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   215
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   216
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   217
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   218
/************************************************************************
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   219
 * Temporary ct.sym replacement
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   220
 *
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   221
 * The following code is a temporary substitute for the ct.sym mechanism
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   222
 * used in JDK 6 thru JDK 8.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   223
 * This mechanism will eventually be superseded by the Jigsaw module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   224
 ***********************************************************************/
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   225
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   226
    /**
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   227
     * Returns any extra flags for a class symbol.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   228
     * This information used to be provided using private annotations
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   229
     * in the class file in ct.sym; in time, this information will be
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   230
     * available from the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   231
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   232
    long getSupplementaryFlags(ClassSymbol c) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   233
        if (jrtIndex == null || !jrtIndex.isInJRT(c.classfile)) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   234
            return 0;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   235
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   236
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   237
        if (supplementaryFlags == null) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   238
            supplementaryFlags = new HashMap<>();
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   239
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   240
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   241
        Long flags = supplementaryFlags.get(c.packge());
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   242
        if (flags == null) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   243
            long newFlags = 0;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   244
            try {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   245
                JRTIndex.CtSym ctSym = jrtIndex.getCtSym(c.packge().flatName());
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   246
                Profile minProfile = Profile.DEFAULT;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   247
                if (ctSym.proprietary)
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   248
                    newFlags |= PROPRIETARY;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   249
                if (ctSym.minProfile != null)
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   250
                    minProfile = Profile.lookup(ctSym.minProfile);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   251
                if (profile != Profile.DEFAULT && minProfile.value > profile.value) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   252
                    newFlags |= NOT_IN_PROFILE;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   253
                }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   254
            } catch (IOException ignore) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   255
            }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   256
            supplementaryFlags.put(c.packge(), flags = newFlags);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   257
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   258
        return flags;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   259
    }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   260
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   261
    private Map<PackageSymbol, Long> supplementaryFlags;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   262
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   263
/************************************************************************
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   264
 * Loading Classes
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   265
 ***********************************************************************/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   266
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   267
    /** Completion for classes to be loaded. Before a class is loaded
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   268
     *  we make sure its enclosing class (if any) is loaded.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   269
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   270
    private void complete(Symbol sym) throws CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   271
        if (sym.kind == TYP) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   272
            try {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   273
                ClassSymbol c = (ClassSymbol) sym;
27857
7e913a535736 7101822: Compiling depends on order of imports
jlahoda
parents: 27224
diff changeset
   274
                dependencies.push(c, CompletionCause.CLASS_READER);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   275
                c.members_field = new Scope.ErrorScope(c); // make sure it's always defined
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   276
                annotate.enterStart();
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   277
                try {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   278
                    completeOwners(c.owner);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   279
                    completeEnclosing(c);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   280
                } finally {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   281
                    // The flush needs to happen only after annotations
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   282
                    // are filled in.
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   283
                    annotate.enterDoneWithoutFlush();
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   284
                }
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   285
                fillIn(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   286
            } finally {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   287
                dependencies.pop();
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   288
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   289
        } else if (sym.kind == PCK) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   290
            PackageSymbol p = (PackageSymbol)sym;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   291
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   292
                fillIn(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   293
            } catch (IOException ex) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   294
                throw new CompletionFailure(sym, ex.getLocalizedMessage()).initCause(ex);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   295
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   296
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   297
        if (!reader.filling)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   298
            annotate.flush(); // finish attaching annotations
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   299
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   300
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   301
    /** complete up through the enclosing package. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   302
    private void completeOwners(Symbol o) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   303
        if (o.kind != PCK) completeOwners(o.owner);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   304
        o.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   305
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   306
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   307
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   308
     * Tries to complete lexically enclosing classes if c looks like a
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   309
     * nested class.  This is similar to completeOwners but handles
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   310
     * the situation when a nested class is accessed directly as it is
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   311
     * possible with the Tree API or javax.lang.model.*.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   312
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   313
    private void completeEnclosing(ClassSymbol c) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   314
        if (c.owner.kind == PCK) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   315
            Symbol owner = c.owner;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   316
            for (Name name : Convert.enclosingCandidates(Convert.shortName(c.name))) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   317
                Symbol encl = owner.members().findFirst(name);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   318
                if (encl == null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   319
                    encl = syms.classes.get(TypeSymbol.formFlatName(name, owner));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   320
                if (encl != null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   321
                    encl.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   322
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   323
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   324
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   325
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   326
    /** Fill in definition of class `c' from corresponding class or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   327
     *  source file.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   328
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   329
    private void fillIn(ClassSymbol c) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   330
        if (completionFailureName == c.fullname) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   331
            throw new CompletionFailure(c, "user-selected completion failure by class name");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   332
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   333
        currentOwner = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   334
        JavaFileObject classfile = c.classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   335
        if (classfile != null) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   336
            JavaFileObject previousClassFile = currentClassFile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   337
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   338
                if (reader.filling) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   339
                    Assert.error("Filling " + classfile.toUri() + " during " + previousClassFile);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   340
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   341
                currentClassFile = classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   342
                if (verbose) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   343
                    log.printVerbose("loading", currentClassFile.toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   344
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   345
                if (classfile.getKind() == JavaFileObject.Kind.CLASS) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   346
                    reader.readClassFile(c);
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   347
                    c.flags_field |= getSupplementaryFlags(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   348
                } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   349
                    if (sourceCompleter != null) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   350
                        sourceCompleter.complete(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   351
                    } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   352
                        throw new IllegalStateException("Source completer required to read "
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   353
                                                        + classfile.toUri());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   354
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   355
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   356
            } finally {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   357
                currentClassFile = previousClassFile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   358
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   359
        } else {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   360
            throw classFileNotFound(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   361
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   362
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   363
    // where
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   364
        private CompletionFailure classFileNotFound(ClassSymbol c) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   365
            JCDiagnostic diag =
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   366
                diagFactory.fragment("class.file.not.found", c.flatname);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   367
            return newCompletionFailure(c, diag);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   368
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   369
        /** Static factory for CompletionFailure objects.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   370
         *  In practice, only one can be used at a time, so we share one
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   371
         *  to reduce the expense of allocating new exception objects.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   372
         */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   373
        private CompletionFailure newCompletionFailure(TypeSymbol c,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   374
                                                       JCDiagnostic diag) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   375
            if (!cacheCompletionFailure) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   376
                // log.warning("proc.messager",
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   377
                //             Log.getLocalizedString("class.file.not.found", c.flatname));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   378
                // c.debug.printStackTrace();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   379
                return new CompletionFailure(c, diag);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   380
            } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   381
                CompletionFailure result = cachedCompletionFailure;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   382
                result.sym = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   383
                result.diag = diag;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   384
                return result;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   385
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   386
        }
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   387
        private final CompletionFailure cachedCompletionFailure =
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   388
            new CompletionFailure(null, (JCDiagnostic) null);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   389
        {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   390
            cachedCompletionFailure.setStackTrace(new StackTraceElement[0]);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   391
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   392
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   393
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   394
    /** Load a toplevel class with given fully qualified name
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   395
     *  The class is entered into `classes' only if load was successful.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   396
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   397
    public ClassSymbol loadClass(Name flatname) throws CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   398
        boolean absent = syms.classes.get(flatname) == null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   399
        ClassSymbol c = syms.enterClass(flatname);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   400
        if (c.members_field == null && c.completer != null) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   401
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   402
                c.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   403
            } catch (CompletionFailure ex) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   404
                if (absent) syms.classes.remove(flatname);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   405
                throw ex;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   406
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   407
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   408
        return c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   409
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   410
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   411
/************************************************************************
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   412
 * Loading Packages
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   413
 ***********************************************************************/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   414
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   415
    /** Include class corresponding to given class file in package,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   416
     *  unless (1) we already have one the same kind (.class or .java), or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   417
     *         (2) we have one of the other kind, and the given class file
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   418
     *             is older.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   419
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   420
    protected void includeClassFile(PackageSymbol p, JavaFileObject file) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   421
        if ((p.flags_field & EXISTS) == 0)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   422
            for (Symbol q = p; q != null && q.kind == PCK; q = q.owner)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   423
                q.flags_field |= EXISTS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   424
        JavaFileObject.Kind kind = file.getKind();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   425
        int seen;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   426
        if (kind == JavaFileObject.Kind.CLASS)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   427
            seen = CLASS_SEEN;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   428
        else
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   429
            seen = SOURCE_SEEN;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   430
        String binaryName = fileManager.inferBinaryName(currentLoc, file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   431
        int lastDot = binaryName.lastIndexOf(".");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   432
        Name classname = names.fromString(binaryName.substring(lastDot + 1));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   433
        boolean isPkgInfo = classname == names.package_info;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   434
        ClassSymbol c = isPkgInfo
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   435
            ? p.package_info
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   436
            : (ClassSymbol) p.members_field.findFirst(classname);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   437
        if (c == null) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   438
            c = syms.enterClass(classname, p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   439
            if (c.classfile == null) // only update the file if's it's newly created
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   440
                c.classfile = file;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   441
            if (isPkgInfo) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   442
                p.package_info = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   443
            } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   444
                if (c.owner == p)  // it might be an inner class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   445
                    p.members_field.enter(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   446
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   447
        } else if (!preferCurrent && c.classfile != null && (c.flags_field & seen) == 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   448
            // if c.classfile == null, we are currently compiling this class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   449
            // and no further action is necessary.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   450
            // if (c.flags_field & seen) != 0, we have already encountered
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   451
            // a file of the same kind; again no further action is necessary.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   452
            if ((c.flags_field & (CLASS_SEEN | SOURCE_SEEN)) != 0)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   453
                c.classfile = preferredFileObject(file, c.classfile);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   454
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   455
        c.flags_field |= seen;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   456
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   457
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   458
    /** Implement policy to choose to derive information from a source
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   459
     *  file or a class file when both are present.  May be overridden
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   460
     *  by subclasses.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   461
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   462
    protected JavaFileObject preferredFileObject(JavaFileObject a,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   463
                                           JavaFileObject b) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   464
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   465
        if (preferSource)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   466
            return (a.getKind() == JavaFileObject.Kind.SOURCE) ? a : b;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   467
        else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   468
            long adate = a.getLastModified();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   469
            long bdate = b.getLastModified();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   470
            // 6449326: policy for bad lastModifiedTime in ClassReader
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   471
            //assert adate >= 0 && bdate >= 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   472
            return (adate > bdate) ? a : b;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   473
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   474
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   475
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   476
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   477
     * specifies types of files to be read when filling in a package symbol
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   478
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   479
    protected EnumSet<JavaFileObject.Kind> getPackageFileKinds() {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   480
        return EnumSet.of(JavaFileObject.Kind.CLASS, JavaFileObject.Kind.SOURCE);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   481
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   482
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   483
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   484
     * this is used to support javadoc
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   485
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   486
    protected void extraFileActions(PackageSymbol pack, JavaFileObject fe) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   487
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   488
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   489
    protected Location currentLoc; // FIXME
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   490
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   491
    private boolean verbosePath = true;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   492
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   493
    // Set to true when the currently selected file should be kept
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   494
    private boolean preferCurrent;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   495
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   496
    /** Load directory of package into members scope.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   497
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   498
    private void fillIn(PackageSymbol p) throws IOException {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   499
        if (p.members_field == null)
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   500
            p.members_field = WriteableScope.create(p);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   501
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   502
        preferCurrent = false;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   503
        if (userPathsFirst) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   504
            scanUserPaths(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   505
            preferCurrent = true;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   506
            scanPlatformPath(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   507
        } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   508
            scanPlatformPath(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   509
            scanUserPaths(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   510
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   511
        verbosePath = false;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   512
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   513
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   514
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   515
     * Scans class path and source path for files in given package.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   516
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   517
    private void scanUserPaths(PackageSymbol p) throws IOException {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   518
        Set<JavaFileObject.Kind> kinds = getPackageFileKinds();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   519
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   520
        Set<JavaFileObject.Kind> classKinds = EnumSet.copyOf(kinds);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   521
        classKinds.remove(JavaFileObject.Kind.SOURCE);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   522
        boolean wantClassFiles = !classKinds.isEmpty();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   523
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   524
        Set<JavaFileObject.Kind> sourceKinds = EnumSet.copyOf(kinds);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   525
        sourceKinds.remove(JavaFileObject.Kind.CLASS);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   526
        boolean wantSourceFiles = !sourceKinds.isEmpty();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   527
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   528
        boolean haveSourcePath = fileManager.hasLocation(SOURCE_PATH);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   529
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   530
        if (verbose && verbosePath) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   531
            if (fileManager instanceof StandardJavaFileManager) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   532
                StandardJavaFileManager fm = (StandardJavaFileManager)fileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   533
                if (haveSourcePath && wantSourceFiles) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   534
                    List<File> path = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   535
                    for (File file : fm.getLocation(SOURCE_PATH)) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   536
                        path = path.prepend(file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   537
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   538
                    log.printVerbose("sourcepath", path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   539
                } else if (wantSourceFiles) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   540
                    List<File> path = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   541
                    for (File file : fm.getLocation(CLASS_PATH)) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   542
                        path = path.prepend(file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   543
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   544
                    log.printVerbose("sourcepath", path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   545
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   546
                if (wantClassFiles) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   547
                    List<File> path = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   548
                    for (File file : fm.getLocation(PLATFORM_CLASS_PATH)) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   549
                        path = path.prepend(file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   550
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   551
                    for (File file : fm.getLocation(CLASS_PATH)) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   552
                        path = path.prepend(file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   553
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   554
                    log.printVerbose("classpath",  path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   555
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   556
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   557
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   558
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   559
        String packageName = p.fullname.toString();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   560
        if (wantSourceFiles && !haveSourcePath) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   561
            fillIn(p, CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   562
                   fileManager.list(CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   563
                                    packageName,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   564
                                    kinds,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   565
                                    false));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   566
        } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   567
            if (wantClassFiles)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   568
                fillIn(p, CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   569
                       fileManager.list(CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   570
                                        packageName,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   571
                                        classKinds,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   572
                                        false));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   573
            if (wantSourceFiles)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   574
                fillIn(p, SOURCE_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   575
                       fileManager.list(SOURCE_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   576
                                        packageName,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   577
                                        sourceKinds,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   578
                                        false));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   579
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   580
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   581
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   582
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   583
     * Scans platform class path for files in given package.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   584
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   585
    private void scanPlatformPath(PackageSymbol p) throws IOException {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   586
        fillIn(p, PLATFORM_CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   587
               fileManager.list(PLATFORM_CLASS_PATH,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   588
                                p.fullname.toString(),
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   589
                                EnumSet.of(JavaFileObject.Kind.CLASS),
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   590
                                false));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   591
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   592
    // where
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   593
        private void fillIn(PackageSymbol p,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   594
                            Location location,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   595
                            Iterable<JavaFileObject> files)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   596
        {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   597
            currentLoc = location;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   598
            for (JavaFileObject fo : files) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   599
                switch (fo.getKind()) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   600
                case CLASS:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   601
                case SOURCE: {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   602
                    // TODO pass binaryName to includeClassFile
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   603
                    String binaryName = fileManager.inferBinaryName(currentLoc, fo);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   604
                    String simpleName = binaryName.substring(binaryName.lastIndexOf(".") + 1);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   605
                    if (SourceVersion.isIdentifier(simpleName) ||
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   606
                        simpleName.equals("package-info"))
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   607
                        includeClassFile(p, fo);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   608
                    break;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   609
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   610
                default:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   611
                    extraFileActions(p, fo);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   612
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   613
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   614
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   615
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   616
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   617
     * Used for bad class definition files, such as bad .class files or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   618
     * for .java files with unexpected package or class names.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   619
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   620
    public static class BadClassFile extends CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   621
        private static final long serialVersionUID = 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   622
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   623
        public BadClassFile(TypeSymbol sym, JavaFileObject file, JCDiagnostic diag,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   624
                JCDiagnostic.Factory diagFactory) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   625
            super(sym, createBadClassFileDiagnostic(file, diag, diagFactory));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   626
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   627
        // where
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   628
        private static JCDiagnostic createBadClassFileDiagnostic(
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   629
                JavaFileObject file, JCDiagnostic diag, JCDiagnostic.Factory diagFactory) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   630
            String key = (file.getKind() == JavaFileObject.Kind.SOURCE
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   631
                        ? "bad.source.file.header" : "bad.class.file.header");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   632
            return diagFactory.fragment(key, file, diag);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   633
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   634
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   635
}