From c7a1ff245224e56bf00fc1a95c4ec5ad18fe1db5 Mon Sep 17 00:00:00 2001
From: "JesusFreke@JesusFreke.com"
 <JesusFreke@JesusFreke.com@55b6fa8a-2a1e-11de-a435-ffa8d773f76a>
Date: Wed, 3 Jun 2009 04:42:37 +0000
Subject: [PATCH] Sort the individual name/value pairs in an annotation by name

git-svn-id: https://smali.googlecode.com/svn/trunk@61 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
---
 .../JesusFreke/dexlib/EncodedValue/AnnotationElement.java | 7 ++++++-
 .../EncodedValue/AnnotationEncodedValueSubField.java      | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java b/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java
index c3eb1c1a..e47362ac 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java
+++ b/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java
@@ -30,7 +30,8 @@ package org.JesusFreke.dexlib.EncodedValue;
 
 import org.JesusFreke.dexlib.*;
 
-public class AnnotationElement extends CompositeField<AnnotationElement> {
+public class AnnotationElement extends CompositeField<AnnotationElement>
+        implements Comparable<AnnotationElement> {
     private final IndexedItemReference<StringIdItem> elementName;
     private final EncodedValue encodedValue;
 
@@ -51,4 +52,8 @@ public class AnnotationElement extends CompositeField<AnnotationElement> {
                 this.encodedValue = encodedValue
         };
     }
+
+    public int compareTo(AnnotationElement annotationElement) {
+        return elementName.compareTo(annotationElement.elementName);
+    }
 }
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java b/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
index 390ee0be..35c0c461 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
+++ b/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
@@ -32,6 +32,9 @@ import org.JesusFreke.dexlib.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Arrays;
+import java.util.Collections;
+import java.lang.reflect.Array;
 
 public class AnnotationEncodedValueSubField extends CompositeField<AnnotationEncodedValueSubField>
     implements EncodedValueSubField<AnnotationEncodedValueSubField> {
@@ -71,6 +74,11 @@ public class AnnotationEncodedValueSubField extends CompositeField<AnnotationEnc
         return 0;
     }
 
+    public int place(int offset) {
+        Collections.sort(annotationElementList);
+        return super.place(offset);
+    }
+
     public ValueType getValueType() {
         return ValueType.VALUE_ANNOTATION;
     }