From ac50274742dc9431da2669348102ad5f0cf200aa Mon Sep 17 00:00:00 2001
From: jcater <jcater@google.com>
Date: Tue, 1 May 2018 20:33:18 -0700
Subject: Clean up code that directly imports nested classes like Builder,
 Entry, etc.

PiperOrigin-RevId: 195040539
GitOrigin-RevId: 0a57d3dcb1cc014d65dbeb604035bb34a7191e29
Change-Id: I78ff7b0f225fbdcdeed44145fe0e28ffc0e4c197
---
 .../build/android/desugar/dependencies/MetadataCollector.java        | 5 ++---
 .../google/devtools/common/options/processor/OptionProcessor.java    | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java b/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
index 732ef50..448ccab 100644
--- a/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
+++ b/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.android.desugar.proto.DesugarDeps.Dependency;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.DesugarDepsInfo;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceDetails;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceWithCompanion;
-import com.google.devtools.build.android.desugar.proto.DesugarDeps.Type;
 import javax.annotation.Nullable;
 
 /** Dependency collector that emits collected metadata as a {@link DesugarDepsInfo} proto. */
@@ -82,7 +81,7 @@ public final class MetadataCollector implements DependencyCollector {
     return DesugarDepsInfo.getDefaultInstance().equals(result) ? null : result.toByteArray();
   }
 
-  private static Type wrapType(String internalName) {
-    return Type.newBuilder().setBinaryName(internalName).build();
+  private static DesugarDeps.Type wrapType(String internalName) {
+    return DesugarDeps.Type.newBuilder().setBinaryName(internalName).build();
   }
 }
\ No newline at end of file
diff --git a/java/com/google/devtools/common/options/processor/OptionProcessor.java b/java/com/google/devtools/common/options/processor/OptionProcessor.java
index 0f1989c..485efcd 100644
--- a/java/com/google/devtools/common/options/processor/OptionProcessor.java
+++ b/java/com/google/devtools/common/options/processor/OptionProcessor.java
@@ -26,7 +26,7 @@ import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -107,7 +107,7 @@ public final class OptionProcessor extends AbstractProcessor {
     builder.put(long.class, typeUtils.getPrimitiveType(TypeKind.LONG));
     primitiveTypeMap = builder.build();
 
-    for (Entry<Class<?>, Converter<?>> entry : Converters.DEFAULT_CONVERTERS.entrySet()) {
+    for (Map.Entry<Class<?>, Converter<?>> entry : Converters.DEFAULT_CONVERTERS.entrySet()) {
       Class<?> converterClass = entry.getKey();
       String typeName = converterClass.getCanonicalName();
       TypeElement typeElement = elementUtils.getTypeElement(typeName);
-- 
cgit v1.2.3