Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/Server.java	Tue Aug 26 14:52:59 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/Server.java	Fri Aug 29 11:10:12 2008 -0700
     1.3 @@ -25,9 +25,6 @@
     1.4  
     1.5  package com.sun.tools.javac;
     1.6  
     1.7 -import com.sun.tools.javac.main.JavacOption.Option;
     1.8 -import com.sun.tools.javac.main.RecognizedOptions.GrumpyHelper;
     1.9 -import com.sun.tools.javac.main.RecognizedOptions;
    1.10  import java.io.*;
    1.11  import java.net.*;
    1.12  import java.util.*;

     2.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Tue Aug 26 14:52:59 2008 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Fri Aug 29 11:10:12 2008 -0700
     2.3 @@ -25,41 +25,14 @@
     2.4  
     2.5  package com.sun.tools.javac.api;
     2.6  
     2.7 -import java.io.IOException;
     2.8 -import java.lang.ref.SoftReference;
     2.9 -import java.util.Iterator;
    2.10  
    2.11  import javax.lang.model.element.Element;
    2.12  import javax.lang.model.element.ExecutableElement;
    2.13  import javax.lang.model.element.TypeElement;
    2.14 -import javax.tools.JavaFileObject;
    2.15  
    2.16 -import com.sun.source.tree.Tree;
    2.17 -import com.sun.source.util.SourcePositions;
    2.18 -import com.sun.source.util.TreePath;
    2.19 -import com.sun.source.util.Trees;
    2.20 -import com.sun.tools.javac.code.Scope;
    2.21 -import com.sun.tools.javac.code.Symbol.ClassSymbol;
    2.22 -import com.sun.tools.javac.comp.Attr;
    2.23  import com.sun.tools.javac.comp.AttrContext;
    2.24 -import com.sun.tools.javac.comp.Enter;
    2.25  import com.sun.tools.javac.comp.Env;
    2.26 -import com.sun.tools.javac.comp.MemberEnter;
    2.27 -import com.sun.tools.javac.comp.Resolve;
    2.28 -import com.sun.tools.javac.tree.JCTree.JCClassDecl;
    2.29 -import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
    2.30 -import com.sun.tools.javac.tree.JCTree.JCExpression;
    2.31 -import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
    2.32 -import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
    2.33 -import com.sun.tools.javac.tree.JCTree;
    2.34 -import com.sun.tools.javac.tree.TreeCopier;
    2.35 -import com.sun.tools.javac.tree.TreeInfo;
    2.36 -import com.sun.tools.javac.tree.TreeMaker;
    2.37 -import com.sun.tools.javac.util.Context;
    2.38 -import com.sun.tools.javac.util.List;
    2.39 -import com.sun.tools.javac.util.Log;
    2.40  
    2.41 -import static com.sun.source.tree.Tree.Kind.*;
    2.42  
    2.43  
    2.44  /**

     3.1 --- a/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Tue Aug 26 14:52:59 2008 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Fri Aug 29 11:10:12 2008 -0700
     3.3 @@ -29,7 +29,6 @@
     3.4  import java.net.URI;
     3.5  import java.util.ArrayList;
     3.6  import java.util.Collections;
     3.7 -import java.util.Iterator;
     3.8  import java.util.List;
     3.9  import java.util.Set;
    3.10  import javax.tools.JavaFileObject.Kind;

     4.1 --- a/src/share/classes/com/sun/tools/javac/code/Attribute.java	Tue Aug 26 14:52:59 2008 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/javac/code/Attribute.java	Fri Aug 29 11:10:12 2008 -0700
     4.3 @@ -30,7 +30,6 @@
     4.4  import javax.lang.model.element.AnnotationMirror;
     4.5  import javax.lang.model.element.AnnotationValue;
     4.6  import javax.lang.model.element.AnnotationValueVisitor;
     4.7 -import javax.lang.model.element.ExecutableElement;
     4.8  import javax.lang.model.type.DeclaredType;
     4.9  import com.sun.tools.javac.code.Symbol.*;
    4.10  import com.sun.tools.javac.util.*;

     5.1 --- a/src/share/classes/com/sun/tools/javac/code/Type.java	Tue Aug 26 14:52:59 2008 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Fri Aug 29 11:10:12 2008 -0700
     5.3 @@ -25,11 +25,8 @@
     5.4  
     5.5  package com.sun.tools.javac.code;
     5.6  
     5.7 -import javax.lang.model.element.Element;
     5.8 -import javax.lang.model.type.*;
     5.9  import com.sun.tools.javac.util.*;
    5.10  import com.sun.tools.javac.code.Symbol.*;
    5.11 -import javax.lang.model.element.Element;
    5.12  
    5.13  import javax.lang.model.type.*;
    5.14  

     6.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Aug 26 14:52:59 2008 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Fri Aug 29 11:10:12 2008 -0700
     6.3 @@ -31,7 +31,6 @@
     6.4  import com.sun.tools.javac.util.List;
     6.5  
     6.6  import com.sun.tools.javac.jvm.ClassReader;
     6.7 -import com.sun.tools.javac.comp.Infer;
     6.8  import com.sun.tools.javac.comp.Check;
     6.9  
    6.10  import static com.sun.tools.javac.code.Type.*;

     7.1 --- a/src/share/classes/com/sun/tools/javac/comp/Enter.java	Tue Aug 26 14:52:59 2008 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java	Fri Aug 29 11:10:12 2008 -0700
     7.3 @@ -26,7 +26,6 @@
     7.4  package com.sun.tools.javac.comp;
     7.5  
     7.6  import java.util.*;
     7.7 -import java.util.Set;
     7.8  import javax.tools.JavaFileObject;
     7.9  import javax.tools.JavaFileManager;
    7.10  
    7.11 @@ -43,7 +42,6 @@
    7.12  
    7.13  import static com.sun.tools.javac.code.Flags.*;
    7.14  import static com.sun.tools.javac.code.Kinds.*;
    7.15 -import static com.sun.tools.javac.code.TypeTags.*;
    7.16  
    7.17  /** This class enters symbols for all encountered definitions into
    7.18   *  the symbol table. The pass consists of two phases, organized as

     8.1 --- a/src/share/classes/com/sun/tools/javac/comp/Env.java	Tue Aug 26 14:52:59 2008 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Env.java	Fri Aug 29 11:10:12 2008 -0700
     8.3 @@ -25,7 +25,6 @@
     8.4  
     8.5  package com.sun.tools.javac.comp;
     8.6  
     8.7 -import com.sun.tools.javac.util.*;
     8.8  import com.sun.tools.javac.tree.*;
     8.9  import java.util.Iterator;
    8.10  import java.util.NoSuchElementException;

     9.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Tue Aug 26 14:52:59 2008 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Fri Aug 29 11:10:12 2008 -0700
     9.3 @@ -31,8 +31,6 @@
     9.4  import com.sun.tools.javac.code.Type.*;
     9.5  import com.sun.tools.javac.util.JCDiagnostic;
     9.6  
     9.7 -import static com.sun.tools.javac.code.Flags.*;
     9.8 -import static com.sun.tools.javac.code.Kinds.*;
     9.9  import static com.sun.tools.javac.code.TypeTags.*;
    9.10  
    9.11  /** Helper class for type parameter inference, used by the attribution phase.

    10.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Items.java	Tue Aug 26 14:52:59 2008 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java	Fri Aug 29 11:10:12 2008 -0700
    10.3 @@ -25,7 +25,6 @@
    10.4  
    10.5  package com.sun.tools.javac.jvm;
    10.6  
    10.7 -import com.sun.tools.javac.util.*;
    10.8  import com.sun.tools.javac.code.*;
    10.9  
   10.10  import com.sun.tools.javac.code.Symbol.*;
   10.11 @@ -33,7 +32,6 @@
   10.12  import com.sun.tools.javac.jvm.Code.*;
   10.13  import com.sun.tools.javac.tree.JCTree;
   10.14  
   10.15 -import static com.sun.tools.javac.code.TypeTags.*;
   10.16  import static com.sun.tools.javac.jvm.ByteCodes.*;
   10.17  
   10.18  /** A helper class for code generation. Items are objects
   10.19 @@ -449,9 +447,7 @@
   10.20  
   10.21          Item invoke() {
   10.22              MethodType mtype = (MethodType)member.erasure(types);
   10.23 -            int argsize = Code.width(mtype.argtypes);
   10.24              int rescode = Code.typecode(mtype.restype);
   10.25 -            int sdiff = Code.width(rescode) - argsize;
   10.26              code.emitInvokestatic(pool.put(member), mtype);
   10.27              return stackItem[rescode];
   10.28          }

    11.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Tue Aug 26 14:52:59 2008 -0700
    11.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Fri Aug 29 11:10:12 2008 -0700
    11.3 @@ -27,9 +27,7 @@
    11.4  
    11.5  import java.util.*;
    11.6  
    11.7 -import com.sun.tools.javac.util.*;
    11.8  import com.sun.tools.javac.code.Symbol.*;
    11.9 -import com.sun.tools.javac.code.Type;
   11.10  
   11.11  /** An internal structure that corresponds to the constant pool of a classfile.
   11.12   *

    12.1 --- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Tue Aug 26 14:52:59 2008 -0700
    12.2 +++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Fri Aug 29 11:10:12 2008 -0700
    12.3 @@ -38,12 +38,10 @@
    12.4  import java.io.File;
    12.5  import java.io.FileWriter;
    12.6  import java.io.PrintWriter;
    12.7 -import java.util.Arrays;
    12.8  import java.util.Collection;
    12.9  import java.util.EnumSet;
   12.10  import java.util.LinkedHashSet;
   12.11  import java.util.Set;
   12.12 -import java.util.StringTokenizer;
   12.13  import javax.lang.model.SourceVersion;
   12.14  
   12.15  import static com.sun.tools.javac.main.OptionName.*;

    13.1 --- a/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Tue Aug 26 14:52:59 2008 -0700
    13.2 +++ b/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Fri Aug 29 11:10:12 2008 -0700
    13.3 @@ -25,7 +25,6 @@
    13.4  
    13.5  package com.sun.tools.javac.model;
    13.6  
    13.7 -import com.sun.tools.javac.util.*;
    13.8  import java.util.AbstractList;
    13.9  import java.util.Iterator;
   13.10  import java.util.NoSuchElementException;

    14.1 --- a/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Tue Aug 26 14:52:59 2008 -0700
    14.2 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Fri Aug 29 11:10:12 2008 -0700
    14.3 @@ -25,7 +25,6 @@
    14.4  
    14.5  package com.sun.tools.javac.parser;
    14.6  
    14.7 -import java.io.*;
    14.8  import java.nio.*;
    14.9  
   14.10  import com.sun.tools.javac.util.*;

    15.1 --- a/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Tue Aug 26 14:52:59 2008 -0700
    15.2 +++ b/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Fri Aug 29 11:10:12 2008 -0700
    15.3 @@ -29,8 +29,6 @@
    15.4  import java.util.HashMap;
    15.5  import com.sun.tools.javac.tree.JCTree;
    15.6  import com.sun.tools.javac.tree.TreeInfo;
    15.7 -import com.sun.tools.javac.util.Position;
    15.8 -import com.sun.tools.javac.util.List;
    15.9  
   15.10  import static com.sun.tools.javac.tree.JCTree.*;
   15.11  

    16.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Tue Aug 26 14:52:59 2008 -0700
    16.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Fri Aug 29 11:10:12 2008 -0700
    16.3 @@ -34,18 +34,14 @@
    16.4  import java.util.*;
    16.5  
    16.6  import java.io.Closeable;
    16.7 -import java.io.File;
    16.8  import java.io.InputStream;
    16.9  import java.io.OutputStream;
   16.10 -import java.io.OutputStreamWriter;
   16.11  import java.io.FilterOutputStream;
   16.12  import java.io.Reader;
   16.13  import java.io.Writer;
   16.14  import java.io.FilterWriter;
   16.15  import java.io.PrintWriter;
   16.16  import java.io.IOException;
   16.17 -import java.net.URI;
   16.18 -import javax.tools.FileObject;
   16.19  
   16.20  import javax.tools.*;
   16.21  import static java.util.Collections.*;

    17.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Tue Aug 26 14:52:59 2008 -0700
    17.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Fri Aug 29 11:10:12 2008 -0700
    17.3 @@ -27,15 +27,12 @@
    17.4  
    17.5  import com.sun.tools.javac.model.JavacElements;
    17.6  import com.sun.tools.javac.util.*;
    17.7 -import com.sun.tools.javac.comp.*;
    17.8  import com.sun.tools.javac.tree.JCTree;
    17.9  import com.sun.tools.javac.tree.JCTree.*;
   17.10 -import com.sun.tools.javac.util.Position;
   17.11  import javax.lang.model.element.*;
   17.12  import javax.tools.JavaFileObject;
   17.13  import javax.tools.Diagnostic;
   17.14  import javax.annotation.processing.*;
   17.15 -import java.util.*;
   17.16  
   17.17  /**
   17.18   * An implementation of the Messager built on top of log.

    18.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Tue Aug 26 14:52:59 2008 -0700
    18.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Fri Aug 29 11:10:12 2008 -0700
    18.3 @@ -26,8 +26,6 @@
    18.4  package com.sun.tools.javac.processing;
    18.5  
    18.6  import java.lang.annotation.Annotation;
    18.7 -import com.sun.tools.javac.util.*;
    18.8 -import com.sun.tools.javac.comp.*;
    18.9  import com.sun.tools.javac.tree.JCTree.*;
   18.10  import javax.annotation.processing.*;
   18.11  import javax.lang.model.element.*;

    19.1 --- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Tue Aug 26 14:52:59 2008 -0700
    19.2 +++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Fri Aug 29 11:10:12 2008 -0700
    19.3 @@ -32,7 +32,6 @@
    19.4  import static javax.lang.model.element.NestingKind.*;
    19.5  import javax.lang.model.type.*;
    19.6  import javax.lang.model.util.*;
    19.7 -import static javax.lang.model.util.ElementFilter.*;
    19.8  
    19.9  import java.io.PrintWriter;
   19.10  import java.io.Writer;

    20.1 --- a/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Tue Aug 26 14:52:59 2008 -0700
    20.2 +++ b/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Fri Aug 29 11:10:12 2008 -0700
    20.3 @@ -32,10 +32,6 @@
    20.4  import java.io.InputStreamReader;
    20.5  import java.net.MalformedURLException;
    20.6  import java.net.URL;
    20.7 -import java.util.ArrayList;
    20.8 -import java.util.Iterator;
    20.9 -import java.util.List;
   20.10 -import java.util.Set;
   20.11  
   20.12  /**
   20.13   * Utility class to determine if a service can be found on the

    21.1 --- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Tue Aug 26 14:52:59 2008 -0700
    21.2 +++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Fri Aug 29 11:10:12 2008 -0700
    21.3 @@ -39,7 +39,6 @@
    21.4  import com.sun.tools.javac.processing.JavacProcessingEnvironment;
    21.5  import com.sun.tools.javac.util.List;
    21.6  import com.sun.tools.javac.util.Pair;
    21.7 -import com.sun.tools.javac.util.Name;
    21.8  
    21.9  import java.io.File;
   21.10  import java.io.IOException;
   21.11 @@ -47,7 +46,6 @@
   21.12  import java.util.EnumSet;
   21.13  import java.util.Enumeration;
   21.14  import java.util.HashSet;
   21.15 -import java.util.Properties;
   21.16  import java.util.ResourceBundle;
   21.17  import java.util.Set;
   21.18  

    22.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Tue Aug 26 14:52:59 2008 -0700
    22.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Fri Aug 29 11:10:12 2008 -0700
    22.3 @@ -27,9 +27,7 @@
    22.4  
    22.5  import java.util.*;
    22.6  
    22.7 -import java.io.File;
    22.8  import java.io.IOException;
    22.9 -import java.io.PrintWriter;
   22.10  import java.io.StringWriter;
   22.11  import javax.lang.model.element.Modifier;
   22.12  import javax.lang.model.type.TypeKind;
   22.13 @@ -41,7 +39,6 @@
   22.14  import com.sun.tools.javac.code.*;
   22.15  import com.sun.tools.javac.code.Scope;
   22.16  import com.sun.tools.javac.code.Symbol.*;
   22.17 -import com.sun.source.tree.Tree;
   22.18  import com.sun.source.tree.*;
   22.19  
   22.20  import static com.sun.tools.javac.code.BoundKind.*;

    23.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Tue Aug 26 14:52:59 2008 -0700
    23.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Fri Aug 29 11:10:12 2008 -0700
    23.3 @@ -25,12 +25,10 @@
    23.4  
    23.5  package com.sun.tools.javac.tree;
    23.6  
    23.7 -import com.sun.source.tree.Tree;
    23.8  import com.sun.source.tree.*;
    23.9  import com.sun.tools.javac.tree.JCTree.*;
   23.10  import com.sun.tools.javac.util.List;
   23.11  import com.sun.tools.javac.util.ListBuffer;
   23.12 -import java.util.Map;
   23.13  
   23.14  /**
   23.15   * Creates a copy of a tree, using a given TreeMaker.

    24.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Tue Aug 26 14:52:59 2008 -0700
    24.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Fri Aug 29 11:10:12 2008 -0700
    24.3 @@ -35,7 +35,6 @@
    24.4  import com.sun.tools.javac.tree.JCTree.*;
    24.5  
    24.6  import static com.sun.tools.javac.code.Flags.*;
    24.7 -import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
    24.8  
    24.9  /** Utility class containing inspector methods for trees.
   24.10   *

    25.1 --- a/src/share/classes/com/sun/tools/javac/util/Context.java	Tue Aug 26 14:52:59 2008 -0700
    25.2 +++ b/src/share/classes/com/sun/tools/javac/util/Context.java	Fri Aug 29 11:10:12 2008 -0700
    25.3 @@ -25,7 +25,6 @@
    25.4  
    25.5  package com.sun.tools.javac.util;
    25.6  
    25.7 -import com.sun.tools.javac.Main;
    25.8  import java.util.*;
    25.9  
   25.10  /**