Revert "Use imported classes when searching for a class reference"

Revert submission 2615972-b-270335653-doclava-search-imports

Reason for revert: DroidMonitor: Potential culprit for Bug 286398320 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Reverted changes: /q/submissionid:2615972-b-270335653-doclava-search-imports

Change-Id: Ie40feda198c79e30a906ab3db373d5f57c52a2f1

4 files changed, 2 insertions, 57 deletions

diff --git a/Android.bp b/Android.bp
index 88ef62f..3bc5dc6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,17 +79,6 @@ java_library_host {
     libs: [
         "guava",
     ],
-    javacflags: [
-        "--add-modules=jdk.compiler",
-        "--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-        "--add-modules=jdk.javadoc",
-        "--add-exports jdk.javadoc/jdk.javadoc.internal.doclets.formats.html=ALL-UNNAMED",
-        "--add-exports jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED",
-    ],
 }
 
 java_library_host {
diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
index fa04849..0b6ec3e 100644
--- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
@@ -39,12 +39,6 @@ import com.sun.javadoc.ParameterizedType;
 import com.sun.javadoc.Type;
 import com.sun.javadoc.TypeVariable;
 import com.sun.javadoc.WildcardType;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.util.Names;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.NestingKind;
@@ -53,10 +47,6 @@ import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
-import jdk.javadoc.internal.tool.DocEnvImpl;
-import jdk.javadoc.internal.tool.ToolEnvironment;
-
-import static com.sun.tools.javac.code.Kinds.Kind.*;
 
 class ClassDocImpl extends ProgramElementDocImpl<TypeElement> implements ClassDoc {
 
@@ -541,40 +531,6 @@ class ClassDocImpl extends ProgramElementDocImpl<TypeElement> implements ClassDo
         }
 
         //
-        if (! (typeElement instanceof ClassSymbol)) {
-            return null;
-        }
-        ClassSymbol tsym = (ClassSymbol)typeElement;
-        // make sure that this symbol has been completed
-        // TODO: do we need this anymore ?
-        if (tsym.completer != null) {
-            tsym.complete();
-        }
-
-        // search imports
-        if (tsym.sourcefile != null) {
-
-            ToolEnvironment toolEnv = ((DocEnvImpl)(context.environment)).toolEnv;
-            //### This information is available only for source classes.
-            Env<AttrContext> compenv = toolEnv.getEnv(tsym);
-            if (compenv == null) {
-                return null;
-            }
-            Names names = tsym.name.table.names;
-            Scope s = compenv.toplevel.namedImportScope;
-            for (Symbol sym : s.getSymbolsByName(names.fromString(className))) {
-                if (sym.kind == TYP) {
-                    return ClassDocImpl.create((TypeElement)sym, context);
-                }
-            }
-
-            s = compenv.toplevel.starImportScope;
-            for (Symbol sym : s.getSymbolsByName(names.fromString(className))) {
-                if (sym.kind == TYP) {
-                    return ClassDocImpl.create((TypeElement)sym, context);
-                }
-            }
-        }
 
         return null;
     }
diff --git a/src/com/google/doclava/FieldInfo.java b/src/com/google/doclava/FieldInfo.java
index ff0dcf9..99d208c 100644
--- a/src/com/google/doclava/FieldInfo.java
+++ b/src/com/google/doclava/FieldInfo.java
@@ -256,7 +256,7 @@ public class FieldInfo extends MemberInfo {
       } else if (c >= ' ' && c <= '~') {
         result += c;
       } else {
-        result += String.format("\\u%04x", Integer.valueOf((int) c));
+        result += String.format("\\u%04x", new Integer((int) c));
       }
     }
     return result;
diff --git a/src/com/google/doclava/apicheck/ApiFile.java b/src/com/google/doclava/apicheck/ApiFile.java
index 2f83da9..3062344 100644
--- a/src/com/google/doclava/apicheck/ApiFile.java
+++ b/src/com/google/doclava/apicheck/ApiFile.java
@@ -488,7 +488,7 @@ public class ApiFile {
           return Double.valueOf(val);
         }
       } else if ("char".equals(type)) {
-        return Integer.valueOf((char)Integer.parseInt(val));
+        return new Integer((char)Integer.parseInt(val));
       } else if ("java.lang.String".equals(type)) {
         if ("null".equals(val)) {
           return null;