Style: Add comments and output statments

Signed-off-by: Ce Gao <[email protected]>

Author: gaocegege

.gitignore

@@ -19,6 +19,8 @@ build/
 try/
 *.log
 build.xml
+*.ucls
+*.graffle
 
 # Demo
 *.mov

src/rprocessing/RLangPApplet.java

@@ -21,6 +21,15 @@
  */
 public class RLangPApplet extends PApplet {
 
+    public static boolean VERBOSE = Boolean.getBoolean("verbose");
+
+    private static void log(String msg) {
+        if (!VERBOSE) {
+            return;
+        }
+        System.err.println(RLangPApplet.class.getSimpleName() + ": " + msg);
+    }
+
     /**
      * Mode for Processing.
      * 
@@ -35,7 +44,7 @@ private enum Mode {
     // definitions, which we then invoke during the run loop.
     private final Mode               mode;
 
-    /** Program Code */
+    /** Program code */
     private final String             programText;
 
     /** Engine to interpret R code */
@@ -57,7 +66,7 @@ public void prePassCode() {
         if (source.getClass().equals(ExpressionVector.class)) {
             ExpressionVector ev = (ExpressionVector) source;
             for (int i = 0; i < ev.length(); ++i) {
-                System.out.println(ev.get(i).getClass());
+                //                LOGGER.info("The type of expression is ", ev.get(i).getClass());
                 if (ev.get(i).getClass().equals(FunctionCall.class)) {
                     this.renjinEngine.getTopLevelContext().evaluate(ev.get(i),
                         this.renjinEngine.getTopLevelContext().getEnvironment());
@@ -112,7 +121,7 @@ public void setup() {
             try {
                 this.renjinEngine.eval(this.programText);
             } catch (ScriptException e) {
-                System.out.println(e);
+                log(e.toString());
             }
         } else if (this.mode == Mode.ACTIVE) {
             Object obj = this.renjinEngine.get(Constant.SETUP_NAME);

src/rprocessing/Runner.java

@@ -27,12 +27,12 @@ public class Runner {
 
     public static boolean        VERBOSE   = Boolean.getBoolean("verbose");
 
-    static void log(final Object... objs) {
+    private static void log(final Object... objs) {
         if (!VERBOSE) {
             return;
         }
         for (final Object o : objs) {
-            System.err.print(String.valueOf(o));
+            System.err.print(Runner.class.getSimpleName() + ": " + String.valueOf(o));
         }
         System.err.println();
     }
@@ -71,14 +71,12 @@ public synchronized static void runSketchBlocking(final RunnableSketch sketch,
         if (engine == null) {
             throw new RuntimeException("Renjin Script Engine not found on the classpath.");
         }
-        System.out.println(1);
+        log("Tring to initialize RLangPApplet.");
         RLangPApplet rp = new RLangPApplet(engine, sketch.getMainCode());
-        System.out.println(1);
+        log("Adding processing variable into R top context.");
         rp.AddPAppletToRContext();
 
-        System.out.println(rp);
         try {
-            engine.eval("print(processing)");
             engine.eval(CORE_TEXT);
             // Run Sketch.
             PApplet.runSketch(args, rp);

src/rprocessing/mode/RLangEditor.java

@@ -36,10 +36,14 @@
 import rprocessing.mode.run.SketchServiceRunner;
 
 /**
+ * RLangEditor is the editor abstraction in R mode, which builds a
+ * editor and initialize all related components such as formatter 
+ * toolbar.
  * 
  * @author github.com/gaocegege
  */
 public class RLangEditor extends Editor {
+
     private static void log(final String msg) {
         if (RLangMode.VERBOSE) {
             System.err.println(RLangEditor.class.getSimpleName() + ": " + msg);

src/rprocessing/mode/RLangMode.java

@@ -73,7 +73,7 @@ public String getDefaultExtension() {
 
     @Override
     public String getModuleExtension() {
-        return "py";
+        return "r";
     }
 
     /** 

src/rprocessing/mode/RLangToolbar.java

@@ -6,11 +6,22 @@
 import processing.app.ui.EditorToolbar;
 
 /**
+ * RLangToolbar is toolbar in R mode, which takes care of run and stop
+ * buttons. 
  * 
  * @author github.com/gaocegege
  */
 public class RLangToolbar extends EditorToolbar {
-    /**  */
+
+    public static boolean VERBOSE = Boolean.getBoolean("verbose");
+
+    static void log(String msg) {
+        if (!VERBOSE) {
+            return;
+        }
+        System.err.println(RLangToolbar.class.getSimpleName() + ": " + msg);
+    }
+
     private static final long serialVersionUID = -4227659009839101912L;
 
     public RLangToolbar(final Editor editor) {
@@ -19,6 +30,7 @@ public RLangToolbar(final Editor editor) {
 
     @Override
     public void handleRun(final int modifiers) {
+        log("The toolbar is handling start-event.");
         final RLangEditor peditor = (RLangEditor) editor;
         final boolean shift = (modifiers & InputEvent.SHIFT_MASK) != 0;
         if (shift) {
@@ -30,6 +42,7 @@ public void handleRun(final int modifiers) {
 
     @Override
     public void handleStop() {
+        log("The toolbar is handling stop-event.");
         final RLangEditor peditor = (RLangEditor) editor;
         peditor.handleStop();
     }