GT-2855 - code review fixes

This commit is contained in:
dev747368 2019-05-09 13:21:15 -04:00
parent 463b74b60d
commit b01c3a848e

View file

@ -77,16 +77,15 @@ class DirectoryList extends GList<File> implements GhidraFileChooserDirectoryMod
} }
}); });
addMouseListener(new MouseAdapter() { addMouseListener(new GMouseListenerAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
super.mouseClicked(e);
// always end editing on a mouse click of any kind // always end editing on a mouse click of any kind
listEditor.setVisible(false); listEditor.setVisible(false);
requestFocus(); requestFocus();
} }
});
addMouseListener(new GMouseListenerAdapter() {
@Override @Override
public boolean shouldConsume(MouseEvent e) { public boolean shouldConsume(MouseEvent e) {
@ -183,7 +182,7 @@ class DirectoryList extends GList<File> implements GhidraFileChooserDirectoryMod
chooser.getInvalidFilenameMessage(listEditorField.getText()); chooser.getInvalidFilenameMessage(listEditorField.getText());
if (invalidFilenameMessage != null) { if (invalidFilenameMessage != null) {
chooser.setStatusText(invalidFilenameMessage); chooser.setStatusText(invalidFilenameMessage);
// keep the user in the field // keep the user in the field by not stopping the current edit
} }
else { else {
stopListEdit(); stopListEdit();
@ -355,6 +354,7 @@ class DirectoryList extends GList<File> implements GhidraFileChooserDirectoryMod
chooser.getInvalidFilenameMessage(listEditorField.getText()); chooser.getInvalidFilenameMessage(listEditorField.getText());
if (invalidFilenameMessage != null) { if (invalidFilenameMessage != null) {
chooser.setStatusText("Rename aborted - " + invalidFilenameMessage); chooser.setStatusText("Rename aborted - " + invalidFilenameMessage);
cancelListEdit();
return; return;
} }