Fixes translation when an interface is used as a type literal value in an annotation.

	Change on 2014/10/23 by kstanger <[email protected]>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=78355295

Author: kstanger

translator/src/main/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGenerator.java

@@ -669,7 +669,7 @@ private void printAnnotationProperties(List<AnnotationTypeMemberDeclaration> mem
   private void printTypeAnnotationsMethod(AbstractTypeDeclaration decl) {
     List<Annotation> runtimeAnnotations = TreeUtil.getRuntimeAnnotationsList(decl.getAnnotations());
     if (runtimeAnnotations.size() > 0) {
-      println("+ (IOSObjectArray *)__annotations {");
+      println("\n+ (IOSObjectArray *)__annotations {");
       printAnnotationCreate(runtimeAnnotations);
     }
   }
@@ -679,7 +679,7 @@ private void printMethodAnnotationMethods(Iterable<MethodDeclaration> methods) {
       List<Annotation> runtimeAnnotations =
           TreeUtil.getRuntimeAnnotationsList(method.getAnnotations());
       if (runtimeAnnotations.size() > 0) {
-        printf("+ (IOSObjectArray *)__annotations_%s {\n", methodKey(method.getMethodBinding()));
+        printf("\n+ (IOSObjectArray *)__annotations_%s {\n", methodKey(method.getMethodBinding()));
         printAnnotationCreate(runtimeAnnotations);
       }
       printParameterAnnotationMethods(method);
@@ -731,7 +731,7 @@ private void printFieldAnnotationMethods(AbstractTypeDeclaration node) {
           TreeUtil.getRuntimeAnnotationsList(field.getAnnotations());
       if (!runtimeAnnotations.isEmpty()) {
         for (VariableDeclarationFragment var : field.getFragments()) {
-          printf("+ (IOSObjectArray *)__annotations_%s_ {\n", var.getName().getIdentifier());
+          printf("\n+ (IOSObjectArray *)__annotations_%s_ {\n", var.getName().getIdentifier());
           printAnnotationCreate(runtimeAnnotations);
         }
       }
@@ -742,7 +742,7 @@ private void printAnnotationCreate(List<Annotation> runtimeAnnotations) {
     print("  return [IOSObjectArray arrayWithObjects:(id[]) { ");
     printAnnotations(runtimeAnnotations);
     printf(" } count:%d type:[IOSClass "
-        + "classWithProtocol:@protocol(JavaLangAnnotationAnnotation)]];\n}\n\n",
+        + "classWithProtocol:@protocol(JavaLangAnnotationAnnotation)]];\n}\n",
         runtimeAnnotations.size());
   }
 
@@ -794,7 +794,11 @@ private void printAnnotationValue(Object value) {
       printf("%s_get_%s()", NameTable.getFullName(declaringClass), var.getName());
     } else if (value instanceof ITypeBinding) {
       ITypeBinding type = (ITypeBinding) value;
-      printf("[[%s class] getClass]", NameTable.getFullName(type));
+      if (type.isInterface()) {
+        printf("[IOSClass classWithProtocol:@protocol(%s)]", NameTable.getFullName(type));
+      } else {
+        printf("[[%s class] getClass]", NameTable.getFullName(type));
+      }
     } else if (value instanceof String) {
       StringLiteral node = new StringLiteral((String) value);
       print(StatementGenerator.generateStringLiteral(node));

translator/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGeneratorTest.java

@@ -778,4 +778,13 @@ public void testInitializeNotInClassExtension() throws IOException {
     assertNotInTranslation(translation, "+ (void)initialize OBJC_METHOD_FAMILY_NONE;");
     assertOccurrences(translation, "+ (void)initialize", 1);
   }
+
+  public void testInterfaceTypeLiteralAsAnnotationValue() throws IOException {
+    addSourceFile(
+        "import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME)"
+        + " @interface Foo { Class<?> value(); }", "Foo.java");
+    String translation = translateSourceFile(
+        "@Foo(CharSequence.class) class Test {}", "Test", "Test.m");
+    assertTranslation(translation, "[IOSClass classWithProtocol:@protocol(JavaLangCharSequence)]");
+  }
 }