commit 53cdb13accf168a0893eccaeaff9e6bdd5a9b922
author Lanchon <lanchon@gmail.com> Sun Sep 24 20:25:09 2017 -0300
committer Ben Gruver <jesusfreke@jesusfreke.com> Wed Jun 13 14:11:46 2018 -0700
tree fbabf5a8ac17974e997a50afa25aba4db317fb01
parent 6917c1fa149f6955af7be6d54d3a407ba0e33988

MemoryDataStore: Rename the buffer getter method

dexlib2/src/main/java/org/jf/dexlib2/writer/io/MemoryDataStore.java

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/io/MemoryDataStore.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/io/MemoryDataStore.java
index e5fc787..8459009 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/io/MemoryDataStore.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/io/MemoryDataStore.java
@@ -18,7 +18,7 @@
         buf = new byte[initialCapacity];
     }
 
-    public byte[] getData() {
+    public byte[] getBuffer() {
         return buf;
     }
 

dexlib2/src/test/java/org/jf/dexlib2/pool/RollbackTest.java

diff --git a/dexlib2/src/test/java/org/jf/dexlib2/pool/RollbackTest.java b/dexlib2/src/test/java/org/jf/dexlib2/pool/RollbackTest.java
index 6074de1..87473bb 100644
--- a/dexlib2/src/test/java/org/jf/dexlib2/pool/RollbackTest.java
+++ b/dexlib2/src/test/java/org/jf/dexlib2/pool/RollbackTest.java
@@ -84,7 +84,7 @@
             dexPool.internClass(class2);
             dexPool.reset();
             dexPool.writeTo(dataStore);
-            dexFile1 = new RawDexFile(Opcodes.getDefault(), dataStore.getData());
+            dexFile1 = new RawDexFile(Opcodes.getDefault(), dataStore.getBuffer());
         }
 
         RawDexFile dexFile2;
@@ -93,7 +93,7 @@
             DexPool dexPool = new DexPool(Opcodes.getDefault());
             dexPool.internClass(class1);
             dexPool.writeTo(dataStore);
-            dexFile2 = new RawDexFile(Opcodes.getDefault(), dataStore.getData());
+            dexFile2 = new RawDexFile(Opcodes.getDefault(), dataStore.getBuffer());
         }
 
         List<MapItem> mapItems1 = dexFile1.getMapItems();

dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java

diff --git a/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java b/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
index bf55e37..fb65934 100644
--- a/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
+++ b/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
@@ -77,7 +77,7 @@
             throw new RuntimeException(ex);
         }
 
-        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dataStore.getData());
+        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dataStore.getBuffer());
         ClassDef dbClassDef = Iterables.getFirst(dexFile.getClasses(), null);
         Assert.assertNotNull(dbClassDef);
         Annotation dbAnnotation = Iterables.getFirst(dbClassDef.getAnnotations(), null);
@@ -117,7 +117,7 @@
             throw new RuntimeException(ex);
         }
 
-        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dataStore.getData());
+        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dataStore.getBuffer());
         ClassDef dbClassDef = Iterables.getFirst(dexFile.getClasses(), null);
         Assert.assertNotNull(dbClassDef);
         Annotation dbAnnotation = Iterables.getFirst(dbClassDef.getAnnotations(), null);

dexlib2/src/test/java/org/jf/dexlib2/writer/JumboStringConversionTest.java

diff --git a/dexlib2/src/test/java/org/jf/dexlib2/writer/JumboStringConversionTest.java b/dexlib2/src/test/java/org/jf/dexlib2/writer/JumboStringConversionTest.java
index 340b1fa..c64f3b2 100644
--- a/dexlib2/src/test/java/org/jf/dexlib2/writer/JumboStringConversionTest.java
+++ b/dexlib2/src/test/java/org/jf/dexlib2/writer/JumboStringConversionTest.java
@@ -92,7 +92,7 @@
         MemoryDataStore dexStore = new MemoryDataStore();
         dexBuilder.writeTo(dexStore);
 
-        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexStore.getData());
+        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexStore.getBuffer());
 
         ClassDef classDef = Iterables.getFirst(dexFile.getClasses(), null);
         Assert.assertNotNull(classDef);
@@ -189,7 +189,7 @@
         MemoryDataStore dexStore = new MemoryDataStore();
         dexBuilder.writeTo(dexStore);
 
-        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexStore.getData());
+        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexStore.getBuffer());
 
         ClassDef classDef = Iterables.getFirst(dexFile.getClasses(), null);
         Assert.assertNotNull(classDef);

smali/src/main/java/org/jf/smali/SmaliTestUtils.java

diff --git a/smali/src/main/java/org/jf/smali/SmaliTestUtils.java b/smali/src/main/java/org/jf/smali/SmaliTestUtils.java
index 08bd6cb..8b1d34a 100644
--- a/smali/src/main/java/org/jf/smali/SmaliTestUtils.java
+++ b/smali/src/main/java/org/jf/smali/SmaliTestUtils.java
@@ -94,7 +94,7 @@
 
         dexBuilder.writeTo(dataStore);
 
-        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.forApi(apiLevel), dataStore.getData());
+        DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.forApi(apiLevel), dataStore.getBuffer());
 
         return Iterables.getFirst(dexFile.getClasses(), null);
     }