Simplify handling of the empty package in NameTable and PackagePrefixes.

Change on 2015/10/02 by kstanger <kstanger@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=104518667
google · Oct 6, 2015 · 9281f6c · 9281f6c
1 parent 07f2d0f
commit 9281f6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java b/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.Sets;
 import com.google.devtools.j2objc.Options;
 import com.google.devtools.j2objc.ast.CompilationUnit;
-import com.google.devtools.j2objc.ast.PackageDeclaration;
 import com.google.devtools.j2objc.types.GeneratedVariableBinding;
 import com.google.devtools.j2objc.types.IOSMethodBinding;
 import com.google.devtools.j2objc.types.PointerTypeBinding;
@@ -924,9 +923,7 @@ private String getFullNameInner(ITypeBinding binding) {
     }
 
     // Use camel-cased package+class name.
-    IPackageBinding pkg = binding.getPackage();
+    return getPrefix(binding.getPackage()) + binding.getName();
-    String pkgName = pkg != null ? getPrefix(pkg) : "";
-    return pkgName + binding.getName();
   }
 
   private static String getTypeSubName(ITypeBinding binding) {
@@ -949,12 +946,8 @@ private static boolean isReservedName(String name) {
   }
 
   public static String getMainTypeFullName(CompilationUnit unit) {
-    PackageDeclaration pkg = unit.getPackage();
+    return unit.getNameTable().getPrefix(unit.getPackage().getPackageBinding())
-    if (pkg.isDefaultPackage()) {
+        + unit.getMainTypeName();
-      return unit.getMainTypeName();
-    } else {
-      return unit.getNameTable().getPrefix(pkg.getPackageBinding()) + unit.getMainTypeName();
-    }
   }
 
   public String getPrefix(IPackageBinding packageBinding) {

diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/PackagePrefixes.java b/translator/src/main/java/com/google/devtools/j2objc/util/PackagePrefixes.java
@@ -111,6 +111,9 @@ public boolean hasPrefix(String packageName) {
      * prefix is created from the package name.
      */
     public String getPrefix(IPackageBinding packageBinding) {
+      if (packageBinding == null) {
+        return "";
+      }
       String packageName = packageBinding.getName();
       if (hasPrefix(packageName)) {
         return getPrefix(packageName);
@@ -124,7 +127,7 @@ public String getPrefix(IPackageBinding packageBinding) {
         }
       }
 
-      String prefix = getPrefixFromPackageInfoSource(packageBinding);
+      String prefix = getPrefixFromPackageInfoSource(packageName);
       if (prefix == null) {
         prefix = getPrefixFromPackageInfoClass(packageName);
       }
@@ -138,15 +141,9 @@ public String getPrefix(IPackageBinding packageBinding) {
     /**
      * Check if there is a package-info.java source file with a prefix annotation.
      */
-    private String getPrefixFromPackageInfoSource(IPackageBinding packageBinding) {
+    private String getPrefixFromPackageInfoSource(String packageName) {
       try {
-        String qualifiedName = "package-info";
+        InputFile file = FileUtil.findOnSourcePath(packageName + ".package-info");
-        String packageName = packageBinding.getName();
-        // Path will be null if this is the empty package.
-        if (packageName != null) {
-          qualifiedName = packageName + '.' + qualifiedName;
-        }
-        InputFile file = FileUtil.findOnSourcePath(qualifiedName);
         if (file != null) {
           String pkgInfo = FileUtil.readFile(file);
           int i = pkgInfo.indexOf("@ObjectiveCName");
@@ -176,11 +173,7 @@ private String getPrefixFromPackageInfoSource(IPackageBinding packageBinding) {
     private String getPrefixFromPackageInfoClass(String packageName) {
       final String[] result = new String[1];
       try {
-        String qualifiedName = "package-info";
+        InputFile file = FileUtil.findOnClassPath(packageName + ".package-info");
-        if (packageName != null) {
-          qualifiedName = packageName + '.' + qualifiedName;
-        }
-        InputFile file = FileUtil.findOnClassPath(qualifiedName);
         if (file != null) {
           ClassReader classReader = new ClassReader(file.getInputStream());
           classReader.accept(new ClassVisitor(Opcodes.ASM5) {