1 files changed, 17 insertions, 102 deletions

diff --git a/src/proguard/classfile/editor/InterfaceSorter.java b/src/proguard/classfile/editor/InterfaceSorter.java
index 176e13e..6521369 100644
--- a/src/proguard/classfile/editor/InterfaceSorter.java
+++ b/src/proguard/classfile/editor/InterfaceSorter.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
@@ -21,14 +21,10 @@
 package proguard.classfile.editor;
 
 import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.AttributeVisitor;
-import proguard.classfile.constant.*;
-import proguard.classfile.constant.visitor.ConstantVisitor;
-import proguard.classfile.util.*;
+import proguard.classfile.util.SimplifiedVisitor;
 import proguard.classfile.visitor.ClassVisitor;
 
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * This ClassVisitor sorts the interfaces of the program classes that it visits.
@@ -37,8 +33,7 @@ import java.util.*;
  */
 public class InterfaceSorter
 extends      SimplifiedVisitor
-implements   ClassVisitor,
-             AttributeVisitor
+implements   ClassVisitor
 {
     // Implementations for ClassVisitor.
 
@@ -47,106 +42,26 @@ implements   ClassVisitor,
         int[] interfaces      = programClass.u2interfaces;
         int   interfacesCount = programClass.u2interfacesCount;
 
-        if (interfacesCount > 1)
-        {
-            // Sort the interfaces.
-            Arrays.sort(interfaces, 0, interfacesCount);
-
-            // Remove any duplicate entries.
-            int newInterfacesCount     = 0;
-            int previousInterfaceIndex = 0;
-            for (int index = 0; index < interfacesCount; index++)
-            {
-                int interfaceIndex = interfaces[index];
-
-                // Isn't this a duplicate of the previous interface?
-                if (interfaceIndex != previousInterfaceIndex)
-                {
-                    interfaces[newInterfacesCount++] = interfaceIndex;
-
-                    // Remember the interface.
-                    previousInterfaceIndex = interfaceIndex;
-                }
-            }
-
-            programClass.u2interfacesCount = newInterfacesCount;
-
-            // Update the signature, if any
-            programClass.attributesAccept(this);
-        }
-    }
-
-
-    // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitSignatureAttribute(Clazz clazz, SignatureAttribute signatureAttribute)
-    {
-        // Process the generic definitions, superclass, and implemented
-        // interfaces.
-        String signature = clazz.getString(signatureAttribute.u2signatureIndex);
-
-        // Count the signature types.
-        InternalTypeEnumeration internalTypeEnumeration =
-            new InternalTypeEnumeration(signature);
+        // Sort the interfaces.
+        Arrays.sort(interfaces, 0, interfacesCount);
 
-        int count           =  0;
-        int interfacesCount = -1;
-        while (internalTypeEnumeration.hasMoreTypes())
+        // Remove any duplicate entries.
+        int newInterfacesCount     = 0;
+        int previousInterfaceIndex = 0;
+        for (int index = 0; index < interfacesCount; index++)
         {
-            String internalType = internalTypeEnumeration.nextType();
+            int interfaceIndex = interfaces[index];
 
-            count++;
-
-            if (ClassUtil.isInternalClassType(internalType))
+            // Isn't this a duplicate of the previous interface?
+            if (interfaceIndex != previousInterfaceIndex)
             {
-                interfacesCount++;
-            }
-        }
-
-        // Put the signature types in an array.
-        internalTypeEnumeration =
-            new InternalTypeEnumeration(signature);
-
-        String[] internalTypes = new String[count];
-
-        for (int index = 0; index < count; index++)
-        {
-            String internalType = internalTypeEnumeration.nextType();
-
-            internalTypes[index] = internalType;
-        }
+                interfaces[newInterfacesCount++] = interfaceIndex;
 
-        // Sort the interface types in the array.
-        Arrays.sort(internalTypes, count - interfacesCount, count);
-
-        // Recompose the signature types in a string.
-        StringBuffer newSignatureBuffer = new StringBuffer();
-
-        for (int index = 0; index < count; index++)
-        {
-            // Is this not an interface type, or an interface type that isn't
-            // a duplicate of the previous interface type?
-            if (index < count - interfacesCount ||
-                !internalTypes[index].equals(internalTypes[index-1]))
-            {
-                newSignatureBuffer.append(internalTypes[index]);
+                // Remember the interface.
+                previousInterfaceIndex = interfaceIndex;
             }
         }
 
-        String newSignature = newSignatureBuffer.toString();
-
-        // Did the signature change?
-        if (!newSignature.equals(signature))
-        {
-            // Update the signature.
-            ((Utf8Constant)((ProgramClass)clazz).constantPool[signatureAttribute.u2signatureIndex]).setString(newSignatureBuffer.toString());
-
-            // Clear the referenced classes.
-            // TODO: Properly update the referenced classes.
-            signatureAttribute.referencedClasses = null;
-        }
+        programClass.u2interfacesCount = newInterfacesCount;
     }
 }