Improve quick search behavior in OutlineView, TreeTable, and ListView #8319
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,15 @@ | |
| <data xmlns="http://www.netbeans.org/ns/nb-module-project/3"> | ||
| <code-name-base>org.openide.explorer</code-name-base> | ||
| <module-dependencies> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.api.annotations.common</code-name-base> | ||
| <build-prerequisite/> | ||
| <compile-dependency/> | ||
| <run-dependency> | ||
| <release-version>1</release-version> | ||
| <specification-version>1.13</specification-version> | ||
| </run-dependency> | ||
| </dependency> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.swing.outline</code-name-base> | ||
| <build-prerequisite/> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,7 +45,6 @@ | |
| import javax.swing.AbstractAction; | ||
| import javax.swing.Action; | ||
| import javax.swing.BorderFactory; | ||
| import javax.swing.JComponent; | ||
| import javax.swing.JLabel; | ||
| import javax.swing.JList; | ||
|
|
@@ -58,6 +57,8 @@ | |
| import javax.swing.ListSelectionModel; | ||
| import javax.swing.SwingUtilities; | ||
| import javax.swing.ToolTipManager; | ||
| import javax.swing.UIManager; | ||
| import javax.swing.border.Border; | ||
| import javax.swing.event.DocumentEvent; | ||
| import javax.swing.event.DocumentListener; | ||
| import javax.swing.event.ListDataEvent; | ||
|
|
@@ -73,10 +74,11 @@ | |
| import org.openide.nodes.Node.Property; | ||
| import org.openide.nodes.NodeOp; | ||
| import org.openide.util.Mutex; | ||
| import org.openide.util.Utilities; | ||
| import org.openide.util.WeakListeners; | ||
| import org.openide.util.actions.CallbackSystemAction; | ||
| import org.netbeans.api.annotations.common.StaticResource; | ||
| import org.openide.util.ImageUtilities; | ||
|
|
||
| /** Explorer view to display items in a list. | ||
| * <p> | ||
|
|
@@ -112,6 +114,13 @@ | |
| * @author Ian Formanek, Jan Jancura, Jaroslav Tulach | ||
| */ | ||
| public class ListView extends JScrollPane implements Externalizable { | ||
| @StaticResource | ||
| private static final String ICON_FIND = "org/openide/explorer/view/find.png"; // NOI18N | ||
| private static final KeyStroke NEXT_ALTERNATIVE_KEY_STROKE = Utilities.stringToKey("D-G"); | ||
| private static final KeyStroke PREVIOUS_ALTERNATIVE_KEY_STROKE = Utilities.stringToKey("DS-G"); | ||
| private static final KeyStroke OPEN_SEARCH_KEY_STROKE = Utilities.stringToKey("D-F"); | ||
| private static final KeyStroke OPEN_SEARCH_ALTERNATIVE_KEY_STROKE = Utilities.stringToKey("F3"); | ||
|
|
||
| /** generated Serialized Version UID */ | ||
| static final long serialVersionUID = -7540940974042262975L; | ||
|
|
||
|
|
@@ -1035,6 +1044,13 @@ private void setupSearch() { | |
| public void keyPressed(KeyEvent e) { | ||
| int modifiers = e.getModifiers(); | ||
| int keyCode = e.getKeyCode(); | ||
| KeyStroke ks = KeyStroke.getKeyStrokeForEvent(e); | ||
|
|
||
| if (OPEN_SEARCH_KEY_STROKE.equals(ks) || OPEN_SEARCH_ALTERNATIVE_KEY_STROKE.equals(ks)) { | ||
| searchTextField.setText(""); | ||
| displaySearchField(); | ||
| return; | ||
| } | ||
|
|
||
| if (((modifiers > 0) && (modifiers != KeyEvent.SHIFT_MASK)) || e.isActionKey()) { | ||
| return; | ||
|
|
@@ -1108,12 +1124,17 @@ private void prepareSearchPanel() { | |
| if (searchpanel == null) { | ||
| searchpanel = new JPanel(); | ||
|
|
||
| JLabel lbl = new JLabel(ImageUtilities.loadImageIcon(ICON_FIND, false)); //NOI18N | ||
| searchpanel.setLayout(new BorderLayout(5, 0)); | ||
| searchpanel.add(lbl, BorderLayout.WEST); | ||
| searchpanel.add(searchTextField, BorderLayout.CENTER); | ||
| lbl.setLabelFor(searchTextField); | ||
| Border customBorder = UIManager.getBorder("NbExplorerView.quicksearch.listview.border.instance"); | ||
| if (customBorder != null) { | ||
| searchpanel.setBorder(customBorder); | ||
| } else { | ||
| searchpanel.setBorder(BorderFactory.createRaisedBevelBorder()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1216,19 +1237,30 @@ public void removeUpdate(DocumentEvent e) { | |
|
|
||
| @Override | ||
| public void keyPressed(KeyEvent e) { | ||
| // Recognize the same keystrokes as in org.openide.awt.QuickSearch. | ||
| int keyCode = e.getKeyCode(); | ||
| KeyStroke ks = KeyStroke.getKeyStrokeForEvent(e); | ||
|
|
||
| if (keyCode == KeyEvent.VK_ESCAPE) { | ||
| removeSearchField(); | ||
| NbList.this.requestFocus(); | ||
| } else if (OPEN_SEARCH_KEY_STROKE.equals(ks) || OPEN_SEARCH_ALTERNATIVE_KEY_STROKE.equals(ks)) { | ||
| searchTextField.selectAll(); | ||
| } else if (keyCode == KeyEvent.VK_UP || | ||
| keyCode == KeyEvent.VK_F3 && e.getModifiersEx() == KeyEvent.SHIFT_DOWN_MASK || | ||
| keyCode == KeyEvent.VK_ENTER && e.getModifiersEx() == KeyEvent.SHIFT_DOWN_MASK || | ||
| PREVIOUS_ALTERNATIVE_KEY_STROKE.equals(ks)) | ||
| { | ||
| currentSelectionIndex--; | ||
| displaySearchResult(); | ||
|
|
||
| // Stop processing the event here. Otherwise it's dispatched | ||
| // to the tree too (which scrolls) | ||
| e.consume(); | ||
| } else if (keyCode == KeyEvent.VK_DOWN || | ||
| keyCode == KeyEvent.VK_F3 && e.getModifiersEx() == 0 || | ||
| NEXT_ALTERNATIVE_KEY_STROKE.equals(ks)) | ||
| { | ||
| currentSelectionIndex++; | ||
| displaySearchResult(); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,8 +87,10 @@ public void quickSearchUpdate(String searchText) { | |
| quickSearchInitialColumn = 0; | ||
| } | ||
| } | ||
| if (quickSearchLastRow < 0 || quickSearchLastColumn < 0) { | ||
| quickSearchLastRow = quickSearchInitialRow; | ||
| quickSearchLastColumn = quickSearchInitialColumn; | ||
| } | ||
| doSearch(searchText, true); | ||
| } | ||
|
|
||
|
|
@@ -152,14 +154,18 @@ public void quickSearchConfirmed() { | |
| quickSearchInitialColumn = -1; | ||
| } | ||
|
|
||
| private static final boolean RESTORE_PRIOR_SELECTION_AFTER_QUICK_SEARCH = false; | ||
|
Contributor
There was a problem hiding this comment. What is the idea here? Is this a fancy way of commenting out code?
Contributor
Author
There was a problem hiding this comment. Oh, sorry I left that in. I'll remove it... (Yes, fancy way to comment out code, especially when I need to experiment with different UI behaviors for a while before deciding what works or not. It also survives later refactoring.) |
||
|
|
||
| @Override | ||
| public void quickSearchCanceled() { | ||
| // Check whether the cancel was explicit or implicit. | ||
| // Implicit cancel has undefined focus owner | ||
| // TODO: After switch to JDK 8, we can e.g. add a static method to Callback providing the info. | ||
| if (RESTORE_PRIOR_SELECTION_AFTER_QUICK_SEARCH) { | ||
| Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); | ||
| if (focusOwner != null) { | ||
| displaySearchResult(quickSearchInitialRow, quickSearchInitialColumn); | ||
| } | ||
| } | ||
| quickSearchInitialRow = -1; | ||
| quickSearchInitialColumn = -1; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1957,12 +1957,14 @@ public void quickSearchUpdate(String searchText) { | |
|
|
||
| @Override | ||
| public void showNextSelection(boolean forward) { | ||
| if (lastSearchText != null) { | ||
| if (forward) { | ||
| currentSelectionIndex++; | ||
| } else { | ||
| currentSelectionIndex--; | ||
| } | ||
| displaySearchResult(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -2096,7 +2098,7 @@ private void displaySearchResult() { | |
| setSelectionPath(path); | ||
| scrollPathToVisible(path); | ||
| } else { | ||
| if ((lastSearchText == null || lastSearchText.isEmpty()) && origSelectionPaths != null) { | ||
| setSelectionPaths(origSelectionPaths); | ||
| scrollPathToVisible(origSelectionPaths[0]); | ||
| } else { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a problem in Project and Files views in the IDE as it overrides the project wide searches.