Change TypeEnumerator to rely on the default behavior of the TreeScanner rather than checking the kind against an EnumSet.

cgruber · cgruber · commit f9bedfbaf956 · 2014-07-17T13:56:07.000-07:00
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=68838183
diff --git a/src/main/java/com/google/testing/compile/TypeEnumerator.java b/src/main/java/com/google/testing/compile/TypeEnumerator.java
@@ -15,16 +15,8 @@
  */
 package com.google.testing.compile;
 
-import static com.sun.source.tree.Tree.Kind.ANNOTATION_TYPE;
-import static com.sun.source.tree.Tree.Kind.CLASS;
-import static com.sun.source.tree.Tree.Kind.COMPILATION_UNIT;
-import static com.sun.source.tree.Tree.Kind.ENUM;
-import static com.sun.source.tree.Tree.Kind.EXPRESSION_STATEMENT;
-import static com.sun.source.tree.Tree.Kind.IDENTIFIER;
-import static com.sun.source.tree.Tree.Kind.INTERFACE;
-import static com.sun.source.tree.Tree.Kind.MEMBER_SELECT;
-
 import com.google.common.base.Function;
+import com.google.common.base.Objects;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -62,15 +54,9 @@ static ImmutableSet<String> getTopLevelTypes(CompilationUnitTree t) {
    */
   @SuppressWarnings("restriction") // Sun APIs usage intended
   static final class TypeScanner extends TreeScanner<Set<String>, Void> {
-
-    private static final Set<Tree.Kind> RELEVANT_KINDS = Sets.immutableEnumSet(
-        ANNOTATION_TYPE, CLASS, ENUM, COMPILATION_UNIT, EXPRESSION_STATEMENT, IDENTIFIER, INTERFACE,
-        MEMBER_SELECT);
-
     @Override
     public Set<String> scan(Tree node, Void v) {
-      return (node != null) && RELEVANT_KINDS.contains(node.getKind()) ?
-          node.accept(this, v) : ImmutableSet.<String>of();
+      return Objects.firstNonNull(super.scan(node, v), ImmutableSet.<String>of());
     }
 
     @Override
