From 0d93d335a17063a811f7a4a18de1f8ac52014d75 Mon Sep 17 00:00:00 2001 From: Vladislav Bauer Date: Fri, 28 Aug 2015 18:46:34 +0600 Subject: [PATCH] Fix console warnings during compilation (gradle build) --- .../test/java/jadx/tests/api/IntegrationTest.java | 2 +- .../jadx/tests/api/compiler/ClassFileManager.java | 4 ++-- .../jadx/tests/api/compiler/DynamicCompiler.java | 4 ++-- .../jadx/tests/functional/JadxVisitorsOrderTest.java | 2 +- .../jadx/tests/integration/others/TestIssue13a.java | 12 ++++++------ jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java | 2 +- jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java | 1 + 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java index b480c1420..969950dfa 100644 --- a/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java +++ b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java @@ -247,7 +247,7 @@ public abstract class IntegrationTest extends TestUtils { } public Object invoke(String method) throws Exception { - return invoke(method, new Class[0]); + return invoke(method, new Class[0]); } public Object invoke(String method, Class[] types, Object... args) throws Exception { diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java b/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java index 4f8df7e3b..dd1ed8099 100644 --- a/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java +++ b/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java @@ -35,7 +35,7 @@ public class ClassFileManager extends ForwardingJavaFileManager clsMap = new HashMap(); - private final Map clsCache = new HashMap(); + private final Map> clsCache = new HashMap>(); @Override protected Class findClass(String name) throws ClassNotFoundException { @@ -55,7 +55,7 @@ public class ClassFileManager extends ForwardingJavaFileManager replaceClass(String name) throws ClassNotFoundException { - Class cacheCls = clsCache.get(name); + Class cacheCls = clsCache.get(name); if (cacheCls != null) { return cacheCls; } diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java b/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java index 20d0d8497..427d8cb8d 100644 --- a/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java +++ b/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java @@ -58,7 +58,7 @@ public class DynamicCompiler { } public Method getMethod(String method, Class[] types) throws Exception { - for (Class type : types) { + for (Class type : types) { checkType(type); } return getInstance().getClass().getMethod(method, types); @@ -68,7 +68,7 @@ public class DynamicCompiler { return mth.invoke(getInstance(), args); } - private Class checkType(Class type) throws ClassNotFoundException { + private Class checkType(Class type) throws ClassNotFoundException { if (type.isPrimitive()) { return type; } diff --git a/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java b/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java index fad173352..90e1cf3f9 100644 --- a/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java +++ b/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java @@ -34,7 +34,7 @@ public class JadxVisitorsOrderTest { } private static List check(List passes) { - List classList = new ArrayList(passes.size()); + List> classList = new ArrayList>(passes.size()); for (IDexTreeVisitor pass : passes) { classList.add(pass.getClass()); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java index 2d5a6ca6a..2df56df69 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java @@ -15,8 +15,8 @@ public class TestIssue13a extends IntegrationTest { public static class TestCls { private static final String TAG = "Parcel"; - private static final HashMap> - mCreators = new HashMap>(); + private static final HashMap>> + mCreators = new HashMap>>(); @SuppressWarnings("unchecked") public final T test(ClassLoader loader) { @@ -26,15 +26,15 @@ public class TestIssue13a extends IntegrationTest { } Parcelable.Creator creator; synchronized (mCreators) { - HashMap map = mCreators.get(loader); + HashMap> map = mCreators.get(loader); if (map == null) { - map = new HashMap(); + map = new HashMap>(); mCreators.put(loader, map); } - creator = map.get(name); + creator = (Parcelable.Creator) map.get(name); if (creator == null) { try { - Class c = loader == null ? + Class c = loader == null ? Class.forName(name) : Class.forName(name, true, loader); Field f = c.getField("CREATOR"); creator = (Parcelable.Creator) f.get(null); diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java index 74eaa29ad..cb996bc9e 100644 --- a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java +++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java @@ -71,7 +71,7 @@ public class JRoot extends JNode { } public JNode searchClassInTree(JNode node) { - Enumeration en = this.breadthFirstEnumeration(); + Enumeration en = this.breadthFirstEnumeration(); while (en.hasMoreElements()) { Object obj = en.nextElement(); if (node.equals(obj)) { diff --git a/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java b/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java index 68033e227..9ae8f801b 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java @@ -41,6 +41,7 @@ class LogViewer extends JDialog { JPanel controlPane = new JPanel(); controlPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); + @SuppressWarnings("unchecked") final JComboBox cb = new JComboBox(LEVEL_ITEMS); cb.setSelectedItem(level); cb.addActionListener(new ActionListener() {