Skip to content

Commit c9fd138

Browse files
committed
Fix search bug
1 parent 2ad9e80 commit c9fd138

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/bytecode/ClassNodeDecompiler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public String decompileClassNode(ClassNode cn, byte[] b)
4747
containerName = container.name;
4848
}
4949
}
50-
System.out.println(containerName);
5150

5251
return decompile(new PrefixedStringBuilder(), new ArrayList<>(), containerName, cn).toString();
5352
}

src/main/java/the/bytecode/club/bytecodeviewer/gui/ClassViewer.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,11 @@ public void hierarchyChanged(HierarchyEvent e)
115115

116116
JSplitPane sp;
117117
JSplitPane sp2;
118+
// todo: fix this dumb hack
118119
public List<Decompiler> decompilers = Arrays.asList(null, null, null);
119120
public List<JPanel> panels = Arrays.asList(new JPanel(new BorderLayout()), new JPanel(new BorderLayout()), new JPanel(new BorderLayout()));
120121
public List<JPanel> searches = Arrays.asList(new JPanel(new BorderLayout()), new JPanel(new BorderLayout()), new JPanel(new BorderLayout()));
121-
public List<JCheckBox> exacts = Arrays.asList(new JCheckBox("Exact"), new JCheckBox("Exact"), new JCheckBox("Exact"));
122+
public List<JCheckBox> exacts = Arrays.asList(new JCheckBox("Match case"), new JCheckBox("Match case"), new JCheckBox("Match case"));
122123
public List<JTextField> fields = Arrays.asList(new JTextField(), new JTextField(), new JTextField());
123124
public List<RSyntaxTextArea> javas = Arrays.asList(null, null, null);
124125

@@ -286,15 +287,16 @@ public ClassViewer(final String name, final String container, final ClassNode cn
286287
searchPanel.add(byteButtonPane, BorderLayout.WEST);
287288
searchPanel.add(textField, BorderLayout.CENTER);
288289
searchPanel.add(checkBox, BorderLayout.EAST);
289-
byteSearchNext.addActionListener(arg0 -> search(0, textField.getText(), true));
290-
byteSearchPrev.addActionListener(arg0 -> search(0, textField.getText(), false));
290+
final Integer index = i;
291+
byteSearchNext.addActionListener(arg0 -> search(index, textField.getText(), true));
292+
byteSearchPrev.addActionListener(arg0 -> search(index, textField.getText(), false));
291293
textField.addKeyListener(new KeyListener()
292294
{
293295
@Override
294296
public void keyReleased(KeyEvent arg0)
295297
{
296298
if (arg0.getKeyCode() == KeyEvent.VK_ENTER)
297-
search(0, textField.getText(), true);
299+
search(index, textField.getText(), true);
298300
}
299301

300302
@Override

src/main/java/the/bytecode/club/bytecodeviewer/gui/WorkPane.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ public void resetWorkspace()
188188
{
189189
for (Component component : tabs.getComponents())
190190
{
191-
((ClassViewer) component).reset();
191+
if (component instanceof ClassViewer)
192+
((ClassViewer) component).reset();
192193
}
193194
tabs.removeAll();
194195
tabs.updateUI();

0 commit comments

Comments
 (0)