Cleanup: close jar files when finished reading them, remove unused

code and import, always use @autoreleasepool (iOS 4 didn't support it, but is now two releases back), fixed test script. Change on 2013/04/01 by tball <tball@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=44690933
ajrulez · Apr 10, 2013 · 5bcaadc · 5bcaadc
1 parent 1d00f55
commit 5bcaadc
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 96 deletions.
diff --git a/scripts/runtests.sh b/scripts/runtests.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
@@ -20,7 +20,7 @@
 # directory.
 
 if [ $# -eq 0 ]; then
-  TESTS=$(/usr/bin/find build/tests -perm 755 -a -type f)
+  TESTS=$(/usr/bin/find build_result/tests -perm 755 -a -type f)
 else
   TESTS=$*
 fi

diff --git a/translator/src/main/java/com/google/devtools/j2objc/J2ObjC.java b/translator/src/main/java/com/google/devtools/j2objc/J2ObjC.java
@@ -708,29 +708,36 @@ private static void initPlugins(String[] pluginPaths, String pluginOptionString)
     JarFileLoader classLoader = new JarFileLoader();
     for (String path : pluginPaths) {
       if (path.endsWith(".jar")) {
-        JarInputStream jarStream = new JarInputStream(new FileInputStream(path));
-        classLoader.addJarFile(new File(path).getAbsolutePath());
-
-        JarEntry entry;
-        while ((entry = jarStream.getNextJarEntry()) != null) {
-          String entryName = entry.getName();
-          if (!entryName.endsWith(".class")) {
-            continue;
-          }
+        JarInputStream jarStream = null;
+        try {
+          jarStream = new JarInputStream(new FileInputStream(path));
+          classLoader.addJarFile(new File(path).getAbsolutePath());
+
+          JarEntry entry;
+          while ((entry = jarStream.getNextJarEntry()) != null) {
+            String entryName = entry.getName();
+            if (!entryName.endsWith(".class")) {
+              continue;
+            }
 
-          String className =
-              entryName.replaceAll("/", "\\.").substring(0, entryName.length() - ".class".length());
+            String className =
+                entryName.replaceAll("/", "\\.").substring(0, entryName.length() - ".class".length());
 
-          try {
-            Class<?> clazz = classLoader.loadClass(className);
-            if (Plugin.class.isAssignableFrom(clazz)) {
-              Constructor<?> cons = clazz.getDeclaredConstructor();
-              Plugin plugin = (Plugin) cons.newInstance();
-              plugin.initPlugin(pluginOptionString);
-              Options.getPlugins().add(plugin);
+            try {
+              Class<?> clazz = classLoader.loadClass(className);
+              if (Plugin.class.isAssignableFrom(clazz)) {
+                Constructor<?> cons = clazz.getDeclaredConstructor();
+                Plugin plugin = (Plugin) cons.newInstance();
+                plugin.initPlugin(pluginOptionString);
+                Options.getPlugins().add(plugin);
+              }
+            } catch (Exception e) {
+              throw new IOException("plugin exception: ", e);
             }
-          } catch (Exception e) {
-            throw new IOException("plugin exception: ", e);
+          }
+        } finally {
+          if (jarStream != null) {
+            jarStream.close();
           }
         }
       } else {

diff --git a/translator/src/main/java/com/google/devtools/j2objc/gen/StatementGenerator.java b/translator/src/main/java/com/google/devtools/j2objc/gen/StatementGenerator.java
@@ -833,12 +833,7 @@ private String getRightShiftType(Expression node) {
   @Override
   public boolean visit(Block node) {
     if (Types.hasAutoreleasePool(node)) {
-      if (Options.useReferenceCounting()) {
-        // TODO(user): use @autoreleasepool like ARC when iOS 5 is minimum.
-        buffer.append("{\nNSAutoreleasePool *pool__ = [[NSAutoreleasePool alloc] init];\n");
-      } else if (Options.useARC()) {
-        buffer.append("{\n@autoreleasepool ");
-      }
+      buffer.append("{\n@autoreleasepool ");
     }
     buffer.append("{\n");
     List<?> stmts = node.statements();
@@ -863,11 +858,7 @@ public boolean visit(Block node) {
     printStatements(stmts);
     buffer.append("}\n");
     if (Types.hasAutoreleasePool(node)) {
-      if (Options.useReferenceCounting()) {
-        buffer.append("[pool__ release];\n}\n");
-      } else if (Options.useARC()) {
-        buffer.append("}\n");
-      }
+      buffer.append("}\n");
     }
     return false;
   }
@@ -1078,17 +1069,9 @@ public boolean visit(FieldAccess node) {
   @SuppressWarnings("unchecked")
   @Override
   public boolean visit(ForStatement node) {
-    boolean emitAutoreleasePool = false;
     buffer.append("for (");
     for (Iterator<Expression> it = node.initializers().iterator(); it.hasNext(); ) {
       Expression next = it.next();
-      if (next instanceof VariableDeclarationExpression) {
-        List<VariableDeclarationFragment> vars =
-            ((VariableDeclarationExpression) next).fragments();
-        for (VariableDeclarationFragment fragment : vars) {
-          emitAutoreleasePool |= Types.hasAutoreleasePoolAnnotation(Types.getBinding(fragment));
-        }
-      }
       next.accept(this);
       if (it.hasNext()) {
         buffer.append(", ");

diff --git a/translator/src/main/java/com/google/devtools/j2objc/translate/AnonymousClassConverter.java b/translator/src/main/java/com/google/devtools/j2objc/translate/AnonymousClassConverter.java
@@ -504,19 +504,6 @@ private GeneratedMethodBinding addDefaultConstructor(
     return binding;
   }
 
-  private boolean argsMatch(List<Expression> invocationArguments, ITypeBinding[] parameterTypes) {
-    if (invocationArguments.size() != parameterTypes.length) {
-      return false;
-    }
-    for (int i = 0; i < parameterTypes.length; i++) {
-      ITypeBinding argType = Types.getTypeBinding(invocationArguments.get(i));
-      if (!parameterTypes[i].isEqualTo(argType)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   private IMethodBinding findSuperConstructorBinding(ITypeBinding clazz,
       List<Expression> superArgs) {
     if (clazz == null) {

diff --git a/translator/src/main/java/com/google/devtools/j2objc/translate/GwtConverter.java b/translator/src/main/java/com/google/devtools/j2objc/translate/GwtConverter.java
@@ -19,7 +19,6 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.collect.Sets;
 import com.google.devtools.j2objc.J2ObjC;
-import com.google.devtools.j2objc.types.GeneratedMethodBinding;
 import com.google.devtools.j2objc.types.NodeCopier;
 import com.google.devtools.j2objc.types.Types;
 import com.google.devtools.j2objc.util.ErrorReportingASTVisitor;

diff --git a/translator/src/main/java/com/google/devtools/j2objc/translate/InnerClassExtractor.java b/translator/src/main/java/com/google/devtools/j2objc/translate/InnerClassExtractor.java
@@ -170,7 +170,6 @@ private void addOuterFields(AbstractTypeDeclaration node) {
 
     // Ensure that the new outer field does not conflict with a field in a superclass.
     ITypeBinding superClazz = clazz.getSuperclass();
-    ITypeBinding superDeclaringClazz = superClazz.getDeclaringClass();
     int suffix = 0;
     while (superClazz.getDeclaringClass() != null) {
       if (!Modifier.isStatic(superClazz.getModifiers())) {

diff --git a/...r/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGeneratorTest.java b/...r/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGeneratorTest.java
@@ -457,9 +457,8 @@ public void testAutoreleasePoolMethod() throws IOException {
         "}",
         "Test", "Test.m");
     assertTranslation(translation, "- (void)foo {\n" +
-        "  NSAutoreleasePool *pool__ = [[NSAutoreleasePool alloc] init];\n" +
-        "  {\n  }\n" +
-        "  [pool__ release];\n" +
+        "  @autoreleasepool {\n" +
+        "  }\n" +
         "}");
   }
 
@@ -494,9 +493,7 @@ public void testAutoreleasePoolAnonymousClassMethod() throws IOException {
         "}",
         "Test", "Test.m");
     assertTranslation(translation, "- (void)apply {\n" +
-        "  NSAutoreleasePool *pool__ = [[NSAutoreleasePool alloc] init];\n" +
-        "  {\n  }\n" +
-        "  [pool__ release];\n" +
+        "  @autoreleasepool {\n  }\n" +
         "}");
   }
 

diff --git a/translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java b/translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java
@@ -1204,9 +1204,7 @@ public void testAutoreleasePoolForStatement() throws IOException {
         "}",
         "Test", "Test.m");
     assertTranslation(translation, "  for (int i = 0; i < 10; i++) {\n" +
-        "    NSAutoreleasePool *pool__ = [[NSAutoreleasePool alloc] init];\n" +
-        "    {\n    }\n" +
-        "    [pool__ release];\n" +
+        "    @autoreleasepool {\n    }\n" +
         "  }");
   }
 
@@ -1220,8 +1218,7 @@ public void testAutoreleasePoolEnhancedForStatement() throws IOException {
         "  }" +
         "}",
         "Test", "Test.m");
-    assertTranslation(translation, "NSAutoreleasePool *pool__ = [[NSAutoreleasePool alloc] init]");
-    assertTranslation(translation, "[pool__ release]");
+    assertTranslation(translation, "@autoreleasepool");
   }
 
   public void testARCAutoreleasePoolForStatement() throws IOException {

diff --git a/translator/src/test/java/com/google/devtools/j2objc/translate/RewriterTest.java b/translator/src/test/java/com/google/devtools/j2objc/translate/RewriterTest.java
@@ -150,35 +150,6 @@ public void testLabeledBreakWithNonBlockParent() throws IOException {
     assertTrue(((LabeledStatement) labelStmt).getBody() instanceof EmptyStatement);
   }
 
-  private int methodCount(String source, String methodName, String[] paramTypes) {
-    CompilationUnit unit = translateType("Test", source);
-    List<?> types = unit.types();
-    assertEquals(1, types.size());
-    TypeDeclaration testType = (TypeDeclaration) types.get(0);
-    MethodDeclaration[] methods = testType.getMethods();
-    int nFooMethods = 0;
-    for (MethodDeclaration m : methods) {
-      if (m.getName().getIdentifier().equals(methodName) &&
-          parametersMatch(paramTypes, m.parameters())) {
-        nFooMethods++;
-      }
-    }
-    return nFooMethods;
-  }
-
-  private boolean parametersMatch(String[] paramTypes, List<?> parameters) {
-    if (parameters.size() != paramTypes.length) {
-      return false;
-    }
-    for (int i = 0; i < paramTypes.length; i++) {
-      SingleVariableDeclaration param = (SingleVariableDeclaration) parameters.get(i);
-      if (!param.getType().toString().equals(paramTypes[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   /**
    * Verifies that abstract methods to implement an interface are added to an
    * abstract class.