6597471: unused imports in javax.tools.JavaCompiler

6597531: unused imports and unused private const. in com.sun.tools.javac.Server.java

Reviewed-by: mcimadamore
This commit is contained in:
Davide Angelocola 2008-08-29 11:10:12 -07:00 committed by Jonathan Gibbons
parent fc7983c405
commit 39d8c22579
25 changed files with 0 additions and 76 deletions

View file

@ -25,9 +25,6 @@
package com.sun.tools.javac; package com.sun.tools.javac;
import com.sun.tools.javac.main.JavacOption.Option;
import com.sun.tools.javac.main.RecognizedOptions.GrumpyHelper;
import com.sun.tools.javac.main.RecognizedOptions;
import java.io.*; import java.io.*;
import java.net.*; import java.net.*;
import java.util.*; import java.util.*;

View file

@ -25,41 +25,14 @@
package com.sun.tools.javac.api; package com.sun.tools.javac.api;
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.util.Iterator;
import javax.lang.model.element.Element; import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
import javax.tools.JavaFileObject;
import com.sun.source.tree.Tree;
import com.sun.source.util.SourcePositions;
import com.sun.source.util.TreePath;
import com.sun.source.util.Trees;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Enter;
import com.sun.tools.javac.comp.Env; import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.comp.MemberEnter;
import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCExpression;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.TreeCopier;
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeMaker;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
import static com.sun.source.tree.Tree.Kind.*;
/** /**

View file

@ -29,7 +29,6 @@ import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.tools.JavaFileObject.Kind; import javax.tools.JavaFileObject.Kind;

View file

@ -30,7 +30,6 @@ import java.util.Map;
import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.AnnotationValueVisitor; import javax.lang.model.element.AnnotationValueVisitor;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.type.DeclaredType; import javax.lang.model.type.DeclaredType;
import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.*;

View file

@ -25,11 +25,8 @@
package com.sun.tools.javac.code; package com.sun.tools.javac.code;
import javax.lang.model.element.Element;
import javax.lang.model.type.*;
import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Symbol.*;
import javax.lang.model.element.Element;
import javax.lang.model.type.*; import javax.lang.model.type.*;

View file

@ -31,7 +31,6 @@ import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.List;
import com.sun.tools.javac.jvm.ClassReader; import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javac.comp.Infer;
import com.sun.tools.javac.comp.Check; import com.sun.tools.javac.comp.Check;
import static com.sun.tools.javac.code.Type.*; import static com.sun.tools.javac.code.Type.*;

View file

@ -26,7 +26,6 @@
package com.sun.tools.javac.comp; package com.sun.tools.javac.comp;
import java.util.*; import java.util.*;
import java.util.Set;
import javax.tools.JavaFileObject; import javax.tools.JavaFileObject;
import javax.tools.JavaFileManager; import javax.tools.JavaFileManager;
@ -43,7 +42,6 @@ import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*; import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
/** This class enters symbols for all encountered definitions into /** This class enters symbols for all encountered definitions into
* the symbol table. The pass consists of two phases, organized as * the symbol table. The pass consists of two phases, organized as

View file

@ -25,7 +25,6 @@
package com.sun.tools.javac.comp; package com.sun.tools.javac.comp;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.tree.*; import com.sun.tools.javac.tree.*;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;

View file

@ -31,8 +31,6 @@ import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.util.JCDiagnostic; import com.sun.tools.javac.util.JCDiagnostic;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*; import static com.sun.tools.javac.code.TypeTags.*;
/** Helper class for type parameter inference, used by the attribution phase. /** Helper class for type parameter inference, used by the attribution phase.

View file

@ -25,7 +25,6 @@
package com.sun.tools.javac.jvm; package com.sun.tools.javac.jvm;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Symbol.*;
@ -33,7 +32,6 @@ import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.jvm.Code.*; import com.sun.tools.javac.jvm.Code.*;
import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree;
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.jvm.ByteCodes.*; import static com.sun.tools.javac.jvm.ByteCodes.*;
/** A helper class for code generation. Items are objects /** A helper class for code generation. Items are objects
@ -449,9 +447,7 @@ public class Items {
Item invoke() { Item invoke() {
MethodType mtype = (MethodType)member.erasure(types); MethodType mtype = (MethodType)member.erasure(types);
int argsize = Code.width(mtype.argtypes);
int rescode = Code.typecode(mtype.restype); int rescode = Code.typecode(mtype.restype);
int sdiff = Code.width(rescode) - argsize;
code.emitInvokestatic(pool.put(member), mtype); code.emitInvokestatic(pool.put(member), mtype);
return stackItem[rescode]; return stackItem[rescode];
} }

View file

@ -27,9 +27,7 @@ package com.sun.tools.javac.jvm;
import java.util.*; import java.util.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type;
/** An internal structure that corresponds to the constant pool of a classfile. /** An internal structure that corresponds to the constant pool of a classfile.
* *

View file

@ -38,12 +38,10 @@ import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer;
import javax.lang.model.SourceVersion; import javax.lang.model.SourceVersion;
import static com.sun.tools.javac.main.OptionName.*; import static com.sun.tools.javac.main.OptionName.*;

View file

@ -25,7 +25,6 @@
package com.sun.tools.javac.model; package com.sun.tools.javac.model;
import com.sun.tools.javac.util.*;
import java.util.AbstractList; import java.util.AbstractList;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;

View file

@ -25,7 +25,6 @@
package com.sun.tools.javac.parser; package com.sun.tools.javac.parser;
import java.io.*;
import java.nio.*; import java.nio.*;
import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.*;

View file

@ -29,8 +29,6 @@ import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.TreeInfo; import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.util.Position;
import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.tree.JCTree.*; import static com.sun.tools.javac.tree.JCTree.*;

View file

@ -34,18 +34,14 @@ import javax.lang.model.element.Element;
import java.util.*; import java.util.*;
import java.io.Closeable; import java.io.Closeable;
import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.FilterOutputStream; import java.io.FilterOutputStream;
import java.io.Reader; import java.io.Reader;
import java.io.Writer; import java.io.Writer;
import java.io.FilterWriter; import java.io.FilterWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import javax.tools.FileObject;
import javax.tools.*; import javax.tools.*;
import static java.util.Collections.*; import static java.util.Collections.*;

View file

@ -27,15 +27,12 @@ package com.sun.tools.javac.processing;
import com.sun.tools.javac.model.JavacElements; import com.sun.tools.javac.model.JavacElements;
import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.*;
import com.sun.tools.javac.comp.*;
import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.Position;
import javax.lang.model.element.*; import javax.lang.model.element.*;
import javax.tools.JavaFileObject; import javax.tools.JavaFileObject;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import javax.annotation.processing.*; import javax.annotation.processing.*;
import java.util.*;
/** /**
* An implementation of the Messager built on top of log. * An implementation of the Messager built on top of log.

View file

@ -26,8 +26,6 @@
package com.sun.tools.javac.processing; package com.sun.tools.javac.processing;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.comp.*;
import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.*;
import javax.annotation.processing.*; import javax.annotation.processing.*;
import javax.lang.model.element.*; import javax.lang.model.element.*;

View file

@ -32,7 +32,6 @@ import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.element.NestingKind.*; import static javax.lang.model.element.NestingKind.*;
import javax.lang.model.type.*; import javax.lang.model.type.*;
import javax.lang.model.util.*; import javax.lang.model.util.*;
import static javax.lang.model.util.ElementFilter.*;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Writer; import java.io.Writer;

View file

@ -32,10 +32,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
/** /**
* Utility class to determine if a service can be found on the * Utility class to determine if a service can be found on the

View file

@ -39,7 +39,6 @@ import com.sun.tools.javac.jvm.Pool;
import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Pair; import com.sun.tools.javac.util.Pair;
import com.sun.tools.javac.util.Name;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -47,7 +46,6 @@ import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Properties;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.Set; import java.util.Set;

View file

@ -27,9 +27,7 @@ package com.sun.tools.javac.tree;
import java.util.*; import java.util.*;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;
import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeKind;
@ -41,7 +39,6 @@ import com.sun.tools.javac.util.List;
import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Scope; import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Symbol.*;
import com.sun.source.tree.Tree;
import com.sun.source.tree.*; import com.sun.source.tree.*;
import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.BoundKind.*;

View file

@ -25,12 +25,10 @@
package com.sun.tools.javac.tree; package com.sun.tools.javac.tree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.*; import com.sun.source.tree.*;
import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer; import com.sun.tools.javac.util.ListBuffer;
import java.util.Map;
/** /**
* Creates a copy of a tree, using a given TreeMaker. * Creates a copy of a tree, using a given TreeMaker.

View file

@ -35,7 +35,6 @@ import com.sun.tools.javac.code.*;
import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Flags.*;
import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
/** Utility class containing inspector methods for trees. /** Utility class containing inspector methods for trees.
* *

View file

@ -25,7 +25,6 @@
package com.sun.tools.javac.util; package com.sun.tools.javac.util;
import com.sun.tools.javac.Main;
import java.util.*; import java.util.*;
/** /**