Remove the Instruction template parameter from DexWriter

This commit is contained in:
Ben Gruver 2013-08-24 21:49:26 -07:00
parent e9aa2c230f
commit 0cd8417155
3 changed files with 7 additions and 6 deletions

View File

@ -76,8 +76,7 @@ public abstract class DexWriter<
AnnotationKey extends Annotation, AnnotationSetKey, AnnotationKey extends Annotation, AnnotationSetKey,
TypeListKey, TypeListKey,
FieldKey, MethodKey, FieldKey, MethodKey,
EncodedValue, AnnotationElement, EncodedValue, AnnotationElement> {
Insn extends Instruction> {
public static final int NO_INDEX = -1; public static final int NO_INDEX = -1;
public static final int NO_OFFSET = 0; public static final int NO_OFFSET = 0;

View File

@ -56,7 +56,7 @@ import java.util.Set;
public class DexBuilder extends DexWriter<BuilderStringReference, BuilderStringReference, BuilderTypeReference, public class DexBuilder extends DexWriter<BuilderStringReference, BuilderStringReference, BuilderTypeReference,
BuilderTypeReference, BuilderProtoReference, BuilderFieldReference, BuilderMethodReference, BuilderReference, BuilderTypeReference, BuilderProtoReference, BuilderFieldReference, BuilderMethodReference, BuilderReference,
BuilderClassDef, BuilderAnnotation, BuilderAnnotationSet, BuilderTypeList, BuilderField, BuilderMethod, BuilderClassDef, BuilderAnnotation, BuilderAnnotationSet, BuilderTypeList, BuilderField, BuilderMethod,
BuilderEncodedValue, BuilderAnnotationElement, BuilderInstruction> { BuilderEncodedValue, BuilderAnnotationElement> {
private final BuilderContext context; private final BuilderContext context;

View File

@ -32,8 +32,10 @@
package org.jf.dexlib2.writer.pool; package org.jf.dexlib2.writer.pool;
import org.jf.dexlib2.ValueType; import org.jf.dexlib2.ValueType;
import org.jf.dexlib2.iface.*; import org.jf.dexlib2.iface.Annotation;
import org.jf.dexlib2.iface.instruction.Instruction; import org.jf.dexlib2.iface.AnnotationElement;
import org.jf.dexlib2.iface.ClassDef;
import org.jf.dexlib2.iface.Field;
import org.jf.dexlib2.iface.reference.*; import org.jf.dexlib2.iface.reference.*;
import org.jf.dexlib2.iface.value.*; import org.jf.dexlib2.iface.value.*;
import org.jf.dexlib2.immutable.instruction.ImmutableInstructionFactory; import org.jf.dexlib2.immutable.instruction.ImmutableInstructionFactory;
@ -50,7 +52,7 @@ public class DexPool extends DexWriter<CharSequence, StringReference, CharSequen
FieldReference, MethodReference, Reference, PoolClassDef, FieldReference, MethodReference, Reference, PoolClassDef,
Annotation, Set<? extends Annotation>, Annotation, Set<? extends Annotation>,
TypeListPool.Key<? extends Collection<? extends CharSequence>>, Field, PoolMethod, TypeListPool.Key<? extends Collection<? extends CharSequence>>, Field, PoolMethod,
EncodedValue, AnnotationElement, Instruction> { EncodedValue, AnnotationElement> {
public static DexPool makeDexPool() { public static DexPool makeDexPool() {
return makeDexPool(15); return makeDexPool(15);