Skip to content

Commit d95b9d0

Browse files
committed
Fixed Search Tree Selection
The search box tree selection now functions the same as the resource list tree
1 parent f4c0e71 commit d95b9d0

1 file changed

Lines changed: 19 additions & 13 deletions

File tree

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/SearchBoxPane.java

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.awt.BorderLayout;
44
import java.awt.GridLayout;
55
import java.awt.event.ItemListener;
6+
import java.awt.event.MouseAdapter;
7+
import java.awt.event.MouseEvent;
68
import java.util.Objects;
79
import javax.swing.DefaultComboBoxModel;
810
import javax.swing.JButton;
@@ -128,23 +130,27 @@ public SearchBoxPane()
128130

129131
getContentPane().add(optionPanel, BorderLayout.NORTH);
130132
getContentPane().add(new JScrollPane(tree), BorderLayout.CENTER);
131-
132-
this.tree.addTreeSelectionListener(selectionEvent ->
133+
134+
tree.addMouseListener(new MouseAdapter()
133135
{
134-
try
136+
@Override
137+
public void mouseReleased(MouseEvent e)
135138
{
136-
if (selectionEvent.getPath().getPathComponent(0).equals(TranslatedStrings.RESULTS))
137-
return;
139+
//TODO right-click context menu
140+
if (e.isMetaDown())
141+
{
142+
}
143+
else if (e.getButton() == MouseEvent.BUTTON1)
144+
{
145+
if(!(tree.getLastSelectedPathComponent() instanceof LDCSearchTreeNodeResult))
146+
return;
147+
148+
LDCSearchTreeNodeResult result = (LDCSearchTreeNodeResult) tree.getLastSelectedPathComponent();
138149

139-
LDCSearchTreeNodeResult result = (LDCSearchTreeNodeResult) tree.getLastSelectedPathComponent();
150+
final String name = result.resourceWorkingName;
140151

141-
final String name = result.resourceWorkingName;
142-
143-
BytecodeViewer.viewer.workPane.addClassResource(result.container, name);
144-
}
145-
catch (Exception e)
146-
{
147-
e.printStackTrace();
152+
BytecodeViewer.viewer.workPane.addClassResource(result.container, name);
153+
}
148154
}
149155
});
150156

0 commit comments

Comments
 (0)