Retire my 'WrappingMultiDexFile' in favor of the new upstream 'DexEntry'

This commit is contained in:
Lanchon 2019-10-24 21:43:15 -03:00
parent aeb8f3ec6a
commit f24abb66b8
2 changed files with 5 additions and 39 deletions

View File

@ -10,37 +10,23 @@
package lanchon.multidexlib2;
import java.util.Set;
import org.jf.dexlib2.Opcodes;
import org.jf.dexlib2.iface.ClassDef;
import org.jf.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer;
import org.jf.dexlib2.iface.MultiDexContainer.MultiDexFile;
import org.jf.dexlib2.iface.MultiDexContainer.DexEntry;
public class BasicMultiDexFile<C extends MultiDexContainer<? extends MultiDexFile>, D extends DexFile>
implements WrappingMultiDexFile<D> {
public class BasicDexEntry<C extends MultiDexContainer< /* ? extends */ D>, D extends DexFile>
implements DexEntry<D> {
private final C container;
private final String entryName;
private final D dexFile;
public BasicMultiDexFile(C container, String entryName, D dexFile) {
public BasicDexEntry(C container, String entryName, D dexFile) {
this.container = container;
this.entryName = entryName;
this.dexFile = dexFile;
}
@Override
public Set<? extends ClassDef> getClasses() {
return dexFile.getClasses();
}
@Override
public Opcodes getOpcodes() {
return dexFile.getOpcodes();
}
@Override
public String getEntryName() {
return entryName;
@ -52,7 +38,7 @@ public class BasicMultiDexFile<C extends MultiDexContainer<? extends MultiDexFil
}
@Override
public D getWrappedDexFile() {
public D getDexFile() {
return dexFile;
}

View File

@ -1,20 +0,0 @@
/*
* DexPatcher - Copyright 2015-2019 Rodrigo Balerdi
* (GNU General Public License version 3 or later)
*
* DexPatcher is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
* by the Free Software Foundation, either version 3 of the License,
* or (at your option) any later version.
*/
package lanchon.multidexlib2;
import org.jf.dexlib2.iface.DexFile;
import org.jf.dexlib2.iface.MultiDexContainer.MultiDexFile;
public interface WrappingMultiDexFile<T extends DexFile> extends MultiDexFile {
T getWrappedDexFile();
}