Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino"

This reverts commit 42fa932, reversing
changes made to a7352b8.

See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.

Author: damellis

app/src/processing/app/Base.java

@@ -545,7 +545,7 @@ protected String createNewUntitled() throws IOException {
     newbieDir.mkdirs();
 
     // Make an empty pde file
-    File newbieFile = new File(newbieDir, newbieName + ".ino");
+    File newbieFile = new File(newbieDir, newbieName + ".pde");
     new FileOutputStream(newbieFile);  // create the file
     return newbieFile.getAbsolutePath();
   }
@@ -637,8 +637,7 @@ 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(".ino")
-              || name.toLowerCase().endsWith(".pde");
+          return name.toLowerCase().endsWith(".pde");
         }
       });
 
@@ -1017,28 +1016,22 @@ public void actionPerformed(ActionEvent actionevent) {
   }
 
 
-  public void rebuildProgrammerMenu(JMenu menu) {
-    //System.out.println("rebuilding programmer menu");
+  public void rebuildBurnBootloaderMenu(JMenu menu) {
+    //System.out.println("rebuilding burn bootloader menu");
     menu.removeAll();      
-    ButtonGroup group = new ButtonGroup();
     for (Target target : targetsTable.values()) {
       for (String programmer : target.getProgrammers().keySet()) {
         AbstractAction action = 
           new AbstractAction(
-            target.getProgrammers().get(programmer).get("name")) {
+            "w/ " + target.getProgrammers().get(programmer).get("name")) {
             public void actionPerformed(ActionEvent actionevent) {
-              Preferences.set("programmer", getValue("target") + ":" +
-                                            getValue("programmer"));
+              activeEditor.handleBurnBootloader((String) getValue("target"),
+                                                (String) getValue("programmer"));
             }
           };
         action.putValue("target", target.getName());
         action.putValue("programmer", programmer);
-        JMenuItem item = new JRadioButtonMenuItem(action);
-        if (Preferences.get("programmer").equals(target.getName() + ":" +
-                                                 programmer)) {
-          item.setSelected(true);
-        }
-        group.add(item);
+        JMenuItem item = new JMenuItem(action);
         menu.add(item);
       }
     }
@@ -1098,10 +1091,7 @@ public void actionPerformed(ActionEvent e) {
       File subfolder = new File(folder, list[i]);
       if (!subfolder.isDirectory()) continue;
 
-      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");
-      }
+      File 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]);

app/src/processing/app/Editor.java

@@ -538,21 +538,21 @@ public void actionPerformed(ActionEvent e) {
       });
     fileMenu.add(saveAsMenuItem);
 
-    item = newJMenuItem("Upload", 'U');
+    item = newJMenuItem("Upload to I/O Board", 'U');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           handleExport(false);
         }
       });
     fileMenu.add(item);
 
-    item = newJMenuItemShift("Upload Using Programmer", 'U');
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          handleExport(true);
-        }
-      });
-    fileMenu.add(item);
+//    item = newJMenuItemShift("Upload to I/O Board (verbose)", 'U');
+//    item.addActionListener(new ActionListener() {
+//        public void actionPerformed(ActionEvent e) {
+//          handleExport(true);
+//        }
+//      });
+//    fileMenu.add(item);
 
     fileMenu.addSeparator();
 
@@ -618,13 +618,13 @@ public void actionPerformed(ActionEvent e) {
 //      });
 //    sketchMenu.add(item);
 
-//    item = new JMenuItem("Stop");
-//    item.addActionListener(new ActionListener() {
-//        public void actionPerformed(ActionEvent e) {
-//          handleStop();
-//        }
-//      });
-//    sketchMenu.add(item);
+    item = new JMenuItem("Stop");
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handleStop();
+        }
+      });
+    sketchMenu.add(item);
 
     sketchMenu.addSeparator();
 
