add simple mix mode

Author: gaocegege

src/rprocessing/RLangPApplet.java

@@ -11,6 +11,7 @@
 import org.renjin.sexp.SEXP;
 
 import processing.core.PApplet;
+import rprocessing.util.Constant;
 
 /**
  * RlangPApplet
@@ -34,15 +35,6 @@ private enum Mode {
     // definitions, which we then invoke during the run loop.
     private final Mode               mode;
 
-    /** The name of processing's PApplet in R top context. */
-    private static final String      PROCESSING_VAR_NAME = "processing";
-
-    private static final String      SETTINGS_NAME       = "settings";
-
-    private static final String      SETUP_NAME          = "setup";
-
-    private static final String      DRAW_NAME           = "draw";
-
     /** Program Code */
     private final String             programText;
 
@@ -79,6 +71,9 @@ public void prePassCode() {
      */
     private Mode detectMode() {
         if (isActiveMode()) {
+            if (isMixMode()) {
+                return Mode.MIXED;
+            }
             return Mode.ACTIVE;
         }
         return Mode.STATIC;
@@ -89,15 +84,15 @@ private Mode detectMode() {
      * Notice: DO NOT do it in constructor.
      */
     public void AddPAppletToRContext() {
-        this.renjinEngine.put(PROCESSING_VAR_NAME, this);
+        this.renjinEngine.put(Constant.PROCESSING_VAR_NAME, this);
     }
 
     /**
      * @see processing.core.PApplet#settings()
      */
     @Override
     public void settings() {
-        Object obj = this.renjinEngine.get(SETTINGS_NAME);
+        Object obj = this.renjinEngine.get(Constant.SETTINGS_NAME);
         if (obj.getClass().equals(Closure.class)) {
             ((Closure) obj).doApply(this.renjinEngine.getTopLevelContext());
         } else if (mode == Mode.STATIC) {
@@ -119,12 +114,12 @@ public void setup() {
                 System.out.println(e);
             }
         } else if (this.mode == Mode.ACTIVE) {
-            Object obj = this.renjinEngine.get(SETUP_NAME);
+            Object obj = this.renjinEngine.get(Constant.SETUP_NAME);
             if (obj.getClass().equals(Closure.class)) {
                 ((Closure) obj).doApply(this.renjinEngine.getTopLevelContext());
             }
         } else {
-            // TODO: implement MIX Mode.
+            System.out.println("The program is in mix mode now.");
         }
     }
 
@@ -134,7 +129,7 @@ public void setup() {
      */
     @Override
     public void draw() {
-        Object obj = this.renjinEngine.get(DRAW_NAME);
+        Object obj = this.renjinEngine.get(Constant.DRAW_NAME);
         if (obj.getClass().equals(Closure.class)) {
             ((Closure) obj).doApply(this.renjinEngine.getTopLevelContext());
         }
@@ -152,14 +147,30 @@ public void draw() {
     @SuppressWarnings("rawtypes")
     private boolean isActiveMode() {
         Class closureClass = Closure.class;
-        if (isSameClass(this.renjinEngine.get(SETTINGS_NAME), closureClass)
-            || isSameClass(this.renjinEngine.get(SETUP_NAME), closureClass)
-            || isSameClass(this.renjinEngine.get(DRAW_NAME), closureClass)) {
+        if (isSameClass(this.renjinEngine.get(Constant.SETTINGS_NAME), closureClass)
+            || isSameClass(this.renjinEngine.get(Constant.SETUP_NAME), closureClass)
+            || isSameClass(this.renjinEngine.get(Constant.DRAW_NAME), closureClass)) {
             return true;
         }
         return false;
     }
 
+    /**
+     * Detect whether the program is in mix mode.
+     * After: isActiveMode()
+     * 
+     * @return
+     */
+    @SuppressWarnings("rawtypes")
+    private boolean isMixMode() {
+        Class closureClass = Closure.class;
+        if (isSameClass(this.renjinEngine.get(Constant.SIZE_NAME), closureClass)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Set Environment variables in R top context.
      */

src/rprocessing/util/Constant.java

@@ -0,0 +1,18 @@
+package rprocessing.util;
+
+/**
+ * 
+ * @author github.com/gaocegege
+ */
+public class Constant {
+    /** The name of processing's PApplet in R top context. */
+    public static final String PROCESSING_VAR_NAME = "processing";
+
+    public static final String SETTINGS_NAME       = "settings";
+
+    public static final String SETUP_NAME          = "setup";
+
+    public static final String DRAW_NAME           = "draw";
+
+    public static final String SIZE_NAME           = "size";
+}