From 47917fd5c2d54aea8f14a1c981f955495a010837 Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 29 Oct 2018 19:07:27 +0300 Subject: [PATCH] fix: resolve some sonar critical issues --- .../jadx/core/dex/attributes/EmptyAttrStorage.java | 4 ++++ .../main/java/jadx/core/dex/attributes/IAttribute.java | 2 +- .../main/java/jadx/core/dex/instructions/GotoNode.java | 10 ---------- .../jadx/core/dex/instructions/TargetInsnNode.java | 7 +++++-- .../src/main/java/jadx/gui/settings/JadxSettings.java | 2 +- .../java/jadx/gui/settings/JadxSettingsWindow.java | 2 +- .../main/java/jadx/gui/ui/codearea/EditorTheme.java | 10 +++++++++- 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java b/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java index 56111b7c..3b0c06e2 100644 --- a/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java +++ b/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java @@ -34,18 +34,22 @@ public final class EmptyAttrStorage extends AttributeStorage { @Override public void clear() { + // ignore } @Override public void remove(AFlag flag) { + // ignore } @Override public void remove(AType type) { + // ignore } @Override public void remove(IAttribute attr) { + // ignore } @Override diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java b/jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java index cac361c2..d6933100 100644 --- a/jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java +++ b/jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java @@ -1,5 +1,5 @@ package jadx.core.dex.attributes; public interface IAttribute { - AType getType(); + AType getType(); } diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java b/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java index a89f9bf4..bddfb062 100644 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java +++ b/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java @@ -1,6 +1,5 @@ package jadx.core.dex.instructions; -import jadx.core.dex.nodes.BlockNode; import jadx.core.utils.InsnUtils; public class GotoNode extends TargetInsnNode { @@ -20,15 +19,6 @@ public class GotoNode extends TargetInsnNode { return target; } - @Override - public boolean replaceTargetBlock(BlockNode origin, BlockNode replace) { - return false; - } - - @Override - public void initBlocks(BlockNode curBlock) { - } - @Override public String toString() { return super.toString() + "-> " + InsnUtils.formatOffset(target); diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java b/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java index 939d32b0..2e4549a8 100644 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java +++ b/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java @@ -9,7 +9,10 @@ public abstract class TargetInsnNode extends InsnNode { super(type, argsCount); } - public abstract void initBlocks(BlockNode curBlock); + public void initBlocks(BlockNode curBlock) { + } - public abstract boolean replaceTargetBlock(BlockNode origin, BlockNode replace); + public boolean replaceTargetBlock(BlockNode origin, BlockNode replace) { + return false; + } } diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java index 1a8eb0b9..56e1ba0d 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java @@ -276,7 +276,7 @@ public class JadxSettings extends JadxCLIArgs { fromVersion++; } if (fromVersion == 1) { - setEditorThemePath(EditorTheme.ALL_THEMES[0].getPath()); + setEditorThemePath(EditorTheme.getDefaultTheme().getPath()); fromVersion++; } if (fromVersion == 2) { diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java index 5f0f7233..af2bd3f1 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java @@ -190,7 +190,7 @@ public class JadxSettingsWindow extends JDialog { } }); - EditorTheme[] editorThemes = EditorTheme.ALL_THEMES; + EditorTheme[] editorThemes = EditorTheme.getAllThemes(); JComboBox themesCbx = new JComboBox<>(editorThemes); for (EditorTheme theme : editorThemes) { if (theme.getPath().equals(settings.getEditorThemePath())) { diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java index b537cf88..fc1931e3 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java @@ -3,7 +3,7 @@ package jadx.gui.ui.codearea; public final class EditorTheme { private static final String RSTA_THEME_PATH = "/org/fife/ui/rsyntaxtextarea/themes/"; - public static final EditorTheme[] ALL_THEMES = + private static final EditorTheme[] ALL_THEMES = new EditorTheme[]{ new EditorTheme("default"), new EditorTheme("eclipse"), @@ -13,6 +13,14 @@ public final class EditorTheme { new EditorTheme("monokai") }; + public static EditorTheme[] getAllThemes() { + return ALL_THEMES; + } + + public static EditorTheme getDefaultTheme() { + return ALL_THEMES[0]; + } + private final String name; private final String path; -- GitLab