From 8c7400196703fd18d321e15c6d47ae15e7edb87c Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Mon, 31 Dec 2012 00:13:01 -0800
Subject: [PATCH] Remove unwanted @Nonnull annotations from VariableSizeList
 and iterator

---
 .../java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java | 5 +++--
 .../jf/dexlib2/dexbacked/util/VariableSizeListIterator.java  | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java
index 3bf564d0..07ec7698 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java
@@ -48,19 +48,20 @@ public abstract class VariableSizeList<T> extends AbstractSequentialList<T> {
         this.size = size;
     }
 
-    @Nonnull protected abstract T readNextItem(@Nonnull DexReader reader, int index);
+    protected abstract T readNextItem(@Nonnull DexReader reader, int index);
 
     @Override
+    @Nonnull
     public VariableSizeListIterator<T> listIterator() {
         return listIterator(0);
     }
 
     @Override public int size() { return size; }
 
+    @Nonnull
     @Override
     public VariableSizeListIterator<T> listIterator(int index) {
         VariableSizeListIterator<T> iterator = new VariableSizeListIterator<T>(dexBuf, offset, size) {
-            @Nonnull
             @Override
             protected T readNextItem(@Nonnull DexReader reader, int index) {
                 return VariableSizeList.this.readNextItem(reader, index);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListIterator.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListIterator.java
index c1c66bb2..19d6a166 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListIterator.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListIterator.java
@@ -58,7 +58,7 @@ public abstract class VariableSizeListIterator<T> implements ListIterator<T> {
      * @param index The index of the item being read. This is guaranteed to be less than {@code size}
      * @return The item that was read
      */
-    @Nonnull protected abstract T readNextItem(@Nonnull DexReader reader, int index);
+    protected abstract T readNextItem(@Nonnull DexReader reader, int index);
 
     public int getReaderOffset() {
         return reader.getOffset();
@@ -70,7 +70,6 @@ public abstract class VariableSizeListIterator<T> implements ListIterator<T> {
     }
 
     @Override
-    @Nonnull
     public T next() {
         if (index >= size) {
             throw new NoSuchElementException();