some ancient stuff

Author: neocxi

annotations/src/main/java/com/google/j2objc/annotations/Library.java

@@ -8,5 +8,7 @@
   /**
    * The Library to which the annotated class belongs to
    */
-  public String value();
+  String value();
+
+  boolean useQuotes() default false;
 }

jre_emul/Classes/java/lang/reflect/Method.h

@@ -37,7 +37,6 @@
 @interface JavaLangReflectMethod : ExecutableMember {
   BOOL isStatic_;
   IOSClass *returnType_;
-  NSInvocation *invocation_;
 }
 
 + (instancetype)methodWithMethodSignature:(NSMethodSignature *)methodSignature

jre_emul/Classes/java/lang/reflect/Method.m

@@ -163,26 +163,26 @@ - (id)invokeWithId:(id)object
         @"wrong number of arguments"]);
   }
 
-  if (!invocation_) {
-    invocation_ =
-            [NSInvocation invocationWithMethodSignature:methodSignature_];
+  NSInvocation *invocation;
+  invocation =
+      [NSInvocation invocationWithMethodSignature:methodSignature_];
 #if ! __has_feature(objc_arc)
-    [invocation_ retain];
+  [invocation retain];
 #endif
-    [invocation_ setSelector:selector_];
-  }
+  [invocation setSelector:selector_];
+
   for (jint i = 0; i < nArgs; i++) {
     J2ObjcRawValue arg;
     if (![paramTypes->buffer_[i] __unboxValue:arguments->buffer_[i] toRawValue:&arg]) {
       @throw AUTORELEASE([[JavaLangIllegalArgumentException alloc] initWithNSString:
           @"argument type mismatch"]);
     }
-    [invocation_ setArgument:&arg atIndex:i + SKIPPED_ARGUMENTS];
+    [invocation setArgument:&arg atIndex:i + SKIPPED_ARGUMENTS];
   }
   if (object == nil || [object isKindOfClass:[IOSClass class]]) {
-    [invocation_ setTarget:class_.objcClass];
+    [invocation setTarget:class_.objcClass];
   } else {
-    [invocation_ setTarget:object];
+    [invocation setTarget:object];
   }
 
   IOSClass *declaringClass = [self getDeclaringClass];
@@ -194,15 +194,15 @@ - (id)invokeWithId:(id)object
     // change the object's type to the superclass.
     Class originalClass = object_setClass(object, declaringClass.objcClass);
     @try {
-      [invocation_ invoke];
+      [invocation invoke];
     }
     @catch (JavaLangThrowable *t) {
       exception = t;
     }
     object_setClass(object, originalClass);
   } else {
     @try {
-      [invocation_ invoke];
+      [invocation invoke];
     }
     @catch (JavaLangThrowable *t) {
       exception = t;
@@ -218,7 +218,7 @@ - (id)invokeWithId:(id)object
     return nil;
   }
   J2ObjcRawValue returnValue;
-  [invocation_ getReturnValue:&returnValue];
+  [invocation getReturnValue:&returnValue];
   return [returnType __boxValue:&returnValue];
 }
 
@@ -277,7 +277,6 @@ - (NSUInteger)hash {
 
 #if ! __has_feature(objc_arc)
 - (void)dealloc {
-  [invocation_ release];
   [returnType_ release];
   [super dealloc];
 }

translator/src/main/java/com/google/devtools/j2objc/types/Import.java

@@ -91,12 +91,13 @@ public class Import implements Comparable<Import> {
       "org.xmlpull",
       "sun.misc",
   });
+  private final boolean useQuotes;
 
   private Import(ITypeBinding type) {
-    this(type, false, null);
+    this(type, false, null, false);
   }
 
-  private Import(ITypeBinding type, boolean isFoundation, String foundationName) {
+  private Import(ITypeBinding type, boolean isFoundation, String foundationName, boolean useQuotes) {
     this.type = type;
     this.typeName = NameTable.getFullName(type);
     ITypeBinding mainType = type;
@@ -110,6 +111,7 @@ private Import(ITypeBinding type, boolean isFoundation, String foundationName) {
       this.importFileName = getImportFileName(mainType) + ".h";
     }
     this.isFoundation = isFoundation;
+    this.useQuotes = useQuotes;
   }
 
   public ITypeBinding getType() {
@@ -215,7 +217,11 @@ public String toString() {
 
   public String getIncludeStatement() {
     if (isFoundation) {
-     return String.format("#import <%s>", importFileName);
+      if (useQuotes) {
+        return String.format("#import \"%s\"", importFileName);
+      } else {
+        return String.format("#import <%s>", importFileName);
+      }
     } else {
       return String.format("#include \"%s\"", getImportFileName());
     }
@@ -243,7 +249,7 @@ public static void addImports(ITypeBinding binding, Collection<Import> imports)
       // this is to include the original header file
       imports.add(new Import(binding));
       // this is to include the framework header
-      imports.add(new Import(binding, true, libName));
+      imports.add(new Import(binding, true, libName, BindingUtil.extractLibraryUseQuotes(binding)));
     }
     if (BindingUtil.isAdapter(binding)) {
       return;

translator/src/main/java/com/google/devtools/j2objc/util/BindingUtil.java

@@ -497,6 +497,19 @@ public static String extractLibraryName(ITypeBinding binding) {
     }
   }
 
+  public static boolean extractLibraryUseQuotes(ITypeBinding binding) {
+    if (binding == null) {
+      return false;
+    } else {
+      IAnnotationBinding annotation = BindingUtil.getAnnotation(binding, Library.class);
+      if (annotation != null) {
+        return (Boolean) BindingUtil.getAnnotationValue(annotation, "useQuotes");
+      } else {
+        return false;
+      }
+    }
+  }
+
   public static boolean isAdapter(ITypeBinding binding) {
     if (binding == null) {
       return false;

translator/src/test/java/com/google/devtools/j2objc/SmallTests.java

@@ -143,8 +143,8 @@ public class SmallTests {
     MappedNativeMethodRemoverTest.class,
   };
 
-  private static final Class<?>[] smallTestClasses = smallTestClassesPrime;
-//  private static final Class<?>[] smallTestClasses = {MappedNativeMethodRemoverTest.class};
+//  private static final Class<?>[] smallTestClasses = smallTestClassesPrime;
+  private static final Class<?>[] smallTestClasses = {J2ObjCTest.class};
 
   public static Test suite() {
     return new TestSuite(smallTestClasses);