Fix edit actions when the text area is not focused

Since some edit actions are handled by RTextArea Action objects
directly, they no longer worked when the main text area was not focused.
This is because RecordableTextAction uses TextAction.getTextComponent to
figure out what component to act on, which resolves to the event source
(if it is a JTextComponent) or the most recently JTextComponent
otherwise.

In this case, it meant that if the error output component is
focused, actions will not work. To fix that, the actions are wrapped to
always act on the text area in the current tab, instead of relying on
getTextComponent().

Author: matthijskooijman

app/src/processing/app/Editor.java

@@ -33,6 +33,7 @@
 import jssc.SerialPortException;
 import processing.app.debug.RunnerException;
 import processing.app.forms.PasswordAuthorizationDialog;
+import processing.app.helpers.ActionWrapper;
 import processing.app.helpers.Keys;
 import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMapException;
@@ -1259,6 +1260,24 @@ public void actionPerformed(ActionEvent e) {
     return menu;
   }
 
+  /**
+   * Wrapper around RSyntaxTextArea's RecordableTextActions. Normally,
+   * these actions use the event source, or the most recently focused
+   * component to find the text area to work on, but this does not
+   * always work. This wrapper makes them always work on the currently
+   * selected tab instead.
+   */
+  class RstaActionWrapper extends ActionWrapper {
+    RstaActionWrapper(RecordableTextAction action) {
+      super(action);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      ((RecordableTextAction) getWrappedAction()).actionPerformedImpl(e, getCurrentTab().getTextArea());
+    }
+  }
+
   private JMenu buildEditMenu() {
     JMenu menu = new JMenu(tr("Edit"));
     menu.setName("menuEdit");
@@ -1269,12 +1288,12 @@ private JMenu buildEditMenu() {
     new RTextArea();
 
     RecordableTextAction undoAction = RTextArea.getAction(RTextArea.UNDO_ACTION);
-    JMenuItem undoItem = new JMenuItem(undoAction);
+    JMenuItem undoItem = new JMenuItem(new RstaActionWrapper(undoAction));
     undoItem.setName("menuEditUndo");
     menu.add(undoItem);
 
     RecordableTextAction redoAction = RTextArea.getAction(RTextArea.REDO_ACTION);
-    JMenuItem redoItem = new JMenuItem(redoAction);
+    JMenuItem redoItem = new JMenuItem(new RstaActionWrapper(redoAction));
     redoItem.setName("menuEditRedo");
     menu.add(redoItem);
 
@@ -1288,10 +1307,10 @@ private JMenu buildEditMenu() {
     menu.addSeparator();
 
     RecordableTextAction cutAction = RTextArea.getAction(RTextArea.CUT_ACTION);
-    menu.add(new JMenuItem(cutAction));
+    menu.add(new JMenuItem(new RstaActionWrapper(cutAction)));
 
     RecordableTextAction copyAction = RTextArea.getAction(RTextArea.COPY_ACTION);
-    menu.add(new JMenuItem(copyAction));
+    menu.add(new JMenuItem(new RstaActionWrapper(copyAction)));
 
 
     JMenuItem copyForumItem = newJMenuItemShift(tr("Copy for Forum"), 'C');
@@ -1311,10 +1330,10 @@ public void actionPerformed(ActionEvent e) {
     menu.add(copyHTMLItem);
 
     RecordableTextAction pasteAction = RTextArea.getAction(RTextArea.PASTE_ACTION);
-    menu.add(new JMenuItem(pasteAction));
+    menu.add(new JMenuItem(new RstaActionWrapper(pasteAction)));
 
     RecordableTextAction selectAllAction = RTextArea.getAction(RTextArea.SELECT_ALL_ACTION);
-    menu.add(new JMenuItem(selectAllAction));
+    menu.add(new JMenuItem(new RstaActionWrapper(selectAllAction)));
 
     JMenuItem gotoLine = newJMenuItem(tr("Go to line..."), 'L');
     gotoLine.addActionListener(e -> {

app/src/processing/app/helpers/ActionWrapper.java

@@ -0,0 +1,54 @@
+package processing.app.helpers;
+
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.Action;
+
+public class ActionWrapper implements Action {
+  protected Action action;
+
+  public ActionWrapper(Action wrapped) {
+    this.action = wrapped;
+  }
+
+  public Action getWrappedAction() {
+    return this.action;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    this.action.actionPerformed(e);
+  }
+
+  @Override
+  public Object getValue(String key) {
+    return this.action.getValue(key);
+  }
+
+  @Override
+  public void putValue(String key, Object value) {
+    this.action.putValue(key, value);
+  }
+
+  @Override
+  public void setEnabled(boolean b) {
+    this.action.setEnabled(b);
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return this.action.isEnabled();
+  }
+
+  @Override
+  public void addPropertyChangeListener(PropertyChangeListener listener) {
+    this.action.addPropertyChangeListener(listener);
+  }
+
+  @Override
+  public void removePropertyChangeListener(PropertyChangeListener listener) {
+    this.action.removePropertyChangeListener(listener);
+  }
+
+}