From 65e0d8b547cfa309995d5566ed5edefa15c75016 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 18 May 2015 17:09:50 +0200
Subject: [PATCH] New editor on MacOSX: CMD+E uses selection to find next
 entry. Fixes #3147

---
 app/src/processing/app/Editor.java      | 9 +++------
 app/src/processing/app/FindReplace.java | 9 ++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 37d258ed1..9ca878055 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1422,7 +1422,7 @@ public class Editor extends JFrame implements RunnerListener {
         if (find == null) {
           find = new FindReplace(Editor.this);
         }
-        if (!OSUtils.isMacOS() && getSelectedText() != null) {
+        if (!OSUtils.isMacOS()) {
           find.setFindText(getSelectedText());
         }
         find.setLocationRelativeTo(Editor.this);
@@ -1458,11 +1458,8 @@ public class Editor extends JFrame implements RunnerListener {
           if (find == null) {
             find = new FindReplace(Editor.this);
           }
-          if (getSelectedText() != null) {
-            find.setFindText(getSelectedText());
-          }
-          find.setLocationRelativeTo(Editor.this);
-          find.setVisible(true);
+          find.setFindText(getSelectedText());
+          find.findNext();
         }
       });
       menu.add(item);
diff --git a/app/src/processing/app/FindReplace.java b/app/src/processing/app/FindReplace.java
index df1c95114..1c3b380d9 100644
--- a/app/src/processing/app/FindReplace.java
+++ b/app/src/processing/app/FindReplace.java
@@ -439,9 +439,12 @@ public class FindReplace extends JFrame implements ActionListener {
     }
   }
 
-  public void setFindText(String t) {
-    findField.setText(t);
-    findString = t;
+  public void setFindText(String text) {
+    if (text == null) {
+      return;
+    }
+    findField.setText(text);
+    findString = text;
   }
 
   public void findNext() {