jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: resolve some sonar critical issues

Browse Source
This commit is contained in:
Skylot
2018-10-29 19:07:27 +03:00
parent 0abb51c87a
commit 47917fd5c2
7 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+1 -1
View File
@@ -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) {
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class JadxSettingsWindow extends JDialog {
}
});
EditorTheme[] editorThemes = EditorTheme.ALL_THEMES;
EditorTheme[] editorThemes = EditorTheme.getAllThemes();
JComboBox<EditorTheme> themesCbx = new JComboBox<>(editorThemes);
for (EditorTheme theme : editorThemes) {
if (theme.getPath().equals(settings.getEditorThemePath())) {
jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java
+9 -1
View File
@@ -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;