simple refactor for quick_debug variables. cleaned comments

Author: kevindeland

app/src/main/java/cmu/xprize/robotutor/RoboTutor.java

@@ -82,7 +82,12 @@
  */
 public class RoboTutor extends Activity implements IReadyListener, IRoboTutor {
 
-    private static final boolean QUICK_DEBUG = true; // LEBRON
+    // VARIABLES FOR QUICK DEBUG LAUNCH
+    private static final boolean QUICK_DEBUG = true;
+    private static final String debugTutorVariant = "countingx";
+    private static final String debugTutorId = "countingx:1_10";
+    private static final String debugTutorFile = "[file]countingx_1_10.json";
+
     private CTutorEngine        tutorEngine;
     private CMediaController    mMediaController;
 
@@ -499,7 +504,7 @@ private void startEngine() {
                 startView.startTapTutor();
                 setFullScreen();
             }
-            // LEBRON
+            // QUICK DEBUG LAUNCH
             else if (QUICK_DEBUG) {
 
                 startQuickLaunch();
@@ -522,17 +527,24 @@ else if (QUICK_DEBUG) {
 
     }
 
-    /**
-     * LEBRON new method
-     * This launches a new tutor immediately at startup. Used for quick debugging.
-     */
-    private void startQuickLaunch() {
+
+    // TODO: This is a temporary log update mechanism - see below
+    //
+    static public void setGUIDCallBack(IGuidView callBack) {
+
+        guidCallBack = callBack;
+    }
+
+
+    // TODO: This is a temporary log update mechanism - see below
+    //
+    public void onStartTutor() {
+
         logManager.postEvent_V(TAG, "LOG_GUID:" + LOG_ID );
         LOG_ID = CPreferenceCache.initLogPreference(this);
 
         Log.d(TCONST.DEBUG_GRAY_SCREEN_TAG, "xx: startSessionManager in 'onStartTutor'");
-        //tutorEngine.startSessionManager(); // LEBRON don't startSessionManager
-        tutorEngine.quickLaunch();
+        tutorEngine.startSessionManager();
 
         startView.stopTapTutor();
         masterContainer.removeView(startView);
@@ -543,24 +555,16 @@ private void startQuickLaunch() {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
-
-    // TODO: This is a temporary log update mechanism - see below
-    //
-    static public void setGUIDCallBack(IGuidView callBack) {
-
-        guidCallBack = callBack;
-    }
-
-
-    // TODO: This is a temporary log update mechanism - see below
-    //
-    public void onStartTutor() {
-
+    /**
+     *
+     * This launches a new tutor immediately at startup. Useful for quick debugging.
+     */
+    private void startQuickLaunch() {
         logManager.postEvent_V(TAG, "LOG_GUID:" + LOG_ID );
         LOG_ID = CPreferenceCache.initLogPreference(this);
 
         Log.d(TCONST.DEBUG_GRAY_SCREEN_TAG, "xx: startSessionManager in 'onStartTutor'");
-        tutorEngine.startSessionManager(); // LEBRON don't startSessionManager
+        tutorEngine.quickLaunch(debugTutorVariant, debugTutorId, debugTutorFile);
 
         startView.stopTapTutor();
         masterContainer.removeView(startView);

app/src/main/java/cmu/xprize/robotutor/tutorengine/CTutorEngine.java

@@ -243,24 +243,21 @@ static public void startSessionManager() {
             return;
         }
 
-        createTutor(defTutor, featureString, null); // LEBRON mimic this
+        createTutor(defTutor, featureString, null);
         launchTutor(tutorBindings);
     }
 
     /**
-     * LEBRON new method
+     *
      * This launches a new tutor immediately at startup. Used for quick debugging.
      */
-    public void quickLaunch() {
+    public void quickLaunch(String tutorVariant, String tutorId, String tutorFile) {
 
-        // LEBRON TODO make hard-coding better
-        String tutorVariant = "bpop.num"; // LEBRON what is tutorVariant?
-        String tutorId = "bpop.num:0..9.by.1.asc.q2q.AV.rise.12__it_2"; // LEBRON what is tutorId?
 
         defvar_tutor  tutorDescriptor = tutorVariants.get(tutorVariant);
         defdata_tutor tutorBinding    = bindingPatterns.get(tutorDescriptor.tutorName);
 
-        initializeBindingPattern(tutorBinding, "[file]bpop.num_0..9.by.1.asc.q2q.AV.rise.12.json");
+        initializeBindingPattern(tutorBinding, tutorFile);
 
         createTutor(tutorDescriptor.tutorName , tutorDescriptor.features, tutorId);
         launchTutor(tutorBinding);
@@ -336,7 +333,6 @@ static public void killActiveTutor() {
      * @param tutorName
      * @param features
      */
-    // LEBRON this is the method we'll be calling!
     static private void createTutor(String tutorName, String features, String tutorId) {
 
         Log.d(TCONST.DEBUG_GRAY_SCREEN_TAG, "r4: killActiveTutor called from createTutor(" + tutorName + ")");
@@ -357,7 +353,7 @@ static private void createTutor(String tutorName, String features, String tutorI
 
         // GRAY_SCREEN_BUG CTutor created --> Media Manager created --> added to map
         Log.d(TCONST.DEBUG_GRAY_SCREEN_TAG, "p2: Initializing tutor: " + tutorName);
-        // LEBRON tutor first created here
+
         activeTutor = new CTutor(Activity, tutorName, tutorId, (ITutorManager)tutorContainer, TutorLogManager, mRootScope, language, features);
     }
 
@@ -553,8 +549,7 @@ static public void launch(String intentType, String tutorVariant, String dataSou
             case "native":
 
                 Log.d(TCONST.DEBUG_GRAY_SCREEN_TAG, "p3b: Creating Tutor in 'CTutor.launch': " + tutorDescriptor.tutorName);
-                // LEBRON AAA copy this... tutor created here...
-                createTutor(tutorDescriptor.tutorName, tutorDescriptor.features, tutorId); // LEBRON where does tutorDescriptor come from? what about tutorBinding?
+                createTutor(tutorDescriptor.tutorName, tutorDescriptor.features, tutorId);
                 launchTutor(tutorBinding);
                 break;
 

app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_action.java

@@ -167,7 +167,7 @@ public String applyNode() {
 
                         // Resolve any variables in the parameters.
                         // Session manager uses TScope variables to store intents
-                        // LEBRON TODO where does this come from???
+                        //
                         String intent     = getScope().parseTemplate(parmList.get(0));
                         String intentData = getScope().parseTemplate(parmList.get(2));
                         String dataSource = getScope().parseTemplate(parmList.get(4));