feat: move the function about mouse to BuiltinApplet (#126)

Author: hawkingrei

src/rprocessing/RLangPApplet.java

@@ -51,9 +51,6 @@ public class RLangPApplet extends BuiltinApplet {
   /** Program code */
   private final String programText;
 
-  /** Engine to interpret R code */
-  private final RenjinScriptEngine renjinEngine;
-
   private static final String CORE_TEXT =
       RScriptReader.readResourceAsText(Runner.class, "r/core.R");
 
@@ -78,15 +75,6 @@ private static void log(String msg) {
   }
 
   public RLangPApplet(final String programText, final Printer stdout) throws NotFoundException {
-    // Create a script engine manager.
-    ScriptEngineManager manager = new ScriptEngineManager();
-    // Create a Renjin engine.
-    ScriptEngine engine = manager.getEngineByName("Renjin");
-    // Check if the engine has loaded correctly.
-    if (engine == null) {
-      throw new NotFoundException("Renjin Script Engine not found on the classpath.");
-    }
-    this.renjinEngine = (RenjinScriptEngine) engine;
     this.programText = programText;
     this.stdout = stdout;
     this.prePassCode();
@@ -322,39 +310,6 @@ private boolean isMixMode() {
     Class closureClass = Closure.class;
     return isSameClass(this.renjinEngine.get(Constant.SIZE_NAME), closureClass);
   }
-
-  /**
-   *
-   * @see processing.core.PApplet#focusGained()
-   */
-  @Override
-  public void focusGained() {
-    super.focusGained();
-    this.renjinEngine.put("focused",super.focused);
-  }
-
-  /**
-   *
-   * @see processing.core.PApplet#focusLost()
-   */
-  @Override
-  public void focusLost() {
-    super.focusLost();
-    this.renjinEngine.put("focused",super.focused);
-  }
-
-  @Override
-  public void mouseMoved() {
-    wrapMouseVariables();
-  }
-
-  private void wrapMouseVariables() {
-    this.renjinEngine.put("mouseX", mouseX);
-    this.renjinEngine.put("mouseY", mouseY);
-    this.renjinEngine.put("pmouseX", pmouseX);
-    this.renjinEngine.put("pmouseY", pmouseY);
-    //this.renjinEngine.put("mouseButton", mouseButton);
-  }
 
   /**
    * Set Environment variables in R top context.

src/rprocessing/applet/BuiltinApplet.java

@@ -3,6 +3,19 @@
 import org.renjin.sexp.StringVector;
 
 import processing.core.PApplet;
+import rprocessing.exception.NotFoundException;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.renjin.parser.RParser;
+import org.renjin.script.RenjinScriptEngine;
+import org.renjin.sexp.Closure;
+import org.renjin.sexp.ExpressionVector;
+import org.renjin.sexp.FunctionCall;
+import org.renjin.sexp.SEXP;
+import org.renjin.sexp.Symbol;
 
 /**
  * BuiltinApplet is the type to refactor the function calls.
@@ -14,6 +27,20 @@ public class BuiltinApplet extends PApplet {
   /*
    * TODO: Check for the cast.
    */
+  /** Engine to interpret R code */
+  protected final RenjinScriptEngine renjinEngine;
+
+  public BuiltinApplet() throws NotFoundException {
+    // Create a script engine manager.
+    ScriptEngineManager manager = new ScriptEngineManager();
+    // Create a Renjin engine.
+    ScriptEngine engine = manager.getEngineByName("Renjin");
+    // Check if the engine has loaded correctly.
+    if (engine == null) {
+      throw new NotFoundException("Renjin Script Engine not found on the classpath.");
+    }
+    this.renjinEngine = (RenjinScriptEngine) engine;
+  }
 
   public void size(double width, double height) {
     super.size((int) width, (int) height);
@@ -34,4 +61,37 @@ public boolean getFocused() {
   public double getPI() {
     return PI;
   }
+
+  /**
+   *
+   * @see processing.core.PApplet#focusGained()
+   */
+  @Override
+  public void focusGained() {
+    super.focusGained();
+    this.renjinEngine.put("focused",super.focused);
+  }
+
+  /**
+   *
+   * @see processing.core.PApplet#focusLost()
+   */
+  @Override
+  public void focusLost() {
+    super.focusLost();
+    this.renjinEngine.put("focused",super.focused);
+  }
+
+  @Override
+  public void mouseMoved() {
+    wrapMouseVariables();
+  }
+
+  protected void wrapMouseVariables() {
+    this.renjinEngine.put("mouseX", mouseX);
+    this.renjinEngine.put("mouseY", mouseY);
+    this.renjinEngine.put("pmouseX", pmouseX);
+    this.renjinEngine.put("pmouseY", pmouseY);
+    //this.renjinEngine.put("mouseButton", mouseButton);
+  }
 }