@@ -693,20 +693,12 @@ public void actionPerformed(ActionEvent e) {
       serialMenu = new JMenu("Serial Port");
     populateSerialMenu();
     menu.add(serialMenu);
-    
+	  
     menu.addSeparator();
-    
-    JMenu programmerMenu = new JMenu("Programmer");
-    base.rebuildProgrammerMenu(programmerMenu);
-    menu.add(programmerMenu);
 
-    item = new JMenuItem("Burn Bootloader");
-    item.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        handleBurnBootloader();
-      }
-    });
-    menu.add(item);
+    JMenu bootloaderMenu = new JMenu("Burn Bootloader");
+    base.rebuildBurnBootloaderMenu(bootloaderMenu);
+    menu.add(bootloaderMenu);
 
     menu.addMenuListener(new MenuListener() {
       public void menuCanceled(MenuEvent e) {}
@@ -997,8 +989,8 @@ protected void populateSerialMenu() {
     //serialMenu.addSeparator();
     //serialMenu.add(item);
   }
-  
-  
+
+
   protected JMenu buildHelpMenu() {
     // To deal with a Mac OS X 10.5 bug, add an extra space after the name
     // so that the OS doesn't try to insert its slow help menu.
@@ -1895,12 +1887,12 @@ public Point getSketchLocation() {
    * Implements Sketch → Stop, or pressing Stop on the toolbar.
    */
   public void handleStop() {  // called by menu or buttons
-//    toolbar.activate(EditorToolbar.STOP);
+    toolbar.activate(EditorToolbar.STOP);
 
     internalCloseRunner();
 
     toolbar.deactivate(EditorToolbar.RUN);
-//    toolbar.deactivate(EditorToolbar.STOP);
+    toolbar.deactivate(EditorToolbar.STOP);
 
     // focus the PDE again after quitting presentation mode [toxi 030903]
     toFront();
@@ -2040,65 +2032,14 @@ protected void handleOpenUnchecked(String path, int codeIndex,
    * modifications (if any) to the previous sketch need to be saved.
    */
   protected boolean handleOpenInternal(String path) {
-    // rename .pde files to .ino
-    File[] oldFiles = (new File(path)).getParentFile().listFiles(new FilenameFilter() {
-      public boolean accept(File dir, String name) {
-        return (name.toLowerCase().endsWith(".pde"));
-      }
-    });
-    
-    if (oldFiles != null && oldFiles.length > 0) {
-      if (!Preferences.getBoolean("editor.update_extension")) {
-        Object[] options = { "OK", "Cancel" };
-        String prompt =
-          "In Arduino 1.0, the file extension for sketches changed\n" +
-          "from \".pde\" to \".ino\".  This version of the software only\n" +
-          "supports the new extension.  Rename the files in this sketch\n" +
-          "(and future sketches) and continue?";
-        
-        int result = JOptionPane.showOptionDialog(this,
-                                                  prompt,
-                                                  "New extension",
-                                                  JOptionPane.YES_NO_OPTION,
-                                                  JOptionPane.QUESTION_MESSAGE,
-                                                  null,
-                                                  options,
-                                                  options[0]);
-        if (result != JOptionPane.YES_OPTION) {
-          return false;
-        }
-        
-        Preferences.setBoolean("editor.update_extension", true);
-      }
-      
-      for (int i = 0; i < oldFiles.length; i++) {
-        String oldPath = oldFiles[i].getPath();
-        File newFile = new File(oldPath.substring(0, oldPath.length() - 4) + ".ino");
-        try {
-          Base.copyFile(oldFiles[i], newFile);
-        } catch (IOException e) {
-          Base.showWarning("Error", "Could not copy to a proper location.", e);
-          return false;
-        }
-
-        // remove the original file, so user doesn't get confused
-        oldFiles[i].delete();
-
-        // update with the new path
-        if (oldFiles[i].compareTo(new File(path)) == 0) {
-          path = newFile.getAbsolutePath();      	
-        }
-      }
-    }
-    
     // check to make sure that this .pde file is
     // in a folder of the same name
     File file = new File(path);
     File parentFile = new File(file.getParent());
     String parentName = parentFile.getName();
-    String pdeName = parentName + ".ino";
+    String pdeName = parentName + ".pde";
     File altFile = new File(file.getParent(), pdeName);
-    
+
     if (pdeName.equals(file.getName())) {
       // no beef with this guy
 
@@ -2108,10 +2049,10 @@ public boolean accept(File dir, String name) {
       path = altFile.getAbsolutePath();
       //System.out.println("found alt file in same folder");
 
-    } else if (!path.endsWith(".ino")) {
+    } else if (!path.endsWith(".pde")) {
       Base.showWarning("Bad file selected",
                        "Processing can only open its own sketches\n" +
-                       "and other files ending in .ino", null);
+                       "and other files ending in .pde", null);
       return false;
 
     } else {
@@ -2330,13 +2271,13 @@ public boolean serialPrompt() {
    * Made synchronized to (hopefully) avoid problems of people
    * hitting export twice, quickly, and horking things up.
    */
-  synchronized public void handleExport(final boolean usingProgrammer) {
+  synchronized public void handleExport(final boolean verbose) {
     //if (!handleExportCheckModified()) return;
     toolbar.activate(EditorToolbar.EXPORT);
     console.clear();
     statusNotice("Uploading to I/O Board...");
 
-    new Thread(usingProgrammer ? exportAppHandler : exportHandler).start();
+    new Thread(verbose ? exportAppHandler : exportHandler).start();
   }
 
   // DAM: in Arduino, this is upload
@@ -2454,14 +2395,14 @@ public void handleSerial() {
   }
 
 
-  protected void handleBurnBootloader() {
+  protected void handleBurnBootloader(final String target, final String programmer) {
     console.clear();
     statusNotice("Burning bootloader to I/O Board (this may take a minute)...");
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
         try {
           Uploader uploader = new AvrdudeUploader();
-          if (uploader.burnBootloader()) {
+          if (uploader.burnBootloader(target, programmer)) {
             statusNotice("Done burning bootloader.");
           } else {
             statusError("Error while burning bootloader.");

app/src/processing/app/EditorToolbar.java

@@ -37,12 +37,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
   /** Rollover titles for each button. */
   static final String title[] = {
-    "Verify", "Upload", "New", "Open", "Save", "Serial Monitor"
+    "Verify", "Stop", "New", "Open", "Save", "Upload", "Serial Monitor"
   };
 
   /** Titles for each button when the shift key is pressed. */ 
   static final String titleShift[] = {
-    "Verify", "Upload Using Programmer", "New Editor Window", "Open in Another Window", "Save", "Serial Monitor"
+    "Verify (w/ Verbose Output)", "Stop", "New Editor Window", "Open in Another Window", "Save", "Upload (w/ Verbose Output)", "Serial Monitor"
   };
 
   static final int BUTTON_COUNT  = title.length;
@@ -57,13 +57,14 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
 
   static final int RUN      = 0;
-  static final int EXPORT   = 1;
+  static final int STOP     = 1;
 
   static final int NEW      = 2;
   static final int OPEN     = 3;
   static final int SAVE     = 4;
+  static final int EXPORT   = 5;
 
-  static final int SERIAL   = 5;
+  static final int SERIAL   = 6;
 
   static final int INACTIVE = 0;
   static final int ROLLOVER = 1;
@@ -104,10 +105,11 @@ public EditorToolbar(Editor editor, JMenu menu) {
 
     //which[buttonCount++] = NOTHING;
     which[buttonCount++] = RUN;
-    which[buttonCount++] = EXPORT;
+    which[buttonCount++] = STOP;
     which[buttonCount++] = NEW;
     which[buttonCount++] = OPEN;
     which[buttonCount++] = SAVE;
+    which[buttonCount++] = EXPORT;
     which[buttonCount++] = SERIAL;
 
     currentRollover = -1;
@@ -310,13 +312,13 @@ public void mousePressed(MouseEvent e) {
 
     switch (sel) {
     case RUN:
-      editor.handleRun(false);
+      editor.handleRun(e.isShiftDown());
+      break;
+
+    case STOP:
+      editor.handleStop();
       break;
 
-//    case STOP:
-//      editor.handleStop();
-//      break;
-//
     case OPEN:
       popup = menu.getPopupMenu();
       popup.show(EditorToolbar.this, x, y);

app/src/processing/app/Preferences.java

@@ -113,8 +113,6 @@ public class Preferences {
 
   JTextField sketchbookLocationField;
   JCheckBox exportSeparateBox;
-  JCheckBox verboseCompilationBox;
-  JCheckBox verboseUploadBox;
   JCheckBox deletePreviousBox;
   JCheckBox externalEditorBox;
   JCheckBox memoryOverrideBox;
@@ -281,21 +279,6 @@ public void actionPerformed(ActionEvent e) {
     top += d.height + GUI_BETWEEN;
 
 
-    // Show verbose output during: [ ] compilation [ ] upload
-    
-    box = Box.createHorizontalBox();
-    label = new JLabel("Show verbose output during: ");
-    box.add(label);
-    verboseCompilationBox = new JCheckBox("compilation ");
-    box.add(verboseCompilationBox);
-    verboseUploadBox = new JCheckBox("upload");
-    box.add(verboseUploadBox);
-    pain.add(box);
-    d = box.getPreferredSize();
-    box.setBounds(left, top, d.width, d.height);
-    top += d.height + GUI_BETWEEN;
-    
-
     // [ ] Delete previous applet or application folder on export
 
     deletePreviousBox =
@@ -478,8 +461,6 @@ protected void disposeFrame() {
    */
   protected void applyFrame() {
     // put each of the settings into the table
-    setBoolean("build.verbose", verboseCompilationBox.isSelected());
-    setBoolean("upload.verbose", verboseUploadBox.isSelected());
     setBoolean("export.delete_target_folder",
                deletePreviousBox.isSelected());
 
@@ -535,8 +516,6 @@ protected void showFrame(Editor editor) {
     this.editor = editor;
 
     // set all settings entry boxes to their actual status
-    verboseCompilationBox.setSelected(getBoolean("build.verbose"));
-    verboseUploadBox.setSelected(getBoolean("upload.verbose"));
     deletePreviousBox.
       setSelected(getBoolean("export.delete_target_folder"));