Merge branch 'master' into wifly_integration

Author: amcewen

.classpath

@@ -2,9 +2,11 @@
 <classpath>
 	<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
-	<classpathentry kind="lib" path="build/shared/lib/antlr.jar"/>
-	<classpathentry kind="lib" path="build/shared/lib/registry.jar"/>
-	<classpathentry kind="lib" path="build/shared/lib/apple.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
+	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
+	<classpathentry kind="lib" path="app/lib/apple.jar"/>
+	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
+	<classpathentry kind="lib" path="app/lib/jna.jar"/>
+	<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,10 +1,15 @@
-#Thu Jan 10 10:50:38 PST 2008
+#Tue Aug 16 19:08:40 CEST 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

app/src/processing/app/Base.java

@@ -41,9 +41,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 22;
+  public static final int REVISION = 100;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0022";
+  static String VERSION_NAME = "0100";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
@@ -349,6 +349,10 @@ protected boolean restoreSketches() {
     int opened = 0;
     for (int i = 0; i < count; i++) {
       String path = Preferences.get("last.sketch" + i + ".path");
+      // don't automatically rename sketches that were left open from a 
+      // pre-1.0 version of Arduino (wait for the user to explicitly open
+      // the sketch before renaming it).
+      if (path.toLowerCase().endsWith(".pde")) continue;
       int[] location;
       if (windowPositionValid) {
         String locationStr = Preferences.get("last.sketch" + i + ".location");
@@ -545,7 +549,7 @@ protected String createNewUntitled() throws IOException {
     newbieDir.mkdirs();
 
     // Make an empty pde file
-    File newbieFile = new File(newbieDir, newbieName + ".pde");
+    File newbieFile = new File(newbieDir, newbieName + ".ino");
     new FileOutputStream(newbieFile);  // create the file
     return newbieFile.getAbsolutePath();
   }
@@ -637,7 +641,8 @@ public void handleOpenPrompt() {
         public boolean accept(File dir, String name) {
           // TODO this doesn't seem to ever be used. AWESOME.
           //System.out.println("check filter on " + dir + " " + name);
-          return name.toLowerCase().endsWith(".pde");
+          return name.toLowerCase().endsWith(".ino")
+              || name.toLowerCase().endsWith(".pde");
         }
       });
 
@@ -988,6 +993,13 @@ public void rebuildExamplesMenu(JMenu menu) {
   }
 
 
+  public void onBoardOrPortChange() {
+    for (Editor editor : editors) {
+      editor.onBoardOrPortChange();
+    }  
+  }
+
+  
   public void rebuildBoardsMenu(JMenu menu) {
     //System.out.println("rebuilding boards menu");
     menu.removeAll();      
@@ -1000,6 +1012,7 @@ public void actionPerformed(ActionEvent actionevent) {
               //System.out.println("Switching to " + target + ":" + board);
               Preferences.set("target", (String) getValue("target"));
               Preferences.set("board", (String) getValue("board"));
+              onBoardOrPortChange();
             }
           };
         action.putValue("target", target.getName());
@@ -1016,22 +1029,28 @@ public void actionPerformed(ActionEvent actionevent) {
   }
 
 
-  public void rebuildBurnBootloaderMenu(JMenu menu) {
-    //System.out.println("rebuilding burn bootloader menu");
+  public void rebuildProgrammerMenu(JMenu menu) {
+    //System.out.println("rebuilding programmer menu");
     menu.removeAll();      
+    ButtonGroup group = new ButtonGroup();
     for (Target target : targetsTable.values()) {
       for (String programmer : target.getProgrammers().keySet()) {
         AbstractAction action = 
           new AbstractAction(
-            "w/ " + target.getProgrammers().get(programmer).get("name")) {
+            target.getProgrammers().get(programmer).get("name")) {
             public void actionPerformed(ActionEvent actionevent) {
-              activeEditor.handleBurnBootloader((String) getValue("target"),
-                                                (String) getValue("programmer"));
+              Preferences.set("programmer", getValue("target") + ":" +
+                                            getValue("programmer"));
             }
           };
         action.putValue("target", target.getName());
         action.putValue("programmer", programmer);
-        JMenuItem item = new JMenuItem(action);
+        JMenuItem item = new JRadioButtonMenuItem(action);
+        if (Preferences.get("programmer").equals(target.getName() + ":" +
+                                                 programmer)) {
+          item.setSelected(true);
+        }
+        group.add(item);
         menu.add(item);
       }
     }
@@ -1091,7 +1110,10 @@ public void actionPerformed(ActionEvent e) {
       File subfolder = new File(folder, list[i]);
       if (!subfolder.isDirectory()) continue;
 
-      File entry = new File(subfolder, list[i] + ".pde");
+      File entry = new File(subfolder, list[i] + ".ino");
+      if (!entry.exists() && (new File(subfolder, list[i] + ".pde")).exists()) {
+      	entry = new File(subfolder, list[i] + ".pde");
+      }
       // if a .pde file of the same prefix as the folder exists..
       if (entry.exists()) {
         //String sanityCheck = sanitizedName(list[i]);