wrapping up more of the debugging bits so not as many messages are coming through

benfry · benfry · commit c5201b3ead84 · 2010-08-13T13:19:02.000Z
diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java
@@ -59,7 +59,8 @@ public class PApplet extends Activity implements PConstants, Runnable {
   /** The PGraphics renderer associated with this PApplet */
   public PGraphics g;
 
-  static final boolean DEBUG = true;
+//  static final boolean DEBUG = true;
+  static final boolean DEBUG = false;
   
   /** The frame containing this applet (if any) */
 //  public Frame frame;
diff --git a/android/tool/src/processing/app/tools/android/AndroidEnvironment.java b/android/tool/src/processing/app/tools/android/AndroidEnvironment.java
@@ -55,7 +55,7 @@ public static void killAdbServer() {
 
 
   private AndroidEnvironment() {
-    if (AndroidMode.DEBUG) {
+    if (processing.app.Base.DEBUG) {
       System.out.println("Starting up AndroidEnvironment");
     }
 //    killAdbServer();
diff --git a/android/tool/src/processing/app/tools/android/AndroidMode.java b/android/tool/src/processing/app/tools/android/AndroidMode.java
@@ -52,8 +52,6 @@ public class AndroidMode implements DeviceListener {
   private Editor editor;
   private Build build;
   
-  static public boolean DEBUG = true;
-
   private static final String ANDROID_CORE_FILENAME =
     "processing-android-core-" + Base.VERSION_NAME + ".zip";
 
diff --git a/android/tool/src/processing/app/tools/android/AndroidSDK.java b/android/tool/src/processing/app/tools/android/AndroidSDK.java
@@ -199,7 +199,9 @@ public static ProcessResult runADB(final String... cmd)
       adbCmd = cmd;
     }
     // printing this here to see if anyone else is killing the adb server
-    if (AndroidMode.DEBUG) PApplet.println(adbCmd);
+    if (processing.app.Base.DEBUG) {
+      PApplet.println(adbCmd);
+    }
 //    try {
     ProcessResult adbResult = new ProcessHelper(adbCmd).execute();
     // Ignore messages about starting up an adb daemon
diff --git a/android/tool/src/processing/app/tools/android/Build.java b/android/tool/src/processing/app/tools/android/Build.java
@@ -113,7 +113,9 @@ public File createProject(String target) {
 
     // Create the 'src' folder with the preprocessed code.
     final File srcFolder = new File(tempBuildFolder, "src");
-    if (AndroidMode.DEBUG) Base.openFolder(tempBuildFolder);
+    if (processing.app.Base.DEBUG) {
+      Base.openFolder(tempBuildFolder);
+    }
 
     try {
       manifest = new Manifest(editor);
diff --git a/android/tool/src/processing/app/tools/android/EmulatorController.java b/android/tool/src/processing/app/tools/android/EmulatorController.java
@@ -26,8 +26,10 @@ public State getState() {
   }
 
   private void setState(final State state) {
-    System.out.println("Emulator state: " + state);
-    new Exception().printStackTrace(System.out);
+    if (processing.app.Base.DEBUG) {
+      System.out.println("Emulator state: " + state);
+      new Exception().printStackTrace(System.out);
+    }
     this.state = state;
   }
 
@@ -103,7 +105,9 @@ public void run() {
         try {
           //          System.err.println("EmulatorController: Waiting for boot.");
           while (state == State.WAITING_FOR_BOOT) {
-            System.out.println("sleeping for 2 seconds " + new java.util.Date().toString());
+            if (processing.app.Base.DEBUG) {
+              System.out.println("sleeping for 2 seconds " + new java.util.Date().toString());
+            }
             Thread.sleep(2000);
 //            System.out.println("done sleeping");
             for (final String device : AndroidEnvironment.listDevices()) {
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -46,6 +46,8 @@ public class Base {
   static public String VERSION_NAME = "0190";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
+  /** True if heavy debugging error/log messages are enabled */
+  static public boolean DEBUG = false;
 
   static HashMap<Integer, String> platformNames =
     new HashMap<Integer, String>();
diff --git a/app/src/processing/app/exec/StreamPump.java b/app/src/processing/app/exec/StreamPump.java
@@ -12,6 +12,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import processing.app.Base;
 
 
 /**
@@ -77,10 +78,12 @@ public void run() {
         }
       }
     } catch (final IOException e) {
-//      System.err.println("StreamPump: " + name);
-//      e.printStackTrace(System.err);
-      // removing for 0190, but need a better way to handle these
-//      throw new RuntimeException("Inside " + this + " for " + name, e);
+      if (Base.DEBUG) {
+        System.err.println("StreamPump: " + name);
+        e.printStackTrace(System.err);
+        // removing for 0190, but need a better way to handle these
+        throw new RuntimeException("Inside " + this + " for " + name, e);
+      }
     }
   }
 
diff --git a/todo.txt b/todo.txt
@@ -18,6 +18,11 @@ X   http://dev.processing.org/bugs/show_bug.cgi?id=35
 X   http://code.google.com/p/processing/issues/detail?id=15
 
 
+mode work
+_ locations: sketchbook, examples, libraries
+_ 'export' and 'export application' titles and/or # of items
+_ 'run' and 'present' under sketch, and/or # of items
+
 _ add processing.js export tool from florian
 _   http://github.com/fjenett/processingjstool/
 _   http://github.com/fjenett/processingjstool/zipball/v0.0.6
@@ -31,9 +36,8 @@ _   http://code.google.com/p/processing/issues/detail?id=335
 _ auto-format screws up if/else/else if blocks
 _   http://code.google.com/p/processing/issues/detail?id=325
 
-_ locations: sketchbook, examples, libraries
-_ 'export' and 'export application' titles and/or # of items
-_ 'run' and 'present' under sketch, and/or # of items
+_ Exported libraries don't mantain symbolic links
+_   http://code.google.com/p/processing/issues/detail?id=353
 
 _ launch4j problem
 _   no crash when double-clicking a sketch and loading it

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static void killAdbServer() {`
`55`	`55`
`56`	`56`
`57`	`57`	`private AndroidEnvironment() {`
`58`		`- if (AndroidMode.DEBUG) {`
	`58`	`+ if (processing.app.Base.DEBUG) {`
`59`	`59`	`System.out.println("Starting up AndroidEnvironment");`
`60`	`60`	`}`
`61`	`61`	`// killAdbServer();`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import java.util.concurrent.ExecutorService;`
`13`	`13`	`import java.util.concurrent.Executors;`
`14`	`14`	`import java.util.concurrent.ThreadFactory;`
	`15`	`+import processing.app.Base;`
`15`	`16`
`16`	`17`
`17`	`18`	`/**`
`@@ -77,10 +78,12 @@ public void run() {`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`	`} catch (final IOException e) {`
`80`		`-// System.err.println("StreamPump: " + name);`
`81`		`-// e.printStackTrace(System.err);`
`82`		`- // removing for 0190, but need a better way to handle these`
`83`		`-// throw new RuntimeException("Inside " + this + " for " + name, e);`
	`81`	`+ if (Base.DEBUG) {`
	`82`	`+ System.err.println("StreamPump: " + name);`
	`83`	`+ e.printStackTrace(System.err);`
	`84`	`+ // removing for 0190, but need a better way to handle these`
	`85`	`+ throw new RuntimeException("Inside " + this + " for " + name, e);`
	`86`	`+ }`
`84`	`87`	`}`
`85`	`88`	`}`
`86`	`89`