oh my god did this really take two hours?

Author: benfry

app/src/processing/app/ui/Editor.java

@@ -131,6 +131,9 @@ public abstract class Editor extends JFrame implements RunnerListener {
   /** Menu Actions updated on the opening of the edit menu. */
   protected List<UpdatableAction> editMenuUpdatable = new ArrayList<>();
 
+  protected FindNextAction findNextAction;
+  protected FindPreviousAction findPreviousAction;
+
   /** The currently selected tab's undo manager and caret positions*/
   private UndoManager undo;
   // maintain caret position during undo operations
@@ -788,15 +791,15 @@ protected JMenu buildEditMenu() {
     });
     menu.add(item);
 
-    UpdatableAction action;
-    item = Toolkit.newJMenuItem(action = new FindNextAction(), 'G');
-    editMenuUpdatable.add(action);
+    item = Toolkit.newJMenuItem(findNextAction = new FindNextAction(), 'G');
+    editMenuUpdatable.add(findNextAction);
     menu.add(item);
 
-    item = Toolkit.newJMenuItemShift(action = new FindPreviousAction(), 'G');
-    editMenuUpdatable.add(action);
+    item = Toolkit.newJMenuItemShift(findPreviousAction = new FindPreviousAction(), 'G');
+    editMenuUpdatable.add(findPreviousAction);
     menu.add(item);
 
+    UpdatableAction action;
     item = Toolkit.newJMenuItem(action = new SelectionForFindAction(), 'E');
     editMenuUpdatable.add(action);
     menu.add(item);

app/src/processing/app/ui/FindReplace.java

@@ -179,8 +179,11 @@ public FindReplace(Editor editor) {
     replaceButton.addActionListener(e -> replace());
     replaceAllButton.addActionListener(e -> replaceAll());
     replaceAndFindButton.addActionListener(e -> replaceAndFindNext());
-    findButton.addActionListener(e -> findNext());
-    previousButton.addActionListener(e -> findPrevious());
+
+//    findButton.addActionListener(e -> findNext());
+//    previousButton.addActionListener(e -> findPrevious());
+    Toolkit.applyAction(editor.findNextAction, findButton);
+    Toolkit.applyAction(editor.findPreviousAction, previousButton);
 
     getRootPane().setDefaultButton(findButton);
 

app/src/processing/app/ui/Toolkit.java

@@ -56,6 +56,7 @@
 
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
@@ -188,7 +189,10 @@ static public JMenuItem newJMenuItem(String title, int what) {
    */
   static public JMenuItem newJMenuItem(Action action, int what) {
     JMenuItem menuItem = new JMenuItem(action);
-    menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK));
+    // Use putValue() instead of setAccelerator() to work with applyAction()
+//    menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK));
+    action.putValue(Action.ACCELERATOR_KEY,
+                    KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK));
     return menuItem;
   }
 
@@ -208,7 +212,10 @@ static public JMenuItem newJMenuItemShift(String title, int what) {
    */
   static public JMenuItem newJMenuItemShift(Action action, int what) {
     JMenuItem menuItem = new JMenuItem(action);
-    menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK));
+    // Use putValue() instead of setAccelerator() to work with applyAction()
+//    menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK));
+    action.putValue(Action.ACCELERATOR_KEY,
+                    KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK));
     return menuItem;
   }
 
@@ -514,6 +521,21 @@ static public int getMenuItemIndex(JMenu menu, JMenuItem item) {
   }
 
 
+  /**
+   * Apply an Action from something else (i.e. a JMenuItem) to a JButton.
+   * Swing is so absof*ckinglutely convoluted sometimes. Do we really need
+   * half a dozen lines of boilerplate to apply a key shortcut to a button?
+   */
+  static public void applyAction(Action action, JButton button) {
+    button.setAction(action);
+    // use an arbitrary but unique name
+    String name = String.valueOf(action.hashCode());
+    button.getActionMap().put(name, action);
+    button.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+      .put((KeyStroke) action.getValue(Action.ACCELERATOR_KEY), name);
+  }
+
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 

todo.txt

@@ -3,6 +3,7 @@ X Help Menu disabled on OS X (looks like a JVM bug)
 X   https://github.com/processing/processing/issues/4353#issuecomment-237715947
 X   https://github.com/processing/processing4/issues/617
 X   https://github.com/processing/processing4/issues/638
+X make ctrl-g (and ctrl-shift-g) work inside the Find window
 
 contributed
 X “Cannot find a class or type named ‘PApplet’” error
@@ -114,8 +115,6 @@ o   seems to be out of sync/unavailable data based on more recent contrib change
 X   should be resolved with more recent changes
 
 
-_ make ctrl-g work inside the find window
-
 _ export to IntelliJ? how tricky?
 _   just copy jars to /lib?
 _   point to binaries in /Applications/Processing.app? (no)