Revert "Use JVisitorWithAnnotation where it is required"

This reverts commit b47317da877e24e31f4d94cc470ad4ad2d03e4c1.

Change-Id: Ice850c09b067d00f0b8ba3d6d9a83a894740ea8d

7 files changed, 14 insertions, 14 deletions

diff --git a/jack/src/com/android/jack/backend/dex/TypeReferenceCollector.java b/jack/src/com/android/jack/backend/dex/TypeReferenceCollector.java
index 6e22c5f..dbc3e86 100644
--- a/jack/src/com/android/jack/backend/dex/TypeReferenceCollector.java
+++ b/jack/src/com/android/jack/backend/dex/TypeReferenceCollector.java
@@ -29,7 +29,7 @@ import com.android.jack.ir.ast.JMethod;
 import com.android.jack.ir.ast.JMethodCall;
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.ir.ast.JType;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.ir.ast.marker.ThrownExceptionMarker;
 
 import javax.annotation.Nonnull;
@@ -37,7 +37,7 @@ import javax.annotation.Nonnull;
 /**
  * A visitor for collecting types referenced directly by a class or interface.
  */
-public abstract class TypeReferenceCollector extends JVisitorWithAnnotation {
+public abstract class TypeReferenceCollector extends JVisitor {
 
   protected abstract void collect(@Nonnull JType type);
 
diff --git a/jack/src/com/android/jack/frontend/ParentSetter.java b/jack/src/com/android/jack/frontend/ParentSetter.java
index 1f0f359..076b601 100644
--- a/jack/src/com/android/jack/frontend/ParentSetter.java
+++ b/jack/src/com/android/jack/frontend/ParentSetter.java
@@ -17,7 +17,7 @@
 package com.android.jack.frontend;
 
 import com.android.jack.ir.ast.JNode;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 
 import java.util.Stack;
 
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
 /**
  * Parent setter.
  */
-public class ParentSetter extends JVisitorWithAnnotation {
+public class ParentSetter extends JVisitor {
 
   public ParentSetter() {
     super(false /* needLoading */);
diff --git a/jack/src/com/android/jack/frontend/TypeDuplicateRemoverChecker.java b/jack/src/com/android/jack/frontend/TypeDuplicateRemoverChecker.java
index f0991c2..2239cbe 100644
--- a/jack/src/com/android/jack/frontend/TypeDuplicateRemoverChecker.java
+++ b/jack/src/com/android/jack/frontend/TypeDuplicateRemoverChecker.java
@@ -28,7 +28,7 @@ import com.android.jack.ir.ast.JInterface;
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.ir.ast.JType;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.lookup.JPhantomLookup;
 import com.android.jack.transformations.SanityChecks;
 import com.android.sched.item.Description;
@@ -51,7 +51,7 @@ import javax.annotation.Nonnull;
 @Support(SanityChecks.class)
 public class TypeDuplicateRemoverChecker implements RunnableSchedulable<JSession> {
 
-  private static class Visitor extends JVisitorWithAnnotation {
+  private static class Visitor extends JVisitor {
 
     @Nonnull
     private final JSession session;
diff --git a/jack/src/com/android/jack/scheduling/marker/collector/SubTreeMarkersCollector.java b/jack/src/com/android/jack/scheduling/marker/collector/SubTreeMarkersCollector.java
index 38b01f7..87179f9 100644
--- a/jack/src/com/android/jack/scheduling/marker/collector/SubTreeMarkersCollector.java
+++ b/jack/src/com/android/jack/scheduling/marker/collector/SubTreeMarkersCollector.java
@@ -19,7 +19,7 @@ package com.android.jack.scheduling.marker.collector;
 import com.android.jack.ir.ast.JIfStatement;
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.ir.ast.JSwitchStatement;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.sched.marker.Marker;
 import com.android.sched.util.config.DefaultFactory;
 import com.android.sched.util.config.ReflectDefaultCtorFactory;
@@ -41,7 +41,7 @@ public class SubTreeMarkersCollector<T extends Marker> {
   @Nonnull
   private final Class<? extends SubTreeMarkers<T>> subTreeMarkersClass;
 
-  private class MarkerCollectorVisitor extends JVisitorWithAnnotation {
+  private class MarkerCollectorVisitor extends JVisitor {
 
     @Nonnull
     private final JNode root;
diff --git a/jack/src/com/android/jack/shrob/obfuscation/annotation/LineNumberRemover.java b/jack/src/com/android/jack/shrob/obfuscation/annotation/LineNumberRemover.java
index d9fd9de..b2b4703 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/annotation/LineNumberRemover.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/annotation/LineNumberRemover.java
@@ -18,7 +18,7 @@ package com.android.jack.shrob.obfuscation.annotation;
 
 import com.android.jack.ir.ast.JDefinedClassOrInterface;
 import com.android.jack.ir.ast.JNode;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.ir.sourceinfo.SourceInfoFactory;
 import com.android.sched.item.Description;
@@ -34,7 +34,7 @@ import javax.annotation.Nonnull;
 @Support(RemoveLineNumber.class)
 public class LineNumberRemover implements RunnableSchedulable<JDefinedClassOrInterface> {
 
-  private static class Visitor extends JVisitorWithAnnotation {
+  private static class Visitor extends JVisitor {
     @Nonnull
     private final SourceInfoFactory sourceInfoFactory;
 
diff --git a/jack/src/com/android/jack/transformations/parent/AstChecker.java b/jack/src/com/android/jack/transformations/parent/AstChecker.java
index f44de49..a74d897 100644
--- a/jack/src/com/android/jack/transformations/parent/AstChecker.java
+++ b/jack/src/com/android/jack/transformations/parent/AstChecker.java
@@ -18,7 +18,7 @@ package com.android.jack.transformations.parent;
 
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.ir.ast.JSession;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.transformations.SanityChecks;
 import com.android.sched.item.Description;
 import com.android.sched.schedulable.RunnableSchedulable;
@@ -35,7 +35,7 @@ import javax.annotation.Nonnull;
 @Support(SanityChecks.class)
 public class AstChecker implements RunnableSchedulable<JSession> {
 
-  static class AstCheckerVisitor extends JVisitorWithAnnotation {
+  static class AstCheckerVisitor extends JVisitor {
     @Nonnull
     private final Stack<JNode> nodes = new Stack<JNode>();
 
diff --git a/jack/src/com/android/jack/transformations/parent/TypeAstChecker.java b/jack/src/com/android/jack/transformations/parent/TypeAstChecker.java
index 2637d6b..f52a669 100644
--- a/jack/src/com/android/jack/transformations/parent/TypeAstChecker.java
+++ b/jack/src/com/android/jack/transformations/parent/TypeAstChecker.java
@@ -19,7 +19,7 @@ package com.android.jack.transformations.parent;
 import com.android.jack.ir.ast.JDefinedClassOrInterface;
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.ir.ast.JSession;
-import com.android.jack.ir.ast.JVisitorWithAnnotation;
+import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.transformations.SanityChecks;
 import com.android.sched.item.Description;
 import com.android.sched.schedulable.RunnableSchedulable;
@@ -37,7 +37,7 @@ import javax.annotation.Nonnull;
 @Support(SanityChecks.class)
 public class TypeAstChecker implements RunnableSchedulable<JDefinedClassOrInterface> {
 
-  private static class Visitor extends JVisitorWithAnnotation {
+  private static class Visitor extends JVisitor {
     @Nonnull
     private final Stack<JNode> nodes = new Stack<JNode>();