From f24abb66b8b72cadea7c71d1c754facb5bd0cec4 Mon Sep 17 00:00:00 2001
From: Lanchon <lanchon@gmail.com>
Date: Thu, 24 Oct 2019 21:43:15 -0300
Subject: [PATCH] Retire my 'WrappingMultiDexFile' in favor of the new upstream
 'DexEntry'

---
 ...icMultiDexFile.java => BasicDexEntry.java} | 24 ++++---------------
 .../multidexlib2/WrappingMultiDexFile.java    | 20 ----------------
 2 files changed, 5 insertions(+), 39 deletions(-)
 rename src/main/java/lanchon/multidexlib2/{BasicMultiDexFile.java => BasicDexEntry.java} (59%)
 delete mode 100644 src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java

diff --git a/src/main/java/lanchon/multidexlib2/BasicMultiDexFile.java b/src/main/java/lanchon/multidexlib2/BasicDexEntry.java
similarity index 59%
rename from src/main/java/lanchon/multidexlib2/BasicMultiDexFile.java
rename to src/main/java/lanchon/multidexlib2/BasicDexEntry.java
index 6fd810a..391e3c9 100644
--- a/src/main/java/lanchon/multidexlib2/BasicMultiDexFile.java
+++ b/src/main/java/lanchon/multidexlib2/BasicDexEntry.java
@@ -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;
 	}
 
diff --git a/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java b/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java
deleted file mode 100644
index 8b8d4e7..0000000
--- a/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java
+++ /dev/null
@@ -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();
-
-}