Annotate TypeIdItems
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 707c444..6ac074b 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
@@ -79,7 +79,6 @@
private final int classCount;
private final int classStartOffset;
- private static final int TYPE_ID_ITEM_SIZE = 4;
private static final int PROTO_ID_ITEM_SIZE = 12;
private static final int FIELD_ID_ITEM_SIZE = 8;
private static final int METHOD_ID_ITEM_SIZE = 8;
@@ -176,7 +175,7 @@
if (typeIndex < 0 || typeIndex >= typeCount) {
throw new ExceptionWithContext("Type index out of bounds: %d", typeIndex);
}
- return typeStartOffset + typeIndex*TYPE_ID_ITEM_SIZE;
+ return typeStartOffset + typeIndex*TypeIdItem.ITEM_SIZE;
}
@Override
@@ -259,8 +258,13 @@
public void dumpTo(Writer out, int width) throws IOException {
AnnotatedBytes annotatedBytes = new AnnotatedBytes(width);
HeaderItem.getSection().annotateSection(annotatedBytes, this, 1);
+
annotatedBytes.annotate(0, " ");
StringIdItem.getSection().annotateSection(annotatedBytes, this, stringCount);
+
+ annotatedBytes.annotate(0, " ");
+ TypeIdItem.getSection().annotateSection(annotatedBytes, this, typeCount);
+
annotatedBytes.writeAnnotations(out, buf);
}
}
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
new file mode 100644
index 0000000..324d01e
--- /dev/null
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.dexlib2.dexbacked.raw;
+
+import org.jf.dexlib2.dexbacked.DexBackedDexFile;
+import org.jf.dexlib2.util.AnnotatedBytes;
+import org.jf.util.StringUtils;
+
+import javax.annotation.Nonnull;
+
+public class TypeIdItem {
+ public static final int ITEM_SIZE = 4;
+
+ public static Section getSection() {
+ return new Section() {
+ @Override
+ public void annotateSection(@Nonnull AnnotatedBytes out, @Nonnull DexBackedDexFile dexFile, int length) {
+ int startOffset = out.getCursor();
+ if (length > 0) {
+ out.annotate(0, "-----------------------------");
+ out.annotate(0, "type_id_item section");
+ out.annotate(0, "-----------------------------");
+ out.annotate(0, "");
+
+ for (int i=0; i<length; i++) {
+ out.annotate(0, "[%d] type_id_item", i);
+ out.indent();
+ annotateString(out, dexFile, i, startOffset + i * ITEM_SIZE);
+ out.deindent();
+ }
+ }
+ }
+ };
+ }
+
+ private static void annotateString(@Nonnull AnnotatedBytes out, @Nonnull DexBackedDexFile dexFile, int index,
+ int offset) {
+ int stringIndex = dexFile.readSmallUint(offset);
+ try {
+ String stringValue = dexFile.getString(stringIndex);
+ out.annotate(4, "string_id_item[%d]: \"%s\"", stringIndex, StringUtils.escapeString(stringValue));
+ return;
+ } catch (Exception ex) {
+ System.err.print("Error while resolving string value of type at index: ");
+ System.err.print(index);
+ ex.printStackTrace(System.err);
+ }
+
+ out.annotate(4, "string_id_item[%d]", stringIndex);
+ }
+}
