From b823064a067b4a2bd2259b77432581f03fd0471c Mon Sep 17 00:00:00 2001 From: Lanchon Date: Tue, 12 Jun 2018 21:55:49 -0300 Subject: [PATCH] Rename type parameters --- .../lanchon/multidexlib2/SingletonDexContainer.java | 10 +++++----- .../lanchon/multidexlib2/WrappingMultiDexFile.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java b/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java index 36b8887..821357b 100644 --- a/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java +++ b/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java @@ -15,7 +15,7 @@ import java.util.Map; import org.jf.dexlib2.iface.DexFile; -public class SingletonDexContainer extends AbstractMultiDexContainer> { +public class SingletonDexContainer extends AbstractMultiDexContainer> { // I insist that some dex container entries do not have names // even though dexlib2 does not allow null entry names. @@ -25,13 +25,13 @@ public class SingletonDexContainer extends AbstractMultiDexCo // using the '==' operator rather than the 'equals(...)' method. public static final String UNDEFINED_ENTRY_NAME = null; - public SingletonDexContainer(D dexFile) { + public SingletonDexContainer(T dexFile) { this(UNDEFINED_ENTRY_NAME, dexFile); } - public SingletonDexContainer(String entryName, D dexFile) { - WrappingMultiDexFile multiDexFile = new BasicMultiDexFile<>(this, entryName, dexFile); - Map> entryMap = Collections.singletonMap(entryName, multiDexFile); + public SingletonDexContainer(String entryName, T dexFile) { + WrappingMultiDexFile multiDexFile = new BasicMultiDexFile<>(this, entryName, dexFile); + Map> entryMap = Collections.singletonMap(entryName, multiDexFile); initialize(entryMap); } diff --git a/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java b/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java index 3024090..54fffd6 100644 --- a/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java +++ b/src/main/java/lanchon/multidexlib2/WrappingMultiDexFile.java @@ -13,8 +13,8 @@ package lanchon.multidexlib2; import org.jf.dexlib2.iface.DexFile; import org.jf.dexlib2.iface.MultiDexContainer.MultiDexFile; -public interface WrappingMultiDexFile extends MultiDexFile { +public interface WrappingMultiDexFile extends MultiDexFile { - D getWrappedDexFile(); + T getWrappedDexFile(); }