From b01c3a848ed095e67e4729f4243bcf2429b0686c Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Thu, 9 May 2019 13:21:15 -0400 Subject: [PATCH] GT-2855 - code review fixes --- .../docking/widgets/filechooser/DirectoryList.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java index d41929e1c7..e2a16741b4 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java @@ -77,16 +77,15 @@ class DirectoryList extends GList implements GhidraFileChooserDirectoryMod } }); - addMouseListener(new MouseAdapter() { + addMouseListener(new GMouseListenerAdapter() { @Override public void mouseClicked(MouseEvent e) { + super.mouseClicked(e); + // always end editing on a mouse click of any kind listEditor.setVisible(false); requestFocus(); } - }); - - addMouseListener(new GMouseListenerAdapter() { @Override public boolean shouldConsume(MouseEvent e) { @@ -183,7 +182,7 @@ class DirectoryList extends GList implements GhidraFileChooserDirectoryMod chooser.getInvalidFilenameMessage(listEditorField.getText()); if (invalidFilenameMessage != null) { chooser.setStatusText(invalidFilenameMessage); - // keep the user in the field + // keep the user in the field by not stopping the current edit } else { stopListEdit(); @@ -355,6 +354,7 @@ class DirectoryList extends GList implements GhidraFileChooserDirectoryMod chooser.getInvalidFilenameMessage(listEditorField.getText()); if (invalidFilenameMessage != null) { chooser.setStatusText("Rename aborted - " + invalidFilenameMessage); + cancelListEdit(); return; }