1 files changed, 14 insertions, 33 deletions

diff --git a/src/proguard/io/DataEntryObfuscator.java b/src/proguard/io/DataEntryObfuscator.java
index 1009548..aa63af1 100644
--- a/src/proguard/io/DataEntryObfuscator.java
+++ b/src/proguard/io/DataEntryObfuscator.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -75,7 +75,7 @@ public class DataEntryObfuscator implements DataEntryReader
         String dataEntryName = dataEntry.getName();
 
         // Try to find a corresponding class name by removing increasingly
-        // long suffixes.
+        // long suffixes,
         for (int suffixIndex = dataEntryName.length() - 1;
              suffixIndex > 0;
              suffixIndex--)
@@ -106,44 +106,25 @@ public class DataEntryObfuscator implements DataEntryReader
 
                         return new RenamedDataEntry(dataEntry, newDataEntryName);
                     }
-                    else
-                    {
-                        // Otherwise stop looking.
-                        return dataEntry;
-                    }
+
+                    // Otherwise stop looking.
+                    break;
                 }
             }
         }
 
-        // Try to find a corresponding package name by increasingly removing
-        // more subpackages.
-        String packagePrefix = dataEntryName;
-        do
+        // Did the package get a new name?
+        String packagePrefix    = ClassUtil.internalPackagePrefix(dataEntryName);
+        String newPackagePrefix = (String)packagePrefixMap.get(packagePrefix);
+        if (newPackagePrefix != null &&
+            !packagePrefix.equals(newPackagePrefix))
         {
-            // Chop off the class name or the last subpackage name.
-            packagePrefix = ClassUtil.internalPackagePrefix(packagePrefix);
+            // Return a renamed data entry.
+            String newDataEntryName =
+                newPackagePrefix + dataEntryName.substring(packagePrefix.length());
 
-            // Is there a package corresponding to the package prefix?
-            String newPackagePrefix = (String)packagePrefixMap.get(packagePrefix);
-            if (newPackagePrefix != null)
-            {
-                // Did the package get a new name?
-                if (!packagePrefix.equals(newPackagePrefix))
-                {
-                    // Return a renamed data entry.
-                    String newDataEntryName =
-                        newPackagePrefix + dataEntryName.substring(packagePrefix.length());
-
-                    return new RenamedDataEntry(dataEntry, newDataEntryName);
-                }
-                else
-                {
-                    // Otherwise stop looking.
-                    return dataEntry;
-                }
-            }
+            return new RenamedDataEntry(dataEntry, newDataEntryName);
         }
-        while (packagePrefix.length() > 0);
 
         return dataEntry;
     }