diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 536c96625..dfae95396 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -120,7 +120,10 @@ - + + + @@ -128,7 +131,8 @@ - + diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java index e1dcd051e..ccbd6e90e 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java @@ -202,7 +202,7 @@ public class SignatureProcessor extends AbstractVisitor { } if (mthInfo.isConstructor() && !mthArgTypes.isEmpty() && !parsedArgTypes.isEmpty()) { // add synthetic arg for outer class (see test TestGeneric8) - ArrayList newArgTypes = new ArrayList<>(parsedArgTypes); + List newArgTypes = new ArrayList<>(parsedArgTypes); newArgTypes.add(0, mthArgTypes.get(0)); if (newArgTypes.size() == mthArgTypes.size()) { return newArgTypes; diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java b/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java index 39bdc8214..d52d4f2ee 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java @@ -256,7 +256,7 @@ public class TypeSearch { } else { varInfo.setTypeResolved(false); varInfo.setCurrentType(ArgType.UNKNOWN); - ArrayList types = new ArrayList<>(candidateTypes); + List types = new ArrayList<>(candidateTypes); types.sort(typeCompare.getReversedComparator()); varInfo.setCandidateTypes(Collections.unmodifiableList(types)); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java index a175d7baf..ab693011c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java @@ -15,6 +15,7 @@ import static org.hamcrest.Matchers.is; public class TestCastInOverloadedInvoke extends IntegrationTest { + @SuppressWarnings("IllegalType") public static class TestCls { int c = 0; diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java index 30b1ffb2b..3f2d114cb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java @@ -14,6 +14,7 @@ import static org.hamcrest.Matchers.is; public class TestHierarchyOverloadedInvoke extends IntegrationTest { + @SuppressWarnings("IllegalType") public static class TestCls { static int c = 0; B b = new B(); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java index f77b153d8..1c21cfaeb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java @@ -1,5 +1,7 @@ package jadx.tests.integration.loops; +import java.util.List; + import org.junit.jupiter.api.Test; import jadx.core.dex.nodes.ClassNode; @@ -11,7 +13,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestLoopCondition extends IntegrationTest { public static class TestCls { - public void test(java.util.ArrayList list) { + public void test(List list) { for (int i = 0; i != 16 && i < 255; i++) { list.set(i, "ABC"); if (i == 128) { diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java index 70a1a6ef2..347ea017e 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java @@ -7,6 +7,7 @@ import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -24,7 +25,7 @@ public class LogcatController { private Timer timer; private final String timezone; private LogcatInfo recent = null; - private ArrayList events = new ArrayList<>(); + private List events = new ArrayList<>(); private LogcatFilter filter = new LogcatFilter(null, null); private String status = "null"; @@ -163,8 +164,8 @@ public class LogcatController { } public class LogcatFilter { - private final ArrayList pid; - private ArrayList msgType = new ArrayList() { + private final List pid; + private List msgType = new ArrayList<>() { { add((byte) 1); add((byte) 2); @@ -239,8 +240,8 @@ public class LogcatController { return false; } - public ArrayList getFilteredList(ArrayList inInfoList) { - ArrayList outInfoList = new ArrayList(); + public List getFilteredList(List inInfoList) { + List outInfoList = new ArrayList<>(); inInfoList.forEach((inInfo) -> { if (doFilter(inInfo)) { outInfoList.add(inInfo); diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java index fcaad01e8..785b4465b 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java @@ -4,6 +4,7 @@ import java.awt.GraphicsEnvironment; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.slf4j.Logger; @@ -28,7 +29,7 @@ public class JPreferredFontChooser extends JFontChooser { GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); Set fontSet = new HashSet<>(); Collections.addAll(fontSet, env.getAvailableFontFamilyNames()); - ArrayList found = new ArrayList<>(PREFERRED_FONTS.length); + List found = new ArrayList<>(PREFERRED_FONTS.length); for (String font : PREFERRED_FONTS) { if (fontSet.contains(font)) { found.add(font); diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/SettingsTree.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/SettingsTree.java index 3f6cbc163..ccfe48cdd 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/ui/SettingsTree.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/ui/SettingsTree.java @@ -1,6 +1,5 @@ package jadx.gui.settings.ui; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -52,7 +51,7 @@ public class SettingsTree extends JTree { } private static void setNodeExpandedState(JTree tree, TreeNode node, boolean expanded) { - ArrayList list = Collections.list(node.children()); + List list = Collections.list(node.children()); for (TreeNode treeNode : list) { setNodeExpandedState(tree, treeNode, expanded); } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java index dda914424..7a177f4ed 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java @@ -75,7 +75,7 @@ public class LogcatPanel extends JPanel { this.debugPanel = debugPanel; } - private ArrayList pids; + private List pids; private JScrollPane logcatScroll; private int pid; @@ -96,7 +96,7 @@ public class LogcatPanel extends JPanel { public boolean showLogcat() { this.removeAll(); - ArrayList pkgs = new ArrayList<>(); + List pkgs = new ArrayList<>(); pids = new ArrayList<>(); JPanel procBox; for (ADB.Process proc : procs.subList(1, procs.size())) { // skipping first element because it contains the column label @@ -371,20 +371,14 @@ public class LogcatPanel extends JPanel { } } - class CheckComboRenderer implements ListCellRenderer { - JCheckBox checkBox; - ArrayList boxes = new ArrayList<>(); - - public CheckComboRenderer() { - checkBox = new JCheckBox(); - } + private static class CheckComboRenderer implements ListCellRenderer { + private final JCheckBox checkBox = new JCheckBox(); public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { CheckComboStore store = (CheckComboStore) value; checkBox.setText(store.id); checkBox.setSelected(store.state); - boxes.add(checkBox); return checkBox; } } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/tab/ITabStatesListener.java b/jadx-gui/src/main/java/jadx/gui/ui/tab/ITabStatesListener.java index 805fa2c92..bbc3cdcc0 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/tab/ITabStatesListener.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/tab/ITabStatesListener.java @@ -1,6 +1,6 @@ package jadx.gui.ui.tab; -import java.util.ArrayList; +import java.util.List; import jadx.gui.ui.codearea.EditorViewState; @@ -23,7 +23,7 @@ public interface ITabStatesListener { void onTabsRestoreDone(); - void onTabsReorder(ArrayList blueprints); + void onTabsReorder(List blueprints); void onTabSave(TabBlueprint blueprint, EditorViewState viewState); } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/tab/QuickTabsTree.java b/jadx-gui/src/main/java/jadx/gui/ui/tab/QuickTabsTree.java index 8cd63de1f..78b693c2e 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/tab/QuickTabsTree.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/tab/QuickTabsTree.java @@ -6,7 +6,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.ArrayList; +import java.util.List; import javax.swing.JPopupMenu; import javax.swing.JTree; @@ -238,7 +238,7 @@ public class QuickTabsTree extends JTree implements ITabStatesListener, TreeSele } @Override - public void onTabsReorder(ArrayList blueprints) { + public void onTabsReorder(List blueprints) { } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/tab/TabbedPane.java b/jadx-gui/src/main/java/jadx/gui/ui/tab/TabbedPane.java index 00742a3d7..ba4404db9 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/tab/TabbedPane.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/tab/TabbedPane.java @@ -569,8 +569,8 @@ public class TabbedPane extends JTabbedPane implements ITabStatesListener { } @Override - public void onTabsReorder(ArrayList blueprints) { - ArrayList newBlueprints = new ArrayList<>(); + public void onTabsReorder(List blueprints) { + List newBlueprints = new ArrayList<>(); for (ContentPanel contentPanel : getTabs()) { Optional blueprintFindResult = blueprints.stream() .filter(b -> b.getNode() == contentPanel.getNode()) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/tab/TabsController.java b/jadx-gui/src/main/java/jadx/gui/ui/tab/TabsController.java index 192e7695e..15d7f6dcc 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/tab/TabsController.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/tab/TabsController.java @@ -15,7 +15,7 @@ import jadx.gui.ui.codearea.EditorViewState; public class TabsController { private final transient MainWindow mainWindow; private final Map tabsMap = new HashMap<>(); - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); private boolean forceClose; @@ -223,7 +223,7 @@ public class TabsController { } public List getEditorViewStates() { - ArrayList reorderedTabs = new ArrayList<>(tabsMap.values()); + List reorderedTabs = new ArrayList<>(tabsMap.values()); listeners.forEach(l -> l.onTabsReorder(reorderedTabs)); List states = new ArrayList<>(); for (TabBlueprint blueprint : reorderedTabs) {