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

fix issues reported by Coverity

Browse Source
This commit is contained in:
Skylot
2014-05-10 14:44:49 +04:00
parent 343bddc6ad
commit 42eb319751
33 changed files with 455 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/JadxGUI.java
+5 -2
View File
@@ -15,7 +15,10 @@ public class JadxGUI {
public static void main(String[] args) {
try {
final JadxCLIArgs jadxArgs = new JadxCLIArgs(args);
final JadxCLIArgs jadxArgs = new JadxCLIArgs();
if (!jadxArgs.processArgs(args)) {
return;
}
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -25,7 +28,7 @@ public class JadxGUI {
window.setLocationAndPosition();
window.setVisible(true);
window.setLocationRelativeTo(null);
window.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
window.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
if (jadxArgs.getInput().isEmpty()) {
window.openFile();
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+5 -2
View File
@@ -135,7 +135,10 @@ public class MainWindow extends JFrame {
}
private void toggleSearch() {
tabbedPane.getSelectedCodePanel().getSearchBar().toggle();
CodePanel codePanel = tabbedPane.getSelectedCodePanel();
if (codePanel != null) {
codePanel.getSearchBar().toggle();
}
}
private void initMenuAndToolbar() {
@@ -148,7 +151,7 @@ public class MainWindow extends JFrame {
exit.setMnemonic(KeyEvent.VK_E);
exit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
System.exit(0);
dispose();
}
});
jadx-gui/src/main/java/jadx/gui/ui/SearchBar.java
+8 -6
View File
@@ -145,8 +145,10 @@ class SearchBar extends JToolBar {
}
private void search(int direction) {
String text = searchField.getText();
if (text.length() == 0) {
String searchText = searchField.getText();
if (searchText == null
|| searchText.length() == 0
|| rTextArea.getText() == null) {
return;
}
@@ -156,20 +158,20 @@ class SearchBar extends JToolBar {
boolean wholeWord = wholeWordCB.isSelected();
if (markAllCB.isSelected()) {
rTextArea.markAll(text, matchCase, wholeWord, regex);
rTextArea.markAll(searchText, matchCase, wholeWord, regex);
} else {
rTextArea.clearMarkAllHighlights();
}
SearchContext context = new SearchContext();
context.setSearchFor(text);
context.setSearchFor(searchText);
context.setMatchCase(matchCase);
context.setRegularExpression(regex);
context.setSearchForward(forward);
context.setWholeWord(wholeWord);
// TODO hack: move cursor before previous search for not jump to next occurrence
if (direction == 0 && !searchField.getBackground().equals(COLOR_BG_ERROR)) {
if (direction == 0 && !COLOR_BG_ERROR.equals(searchField.getBackground())) {
try {
int caretPos = rTextArea.getCaretPosition();
int lineNum = rTextArea.getLineOfOffset(caretPos) - 1;
@@ -183,7 +185,7 @@ class SearchBar extends JToolBar {
boolean found = SearchEngine.find(rTextArea, context);
if (!found) {
int pos = SearchEngine.getNextMatchPos(text, rTextArea.getText(), forward, matchCase, wholeWord);
int pos = SearchEngine.getNextMatchPos(searchText, rTextArea.getText(), forward, matchCase, wholeWord);
if (pos != -1) {
rTextArea.setCaretPosition(forward ? 0 : rTextArea.getDocument().getLength() - 1);
search(direction);