yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

GT-2698 - fix for tests so Swing isn't dragged in

Browse source
This commit is contained in:
dev747368 2019-04-23 16:23:24 -04:00
parent 5764e7174e
commit c7ce28e94c
22 changed files with 132 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/RepositoryChooser.java
View file

@ -26,10 +26,10 @@ import javax.swing.*;
import javax.swing.event.*;
import docking.DialogComponentProvider;
import docking.DockingUtils;
import docking.widgets.button.GRadioButton;
import docking.widgets.label.GDLabel;
import docking.widgets.label.GLabel;
import docking.widgets.list.GList;
import ghidra.framework.client.*;
import ghidra.framework.model.ServerInfo;
import ghidra.framework.protocol.ghidra.GhidraURL;
@ -55,7 +55,7 @@ class RepositoryChooser extends DialogComponentProvider {
private ServerInfoComponent serverInfoComponent;
private JButton queryButton;
private JList<String> nameList;
private GList<String> nameList;
private DefaultListModel<String> listModel;
private JTextField urlTextField;
@ -104,8 +104,7 @@ class RepositoryChooser extends DialogComponentProvider {
lowerPanel.add(label, BorderLayout.NORTH);
listModel = new DefaultListModel<>();
nameList = new JList<>(listModel);
DockingUtils.turnOffHTMLRendering(nameList);
nameList = new GList<>(listModel);
nameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
nameList.addListSelectionListener(new ListSelectionListener() {
@Override

7
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/RepositoryPanel.java
View file

@ -22,9 +22,9 @@ import java.awt.event.ActionListener;
import javax.swing.*;
import javax.swing.event.*;
import docking.DockingUtils;
import docking.widgets.button.GRadioButton;
import docking.widgets.label.GDLabel;
import docking.widgets.list.GList;
import docking.wizard.*;
import ghidra.app.util.GenericHelpTopics;
import ghidra.util.HelpLocation;
@ -42,7 +42,7 @@ public class RepositoryPanel extends AbstractWizardJPanel {
private JRadioButton existingRepButton;
private JRadioButton createRepButton;
private ButtonGroup buttonGroup;
private JList<String> nameList;
private GList<String> nameList;
private DefaultListModel<String> listModel;
private JTextField nameField;
private JLabel nameLabel;
@ -161,8 +161,7 @@ public class RepositoryPanel extends AbstractWizardJPanel {
for (String repositoryName : repositoryNames) {
listModel.addElement(repositoryName);
}
nameList = new JList<>(listModel);
DockingUtils.turnOffHTMLRendering(nameList);
nameList = new GList<>(listModel);
nameList.setEnabled(existingRepButton.isSelected());
JScrollPane sp = new JScrollPane(nameList);
innerPanel.add(sp);