Rename JAnnotation to JAnnotationType

- Rename also JLookup.getAnnotation to JLookup.getAnnotationType,
JDefinedAnnotation to JDefinedAnnotationType and JPhantomAnnotation
to JPhantomAnnotationType

Change-Id: Ic9f2890201167f0dc437a1446faad4bd9fbec72f

1 files changed, 8 insertions, 8 deletions

diff --git a/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java b/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
index 3a600ec3..cb38d2af 100644
--- a/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
+++ b/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
@@ -19,7 +19,7 @@ package com.android.jack.preprocessor;
 import com.android.jack.Main;
 import com.android.jack.Options;
 import com.android.jack.TestTools;
-import com.android.jack.ir.ast.JAnnotation;
+import com.android.jack.ir.ast.JAnnotationType;
 import com.android.jack.ir.ast.JDefinedClassOrInterface;
 import com.android.jack.ir.ast.JMethod;
 import com.android.jack.ir.ast.JSession;
@@ -62,28 +62,28 @@ public class PreProcessorTest {
       }
     }
 
-    JAnnotation installerAnnotation =
-        session.getPhantomLookup().getAnnotation(
+    JAnnotationType installerAnnotationType =
+        session.getPhantomLookup().getAnnotationType(
             "Lcom/android/jack/preprocessor/test001/jack/MultiDexInstaller;");
     JNodeLookup lookup = session.getLookup();
     {
       JDefinedClassOrInterface coi = lookup.getClass(
           "Lcom/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1;");
-      Assert.assertFalse(coi.getAnnotations(installerAnnotation).isEmpty());
+      Assert.assertFalse(coi.getAnnotations(installerAnnotationType).isEmpty());
       for (JMethod method : coi.getMethods()) {
         if (method.getName().equals("noAnnotation")) {
-          Assert.assertTrue(method.getAnnotations(installerAnnotation).isEmpty());
+          Assert.assertTrue(method.getAnnotations(installerAnnotationType).isEmpty());
         } else {
-          Assert.assertFalse(method.getAnnotations(installerAnnotation).isEmpty());
+          Assert.assertFalse(method.getAnnotations(installerAnnotationType).isEmpty());
         }
       }
     }
     {
       JDefinedClassOrInterface coi = lookup.getClass(
           "Lcom/android/jack/preprocessor/test001/jack/app1/NoAnnotation;");
-      Assert.assertTrue(coi.getAnnotations(installerAnnotation).isEmpty());
+      Assert.assertTrue(coi.getAnnotations(installerAnnotationType).isEmpty());
       for (JMethod method : coi.getMethods()) {
-        Assert.assertTrue(method.getAnnotations(installerAnnotation).isEmpty());
+        Assert.assertTrue(method.getAnnotations(installerAnnotationType).isEmpty());
       }
     }