Remove usages of the deprecated Iterators.emptyIterator() method

This commit is contained in:
Ben Gruver 2015-06-18 11:52:05 -07:00 committed by Connor Tumbleson
parent 027e135d41
commit 5cd9d01a9e
2 changed files with 5 additions and 4 deletions

View File

@ -32,7 +32,7 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators; import com.google.common.collect.ImmutableSet;
import org.jf.dexlib2.base.reference.BaseMethodReference; import org.jf.dexlib2.base.reference.BaseMethodReference;
import org.jf.dexlib2.dexbacked.raw.MethodIdItem; import org.jf.dexlib2.dexbacked.raw.MethodIdItem;
import org.jf.dexlib2.dexbacked.raw.ProtoIdItem; import org.jf.dexlib2.dexbacked.raw.ProtoIdItem;
@ -152,7 +152,7 @@ public class DexBackedMethod extends BaseMethodReference implements Method {
if (methodImpl != null) { if (methodImpl != null) {
return methodImpl.getParameterNames(null); return methodImpl.getParameterNames(null);
} }
return Iterators.emptyIterator(); return ImmutableSet.<String>of().iterator();
} }
@Nonnull @Nonnull

View File

@ -31,12 +31,13 @@
package org.jf.dexlib2.dexbacked.util; package org.jf.dexlib2.dexbacked.util;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import org.jf.dexlib2.AccessFlags; import org.jf.dexlib2.AccessFlags;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.dexbacked.DexBackedMethod; import org.jf.dexlib2.dexbacked.DexBackedMethod;
import org.jf.dexlib2.dexbacked.DexBackedMethodImplementation; import org.jf.dexlib2.dexbacked.DexBackedMethodImplementation;
import org.jf.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.dexbacked.DexReader; import org.jf.dexlib2.dexbacked.DexReader;
import org.jf.dexlib2.iface.MethodParameter; import org.jf.dexlib2.iface.MethodParameter;
import org.jf.dexlib2.iface.debug.DebugItem; import org.jf.dexlib2.iface.debug.DebugItem;
@ -72,7 +73,7 @@ public abstract class DebugInfo implements Iterable<DebugItem> {
private EmptyDebugInfo() {} private EmptyDebugInfo() {}
@Nonnull @Override public Iterator<DebugItem> iterator() { return Iterators.emptyIterator(); } @Nonnull @Override public Iterator<DebugItem> iterator() { return Iterators.emptyIterator(); }
@Nonnull @Override public Iterator<String> getParameterNames(@Nullable DexReader reader) { @Nonnull @Override public Iterator<String> getParameterNames(@Nullable DexReader reader) {
return Iterators.emptyIterator(); return ImmutableSet.<String>of().iterator();
} }
} }