From b8923cfeee58eb44e10777e724bb177e6a77b146 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Tue, 4 Jul 2006 18:57:47 +0000
Subject: [PATCH] Fixed bug that sometimes uploaded old code versions.  Now
 showing "compiling..." and "burning bootloader" messages.  Up'ed version to
 0005.

---
 app/Base.java   |  2 +-
 app/Editor.java | 90 ++++++++++++++++++++++++++-----------------------
 app/Sketch.java |  2 ++
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/app/Base.java b/app/Base.java
index 6f5104a0e..0b13c569a 100644
--- a/app/Base.java
+++ b/app/Base.java
@@ -53,7 +53,7 @@ import com.ice.jni.registry.*;
  */
 public class Base {
   static final int VERSION = 3;
-  static final String VERSION_NAME = "0004 Alpha";
+  static final String VERSION_NAME = "0005 Alpha";
   
   // platform IDs for PApplet.platform
 
diff --git a/app/Editor.java b/app/Editor.java
index 7daafa906..b090c5acd 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -1269,7 +1269,7 @@ public class Editor extends JFrame
 
 
 
-  public void handleRun(boolean present) {
+  public void handleRun(final boolean present) {
     doClose();
     running = true;
     buttons.activate(EditorButtons.RUN);
@@ -1299,25 +1299,28 @@ public class Editor extends JFrame
       }
     }
 
-    try {
-      if (!sketch.handleRun(new Target(
-          System.getProperty("user.dir") + File.separator + "lib" +
-          File.separator + "targets", Preferences.get("build.target"))))
-        return;
+    SwingUtilities.invokeLater(new Runnable() {
+      public void run() {
+        try {
+          if (!sketch.handleRun(new Target(
+              System.getProperty("user.dir") + File.separator + "lib" +
+              File.separator + "targets", Preferences.get("build.target"))))
+            return;
+    
+          //runtime = new Runner(sketch, Editor.this);
+          //runtime.start(appletLocation);
+          watcher = new RunButtonWatcher();
+          message("Done compiling.");
+          if(watcher != null) watcher.stop();
+    
+        } catch (RunnerException e) {
+          message("Error compiling...");
+          error(e);
 
-      //runtime = new Runner(sketch, Editor.this);
-      //runtime.start(appletLocation);
-      watcher = new RunButtonWatcher();
-      message("Done compiling.");
-      if(watcher != null) watcher.stop();
-
-    } catch (RunnerException e) {
-      message("Error compiling...");
-      error(e);
-
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+      }});
     
     // this doesn't seem to help much or at all
     /*
@@ -1961,34 +1964,37 @@ public class Editor extends JFrame
     System.exit(0);
   }
 
-  protected void handleBurnBootloader(boolean parallel) {
+  protected void handleBurnBootloader(final boolean parallel) {
     if(debugging)
       doStop();
     console.clear();
     //String what = sketch.isLibrary() ? "Applet" : "Library";
     //message("Exporting " + what + "...");
-    message("Burning bootloader to I/O Board...");
-    try {
-      //boolean success = sketch.isLibrary() ?
-      //sketch.exportLibrary() : sketch.exportApplet();
-      Uploader uploader = new Uploader();
-      boolean success = parallel ? 
-        uploader.burnBootloaderParallel() :
-        uploader.burnBootloaderAVRISP();
-      
-      if (success) {
-        message("Done burning bootloader.");
-      } else {
-        // error message will already be visible
-      }
-    } catch (RunnerException e) {
-      message("Error while burning bootloader.");
-      //e.printStackTrace();
-      error(e);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    buttons.clear();
+    message("Burning bootloader to I/O Board (this may take a minute)...");
+    SwingUtilities.invokeLater(new Runnable() {
+      public void run() {
+        try {
+          //boolean success = sketch.isLibrary() ?
+          //sketch.exportLibrary() : sketch.exportApplet();
+          Uploader uploader = new Uploader();
+          boolean success = parallel ? 
+            uploader.burnBootloaderParallel() :
+            uploader.burnBootloaderAVRISP();
+          
+          if (success) {
+            message("Done burning bootloader.");
+          } else {
+            // error message will already be visible
+          }
+        } catch (RunnerException e) {
+          message("Error while burning bootloader.");
+          //e.printStackTrace();
+          error(e);
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+        buttons.clear();
+      }});
   }
 
   public void highlightLine(int lnum) {
diff --git a/app/Sketch.java b/app/Sketch.java
index c5ad82eba..002afddfb 100644
--- a/app/Sketch.java
+++ b/app/Sketch.java
@@ -1736,6 +1736,8 @@ public class Sketch {
     // make sure the user didn't hide the sketch folder
     ensureExistence();
 
+    current.program = editor.getText();
+
     zipFileContents = new Hashtable();
 
     // nuke the old applet folder because it can cause trouble