Merge remote-tracking branch 'upstream/new-extension' into new-extension

app/src/processing/app/Preferences.java

@@ -121,6 +121,7 @@ public class Preferences {
   JTextField memoryField;
   JCheckBox checkUpdatesBox;
   JTextField fontSizeField;
+  JCheckBox updateExtensionBox;
   JCheckBox autoAssociateBox;
 
 
@@ -326,6 +327,14 @@ public class Preferences {
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
     
+    // [ ] Update sketch files to new extension on save (.pde -> .ino)
+    
+    updateExtensionBox = new JCheckBox("Update sketch files to new extension on save (.pde -> .ino)");
+    pain.add(updateExtensionBox);
+    d = updateExtensionBox.getPreferredSize();
+    updateExtensionBox.setBounds(left, top, d.width + 10, d.height);
+    right = Math.max(right, left + d.width);
+    top += d.height + GUI_BETWEEN;    
 
     // [ ] Automatically associate .pde files with Processing
 
@@ -527,6 +536,8 @@ public class Preferences {
                  autoAssociateBox.isSelected());
     }
     
+    setBoolean("editor.update_extension", updateExtensionBox.isSelected());
+
     editor.applyPreferences();
   }
 
@@ -559,6 +570,9 @@ public class Preferences {
         setSelected(getBoolean("platform.auto_file_type_associations"));
     }
     
+    updateExtensionBox.setSelected(get("editor.update_extension") == null ||
+                                   getBoolean("editor.update_extension"));
+
     dialog.setVisible(true);
   }
 

app/src/processing/app/Sketch.java

@@ -707,21 +707,45 @@ public class Sketch {
                        "need to re-save this sketch to another location.");
       // if the user cancels, give up on the save()
       if (!saveAs()) return false;
-    }
+    } else {
+      // rename .pde files to .ino
+      File mainFile = new File(getMainFilePath());
+      File mainFolder = mainFile.getParentFile();
+      File[] pdeFiles = mainFolder.listFiles(new FilenameFilter() {
+        public boolean accept(File dir, String name) {
+          return name.toLowerCase().endsWith(".pde");
+        }
+      });
       
-    // rename .pde files to .ino
+      if (pdeFiles != null && pdeFiles.length > 0) {
-    File mainFile = new File(getMainFilePath());
+        if (Preferences.get("editor.update_extension") == null) {
-    File mainFolder = mainFile.getParentFile();
+          Object[] options = { "OK", "Cancel" };
-    File[] pdeFiles = mainFolder.listFiles(new FilenameFilter() {
+          int result = JOptionPane.showOptionDialog(editor,
-      public boolean accept(File dir, String name) {
+                                                    "In Arduino 1.0, the default file extension has changed\n" +
-        return name.toLowerCase().endsWith(".pde");
+                                                    "from .pde to .ino.  New sketches (including those created\n" +
+                                                    "by \"Save-As\" will use the new extension.  The extension\n" +
+                                                    "of existing sketches will be updated on save, but you can\n" +
+                                                    "disable this in the Preferences dialog.\n" +
+                                                    "\n" +
+                                                    "Save sketch and update its extension?",
+                                                    ".pde -> .ino",
+                                                    JOptionPane.OK_CANCEL_OPTION,
+                                                    JOptionPane.QUESTION_MESSAGE,
+                                                    null,
+                                                    options,
+                                                    options[0]);
+          
+          if (result != JOptionPane.OK_OPTION) return false; // save cancelled
+          
+          Preferences.setBoolean("editor.update_extension", true);
+        }
+        
+        if (Preferences.getBoolean("editor.update_extension")) {
+          // Do rename of all .pde files to new .ino extension
+          for (File pdeFile : pdeFiles)
+            renameCodeToInoExtension(pdeFile);
+        }
       }
-    });
-    
-    if (pdeFiles != null && pdeFiles.length > 0) {
-      // Do rename of all .pde files to new .ino extension
-      for (File pdeFile : pdeFiles)
-        renameCodeToInoExtension(pdeFile);
     }
 
     for (int i = 0; i < codeCount; i++) {