Skip to content

Commit 2f91802

Browse files
committed
Find action in searchable text component context menu.
1 parent f80ca80 commit 2f91802

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HTMLView.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@
3636
import java.util.Collection;
3737
import java.util.Objects;
3838
import java.util.concurrent.ExecutionException;
39+
import javax.swing.Action;
3940
import javax.swing.BorderFactory;
4041
import javax.swing.JComponent;
42+
import javax.swing.JMenuItem;
4143
import javax.swing.JPanel;
4244
import javax.swing.JPopupMenu;
4345
import javax.swing.SwingUtilities;
@@ -219,6 +221,12 @@ protected void populatePopup(JPopupMenu popup) {
219221
if (popup.getComponentCount() > 0) popup.addSeparator();
220222
popup.add(createCopyMenuItem());
221223
popup.add(createSelectAllMenuItem());
224+
225+
Action find = getActionMap().get(HTMLTextAreaSearchUtils.FIND_ACTION_KEY);
226+
if (find != null) {
227+
popup.addSeparator();
228+
popup.add(new JMenuItem(find));
229+
}
222230
}
223231
};
224232

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Bundle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ HTMLTextArea_PasteString=Paste
6161
HTMLTextArea_DeleteString=Delete
6262
HTMLTextArea_SelectAllString=Select All
6363

64+
HTMLTextAreaSearchUtils_FindActionName=Find
6465
HTMLTextAreaSearchUtils_MatchesPattern={0} of {1} matches
6566
HTMLTextAreaSearchUtils_NoMatches=no matches
6667
HTMLTextAreaSearchUtils_MatchesTooltip=Highlight matches

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextArea.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,12 @@ protected void populatePopup(JPopupMenu popup) {
780780
popup.add(createDeleteMenuItem());
781781
popup.addSeparator();
782782
popup.add(createSelectAllMenuItem());
783+
784+
Action find = getActionMap().get(HTMLTextAreaSearchUtils.FIND_ACTION_KEY);
785+
if (find != null) {
786+
popup.addSeparator();
787+
popup.add(new JMenuItem(find));
788+
}
783789
}
784790

785791
protected JMenuItem createCutMenuItem() {

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextAreaSearchUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public final class HTMLTextAreaSearchUtils {
9595
// -----
9696
// I18N String constants
9797
private static final ResourceBundle messages = ResourceBundle.getBundle("org.graalvm.visualvm.lib.ui.components.Bundle"); // NOI18N
98+
private static final String FIND_ACTION_NAME = messages.getString("HTMLTextAreaSearchUtils_FindActionName"); // NOI18N
9899
private static final String MATCHES_PATTERN = messages.getString("HTMLTextAreaSearchUtils_MatchesPattern"); // NOI18N
99100
private static final String NO_MATCHES = messages.getString("HTMLTextAreaSearchUtils_NoMatches"); // NOI18N
100101
private static final String MATCHES_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_MatchesTooltip"); // NOI18N
@@ -641,7 +642,7 @@ public static void enableSearchActions(final HTMLTextArea area) {
641642
ActionMap actionMapArea = area.getActionMap();
642643
InputMap inputMapArea = area.getInputMap();
643644

644-
Action findAction = new AbstractAction() {
645+
Action findAction = new AbstractAction(FIND_ACTION_NAME) {
645646
public void actionPerformed(ActionEvent e) {
646647
SwingUtilities.invokeLater(new Runnable() {
647648
public void run() {

0 commit comments

Comments
 (0)