From 3f2861b47702ee56a8f3dbcd2feedbdfd31789b2 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sun, 21 Oct 2012 21:41:18 -0700
Subject: [PATCH] Return the specific DexBacked versions of methods and classes

---
 .../java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java  | 2 +-
 .../java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
index 4a73f345..3608fac2 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
@@ -161,7 +161,7 @@ public class DexBackedClassDef implements ClassDef {
 
     @Nonnull
     @Override
-    public List<? extends Method> getMethods() {
+    public List<? extends DexBackedMethod> getMethods() {
         if (classDataOffset > 0) {
             DexReader reader = dexBuf.readerAt(classDataOffset);
             int staticFieldCount = reader.readSmallUleb128();
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
index 5d48f555..d94eef8f 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
@@ -47,14 +47,14 @@ public class DexBackedDexFile implements DexFile {
 
     @Nonnull
     @Override
-    public List<? extends ClassDef> getClasses() {
+    public List<? extends DexBackedClassDef> getClasses() {
         final int classCount = dexBuf.getClassCount();
 
-        return new FixedSizeList<ClassDef>() {
+        return new FixedSizeList<DexBackedClassDef>() {
             @Nonnull
             @Override
-            public ClassDef readItem(int index) {
-                int classOffset = dexBuf.getClassDefOffset(index);
+            public DexBackedClassDef readItem(int index) {
+                int classOffset = dexBuf.getClassDefItemOffset(index);
                 return new DexBackedClassDef(dexBuf, classOffset);
             }