Pre-merge upstream Arduino

app/src/processing/app/Base.java

@@ -46,9 +46,9 @@ import static processing.app.I18n._;
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 100;
+  public static final int REVISION = 101;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0100";
+  static String VERSION_NAME = "0101";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
@@ -171,6 +171,9 @@ public class Base {
     // run static initialization that grabs all the prefs
     Preferences.init(null);
 
+    // load the I18n module for internationalization
+    I18n.init(Preferences.get("editor.languages.current"));
+
     // setup the theme coloring fun
     Theme.init();
 
@@ -1535,12 +1538,12 @@ public class Base {
   
   
   static public String getAvrBasePath() {
-    if(Base.isLinux()) {
-      return ""; // avr tools are installed system-wide and in the path
-    } else {
-      return getHardwarePath() + File.separator + "tools" +
-             File.separator + "avr" + File.separator + "bin" + File.separator;
-    }  
+    String path = getHardwarePath() + File.separator + "tools" +
+                  File.separator + "avr" + File.separator + "bin" + File.separator;
+    if (Base.isLinux() && !(new File(path)).exists()) {
+      return "";  // use distribution provided avr tools if bundled tools missing
+    }
+    return path;
   }
   
   

app/src/processing/app/Editor.java

@@ -264,7 +264,9 @@ public class Editor extends JFrame implements RunnerListener {
       splitPane.setDividerSize(dividerSize);
     }
 
-    splitPane.setMinimumSize(new Dimension(600, 400));
+    // the following changed from 600, 400 for netbooks
+    // http://code.google.com/p/arduino/issues/detail?id=52
+    splitPane.setMinimumSize(new Dimension(600, 100));
     box.add(splitPane);
 
     // hopefully these are no longer needed w/ swing
@@ -288,19 +290,9 @@ public class Editor extends JFrame implements RunnerListener {
     setPlacement(location);
 
 
-    // If the window is resized too small this will resize it again to the
-    // minimums. Adapted by Chris Lonnen from comments here:
-    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4320050
-    // as a fix for http://dev.processing.org/bugs/show_bug.cgi?id=25
-    final int minW = Preferences.getInteger("editor.window.width.min");
-    final int minH = Preferences.getInteger("editor.window.height.min");
-    addComponentListener(new java.awt.event.ComponentAdapter() {
-        public void componentResized(ComponentEvent event) {
-          setSize((getWidth() < minW) ? minW : getWidth(),
-                  (getHeight() < minH) ? minH : getHeight());
-        }
-      });
-
+    // Set the minimum size for the editor window
+    setMinimumSize(new Dimension(Preferences.getInteger("editor.window.width.min"),
+                                 Preferences.getInteger("editor.window.height.min")));
 //    System.out.println("t3");
 
     // Bring back the general options for the editor
@@ -1135,7 +1127,11 @@ public class Editor extends JFrame implements RunnerListener {
     undoItem.addActionListener(undoAction = new UndoAction());
     menu.add(undoItem);
 
-    redoItem = newJMenuItem(_("Redo"), 'Y');
+    if (!Base.isMacOS()) {
+        redoItem = newJMenuItem(_("Redo"), 'Y');
+    } else {
+        redoItem = newJMenuItemShift(_("Redo"), 'Z');
+    }
     redoItem.addActionListener(redoAction = new RedoAction());
     menu.add(redoItem);
 
@@ -1247,14 +1243,33 @@ public class Editor extends JFrame implements RunnerListener {
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           if (find != null) {
-            //find.find(true);
-            //FindReplace find = new FindReplace(Editor.this); //.show();
-            find.find(true);
+            find.findNext();
           }
         }
       });
     menu.add(item);
 
+    item = newJMenuItemShift(_("Find Previous"), 'G');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          if (find != null) {
+            find.findPrevious();
+          }
+        }
+      });
+    menu.add(item);
+
+    item = newJMenuItem(_("Use Selection For Find"), 'E');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          if (find == null) {
+            find = new FindReplace(Editor.this);
+          }
+          find.setFindText( getSelectedText() );
+        }
+      });
+    menu.add(item);
+
     return menu;
   }
 

app/src/processing/app/EditorListener.java

@@ -122,6 +122,14 @@ public class EditorListener {
       }
     }
 
+    if ((event.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
+      // Consume ctrl-m(carriage return) keypresses
+      if (code == KeyEvent.VK_M) {
+        event.consume();  // does nothing
+        return false;
+      }
+    }
+
     if ((event.getModifiers() & KeyEvent.META_MASK) != 0) {
       //event.consume();  // does nothing
       return false;

app/src/processing/app/FindReplace.java

@@ -46,8 +46,9 @@ import javax.swing.*;
  */
 public class FindReplace extends JFrame implements ActionListener {
 
-  static final int BIG = 13;
+  static final int EDGE = Base.isMacOS() ? 20 : 13;
   static final int SMALL = 6;
+  static final int BUTTONGAP = 12; // 12 is correct for Mac, other numbers may be required for other platofrms
 
   Editor editor;
 
@@ -59,14 +60,14 @@ public class FindReplace extends JFrame implements ActionListener {
   JButton replaceButton;
   JButton replaceAllButton;
   JButton replaceFindButton;
+  JButton previousButton;
   JButton findButton;
 
   JCheckBox ignoreCaseBox;
   static boolean ignoreCase = true;
 
-  /// true when there's something selected in the editor
-  boolean found;
-
+  JCheckBox wrapAroundBox;
+  static boolean wrapAround = true;
 
   public FindReplace(Editor editor) {
     super("Find");
@@ -77,23 +78,66 @@ public class FindReplace extends JFrame implements ActionListener {
     pain.setLayout(null);
 
     JLabel findLabel = new JLabel(_("Find:"));
-    Dimension d0 = findLabel.getPreferredSize();
     JLabel replaceLabel = new JLabel(_("Replace with:"));
-    Dimension d1 = replaceLabel.getPreferredSize();
+    Dimension labelDimension = replaceLabel.getPreferredSize();
 
     pain.add(findLabel);
     pain.add(replaceLabel);
 
     pain.add(findField = new JTextField(20));
     pain.add(replaceField = new JTextField(20));
-    Dimension d2 = findField.getPreferredSize();
+    int fieldHeight = findField.getPreferredSize().height;
 
     if (findString != null) findField.setText(findString);
     if (replaceString != null) replaceField.setText(replaceString);
     //System.out.println("setting find str to " + findString);
     //findField.requestFocusInWindow();
 
-    //pain.setDefault
+    ignoreCaseBox = new JCheckBox(_("Ignore Case"));
+    ignoreCaseBox.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          ignoreCase = ignoreCaseBox.isSelected();
+        }
+      });
+    ignoreCaseBox.setSelected(ignoreCase);
+    pain.add(ignoreCaseBox);
+
+    wrapAroundBox = new JCheckBox(_("Wrap Around"));
+    wrapAroundBox.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          wrapAround = wrapAroundBox.isSelected();
+        }
+      });
+    wrapAroundBox.setSelected(wrapAround);
+    pain.add(wrapAroundBox);
+
+    JPanel buttons = new JPanel();
+    
+    buttons.setLayout(new FlowLayout(FlowLayout.CENTER,BUTTONGAP,0));
+
+    // ordering is different on mac versus pc
+    if (Base.isMacOS()) {
+      buttons.add(replaceAllButton = new JButton(_("Replace All")));
+      buttons.add(replaceButton = new JButton(_("Replace")));
+      buttons.add(replaceFindButton = new JButton(_("Replace & Find")));
+      buttons.add(previousButton = new JButton(_("Previous")));
+      buttons.add(findButton = new JButton(_("Find")));
+
+    } else {
+      buttons.add(findButton = new JButton(_("Find")));
+      buttons.add(previousButton = new JButton(_("Previous"))); // is this the right position for non-Mac?
+      buttons.add(replaceFindButton = new JButton(_("Replace & Find")));
+      buttons.add(replaceButton = new JButton(_("Replace")));
+      buttons.add(replaceAllButton = new JButton(_("Replace All")));
+    }
+    pain.add(buttons);
+
+    // to fix ugliness.. normally macosx java 1.3 puts an
+    // ugly white border around this object, so turn it off.
+    if (Base.isMacOS()) {
+      buttons.setBorder(null);
+    }
+
     /*
     findField.addFocusListener(new FocusListener() {
         public void focusGained(FocusEvent e) {
@@ -109,92 +153,74 @@ public class FindReplace extends JFrame implements ActionListener {
       });
     */
 
-    // +1 since it's better to tend downwards
-    int yoff = (1 + d2.height - d1.height) / 2;
+    Dimension buttonsDimension = buttons.getPreferredSize();
+    int visibleButtonWidth = buttonsDimension.width - 2 * BUTTONGAP;
+    int fieldWidth = visibleButtonWidth - (labelDimension.width + SMALL);
 
-    findLabel.setBounds(BIG + (d1.width-d0.width) + yoff, BIG,
-                        d1.width, d1.height);
-    replaceLabel.setBounds(BIG, BIG + d2.height + SMALL + yoff,
-                           d1.width, d1.height);
+   // +1 since it's better to tend downwards
+    int yoff = (1 + fieldHeight - labelDimension.height) / 2;
 
-    //ignoreCase = true;
-    ignoreCaseBox = new JCheckBox(_("Ignore Case"));
-    ignoreCaseBox.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          ignoreCase = ignoreCaseBox.isSelected();
-        }
-      });
-    ignoreCaseBox.setSelected(ignoreCase);
-    pain.add(ignoreCaseBox);
+    int ypos = EDGE;
+    
+    int labelWidth = findLabel.getPreferredSize().width;
+    findLabel.setBounds(EDGE + (labelDimension.width-labelWidth), ypos + yoff, //  + yoff was added to the wrong field
+                        labelWidth, labelDimension.height);
+    findField.setBounds(EDGE + labelDimension.width + SMALL, ypos,
+                        fieldWidth, fieldHeight);
+                        
+    ypos += fieldHeight + SMALL;
+    
+    labelWidth = replaceLabel.getPreferredSize().width;
+    replaceLabel.setBounds(EDGE + (labelDimension.width-labelWidth), ypos + yoff,
+                           labelWidth, labelDimension.height);
+    replaceField.setBounds(EDGE + labelDimension.width + SMALL, ypos,
+                           fieldWidth, fieldHeight);
 
-    //
+    ypos += fieldHeight + SMALL;
 
-    JPanel buttons = new JPanel();
-    buttons.setLayout(new FlowLayout());
+    ignoreCaseBox.setBounds(EDGE + labelDimension.width + SMALL,
+                            ypos,
+                            (fieldWidth-SMALL)/2, fieldHeight);
 
-    // ordering is different on mac versus pc
-    if (Base.isMacOS()) {
-      buttons.add(replaceAllButton = new JButton(_("Replace All")));
-      buttons.add(replaceButton = new JButton(_("Replace")));
-      buttons.add(replaceFindButton = new JButton(_("Replace & Find")));
-      buttons.add(findButton = new JButton(_("Find")));
+    wrapAroundBox.setBounds(EDGE + labelDimension.width + SMALL + (fieldWidth-SMALL)/2 + SMALL,
+                            ypos,
+                            (fieldWidth-SMALL)/2, fieldHeight);
 
-    } else {
-      buttons.add(findButton = new JButton(_("Find")));
-      buttons.add(replaceFindButton = new JButton(_("Replace & Find")));
-      buttons.add(replaceButton = new JButton(_("Replace")));
-      buttons.add(replaceAllButton = new JButton(_("Replace All")));
-    }
-    pain.add(buttons);
+    ypos += fieldHeight + SMALL;
 
-    // to fix ugliness.. normally macosx java 1.3 puts an
-    // ugly white border around this object, so turn it off.
-    if (Base.isMacOS()) {
-      buttons.setBorder(null);
-    }
+    buttons.setBounds(EDGE-BUTTONGAP, ypos,
+                      buttonsDimension.width, buttonsDimension.height);
 
-    Dimension d3 = buttons.getPreferredSize();
-    //buttons.setBounds(BIG, BIG + d2.height*2 + SMALL + BIG,
-    buttons.setBounds(BIG, BIG + d2.height*3 + SMALL*2 + BIG,
-                      d3.width, d3.height);
+    ypos += buttonsDimension.height + EDGE;
 
-    //
+//    Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
 
-    findField.setBounds(BIG + d1.width + SMALL, BIG,
-                        d3.width - (d1.width + SMALL), d2.height);
-    replaceField.setBounds(BIG + d1.width + SMALL, BIG + d2.height + SMALL,
-                           d3.width - (d1.width + SMALL), d2.height);
+    int wide = visibleButtonWidth + EDGE*2;
+    int high = ypos; // butt.y + butt.height + EDGE*2 + SMALL;
 
-    ignoreCaseBox.setBounds(BIG + d1.width + SMALL,
-                            BIG + d2.height*2 + SMALL*2,
-                            d3.width, d2.height);
+    pack();
+    Insets insets = getInsets();
+    //System.out.println("Insets = " + insets);
+    setSize(wide + insets.left + insets.right,high + insets.top + insets.bottom); 
 
-    //
+    setLocationRelativeTo( null ); // center
+ //   setBounds((screen.width - wide) / 2, (screen.height - high) / 2, wide, high);
 
     replaceButton.addActionListener(this);
     replaceAllButton.addActionListener(this);
     replaceFindButton.addActionListener(this);
     findButton.addActionListener(this);
+    previousButton.addActionListener(this);
 
     // you mustn't replace what you haven't found, my son
-    replaceButton.setEnabled(false);
-    replaceFindButton.setEnabled(false);
-
-    // so that typing will go straight to this field
-    //findField.requestFocus();
+    // semantics of replace are "replace the current selection with the replace field"
+    // so whether we have found before or not is irrelevent
+    // replaceButton.setEnabled(false);
+    // replaceFindButton.setEnabled(false);
 
     // make the find button the blinky default
     getRootPane().setDefaultButton(findButton);
 
-    Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-
-    int wide = d3.width + BIG*2;
-    Rectangle butt = buttons.getBounds();  // how big is your butt?
-    int high = butt.y + butt.height + BIG*2 + SMALL;
-
-    setBounds((screen.width - wide) / 2,
-              (screen.height - high) / 2, wide, high);
-
     setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
     addWindowListener(new WindowAdapter() {
         public void windowClosing(WindowEvent e) {
@@ -245,11 +271,13 @@ public class FindReplace extends JFrame implements ActionListener {
     Object source = e.getSource();
 
     if (source == findButton) {
-      find(true);
+      findNext();
+
+    } else if (source == previousButton) {
+      findPrevious();
 
     } else if (source == replaceFindButton) {
-      replace();
-      find(true);
+      replaceAndFindNext();
 
     } else if (source == replaceButton) {
       replace();
@@ -260,50 +288,54 @@ public class FindReplace extends JFrame implements ActionListener {
   }
 
 
-  // look for the next instance of the find string
-  // to be found later than the current caret selection
-
+  // look for the next instance of the find string to be found
   // once found, select it (and go to that line)
 
-  public void find(boolean wrap) {
-    // in case search len is zero,
-    // otherwise replace all will go into an infinite loop
-    found = false;
+  private boolean find(boolean wrap,boolean backwards ) {
 
     String search = findField.getText();
     //System.out.println("finding for " + search + " " + findString);
     // this will catch "find next" being called when no search yet
-    if (search.length() == 0) return;
+    if (search.length() == 0) return false;
 
     String text = editor.getText();
 
     if (ignoreCase) {
-    search = search.toLowerCase();
+      search = search.toLowerCase();
       text = text.toLowerCase();
     }
 
-    //int selectionStart = editor.textarea.getSelectionStart();
-    int selectionEnd = editor.getSelectionStop();
+    int nextIndex;
+    if (!backwards) {
+      //int selectionStart = editor.textarea.getSelectionStart();
+      int selectionEnd = editor.getSelectionStop();
 
-    int nextIndex = text.indexOf(search, selectionEnd);
-    if (nextIndex == -1) {
-      if (wrap) {
+      nextIndex = text.indexOf(search, selectionEnd);
+      if (wrap && nextIndex == -1) {
         // if wrapping, a second chance is ok, start from beginning
         nextIndex = text.indexOf(search, 0);
       }
+    } else {
+      //int selectionStart = editor.textarea.getSelectionStart();
+      int selectionStart = editor.getSelectionStart()-1;
 
-      if (nextIndex == -1) {
-        found = false;
-        replaceButton.setEnabled(false);
-        replaceFindButton.setEnabled(false);
-        //Toolkit.getDefaultToolkit().beep();
-        return;
+      if ( selectionStart >= 0 ) {
+        nextIndex = text.lastIndexOf(search, selectionStart);
+      } else {
+        nextIndex = -1;
+      }
+      if (wrap && nextIndex == -1) {
+        // if wrapping, a second chance is ok, start from the end
+        nextIndex = text.lastIndexOf(search);
       }
     }
-    found = true;
-    replaceButton.setEnabled(true);
-    replaceFindButton.setEnabled(true);
-    editor.setSelection(nextIndex, nextIndex + search.length());
+
+    if (nextIndex != -1) {
+      editor.setSelection(nextIndex, nextIndex + search.length());
+    } else {
+      //Toolkit.getDefaultToolkit().beep();
+    }
+    return nextIndex != -1;
   }
 
 
@@ -312,28 +344,18 @@ public class FindReplace extends JFrame implements ActionListener {
    * replacement text field.
    */
   public void replace() {
-    if (!found) return;  // don't replace if nothing found
-
-    // check to see if the document has wrapped around
-    // otherwise this will cause an infinite loop
-    String sel = editor.getSelectedText();
-    if (sel.equals(replaceField.getText())) {
-      found = false;
-      replaceButton.setEnabled(false);
-      replaceFindButton.setEnabled(false);
-      return;
-    }
-
     editor.setSelectedText(replaceField.getText());
-    //editor.setSketchModified(true);
-    //editor.sketch.setCurrentModified(true);
     editor.getSketch().setModified(true);  // TODO is this necessary?
-
-    // don't allow a double replace
-    replaceButton.setEnabled(false);
-    replaceFindButton.setEnabled(false);
   }
 
+  /**
+   * Replace the current selection with whatever's in the
+   * replacement text field, and then find the next match
+   */
+  public void replaceAndFindNext() {
+    replace();
+    findNext();
+  }
 
   /**
    * Replace everything that matches by doing find and replace
@@ -343,9 +365,35 @@ public class FindReplace extends JFrame implements ActionListener {
     // move to the beginning
     editor.setSelection(0, 0);
 
-    do {
-      find(false);
-      replace();
-    } while (found);
+    boolean foundAtLeastOne = false;
+    while ( true ) {
+      if ( find(false,false) ) {
+        foundAtLeastOne = true;
+        replace();
+     } else {
+        break;
+      }
+    }
+    if ( !foundAtLeastOne ) {
+      Toolkit.getDefaultToolkit().beep();
+    }
   }
+  
+  public void setFindText( String t ) {
+    findField.setText( t );
+    findString = t;
+  }
+
+  public void findNext() {
+    if ( !find( wrapAround, false ) ) {
+      Toolkit.getDefaultToolkit().beep();
+    }
+  }
+
+  public void findPrevious() {
+    if ( !find( wrapAround, true ) ) {
+      Toolkit.getDefaultToolkit().beep();
+    }
+  }
+
 }

app/src/processing/app/I18n.java

@@ -12,11 +12,25 @@
  */
 
 package processing.app;
+
 import java.util.*;
+import java.util.Locale.*;
 import java.text.MessageFormat;
 
 public class I18n {
+  // start using current locale but still allow using the dropdown list later
   private static ResourceBundle i18n = ResourceBundle.getBundle("processing.app.Resources");
+  public static Locale locale;
+
+  static protected void init (String language) {
+    // there might be a null pointer exception ... most likely will never happen but the jvm gets mad
+    try {
+      if (language == null || language.trim().length() == 0) locale = Locale.getDefault();
+      else locale = new Locale(language);
+      i18n = ResourceBundle.getBundle("processing.app.Resources", locale);
+    } catch (java.lang.NullPointerException e) {
+    }
+  }
 
   public static String _(String s) {
     try {

app/src/processing/app/Preferences.java

@@ -80,6 +80,51 @@ public class Preferences {
   static final String PROMPT_OK      = _("OK");
   static final String PROMPT_BROWSE  = _("Browse");
 
+  String[] languages = {
+                        _("System Default"),
+                        "Català" + " (" + _("Catalan") + ")",
+                        "简体中文" + " (" + _("Chinese Simplified") + ")",
+                        "繁體中文" + " (" + _("Chinese Traditional") + ")",
+                        "Dansk" + " (" + _("Danish") + ")",
+                        "Nederlands" + " (" + _("Dutch") + ")",
+                        "English" + " (" + _("English") + ")",
+                        "Français" + " (" + _("French") + ")",
+                        "Pilipino" + " (" + _("Filipino") + ")",
+                        "Galego" + " (" + _("Galician") + ")",
+                        "Deutsch" + " (" + _("German") + ")",
+                        "ελληνικά" + " (" + _("Greek") + ")",
+                        "Magyar" + " (" + _("Hungarian") + ")",
+                        "Italiano" + " (" + _("Italian") + ")",
+                        "日本語" + " (" + _("Japanese") + ")",
+                        "Latviešu" + " (" + _("Latvian") + ")",
+                        "فارسی" + " (" + _("Persian") + ")",
+                        "Português" + " (" + _("Portuguese") + ")",
+                        "Română" + " (" + _("Romanian") + ")",
+                        "Русский" + " (" + _("Russian") + ")",
+                        "Español" + " (" + _("Spanish") + ")"};
+  String[] languagesISO = {
+                        "",
+                        "ca",
+                        "zh_cn",
+                        "zh_tw",
+                        "da",
+                        "nl",
+                        "en",
+                        "fr",
+                        "tl",
+                        "gl",
+                        "de",
+                        "el",
+                        "hu",
+                        "it",
+                        "ja",
+                        "lv",
+                        "fa",
+                        "pt_br",
+                        "ro",
+                        "ru",
+                        "es"};
+  
   /**
    * Standardized width for buttons. Mac OS X 10.3 wants 70 as its default,
    * Windows XP needs 66, and my Ubuntu machine needs 80+, so 80 seems proper.
@@ -117,6 +162,7 @@ public class Preferences {
   JCheckBox exportSeparateBox;
   JCheckBox verboseCompilationBox;
   JCheckBox verboseUploadBox;
+  JCheckBox verifyUploadBox;
   JCheckBox externalEditorBox;
   JCheckBox memoryOverrideBox;
   JTextField memoryField;
@@ -124,6 +170,7 @@ public class Preferences {
   JTextField fontSizeField;
   JCheckBox updateExtensionBox;
   JCheckBox autoAssociateBox;
+  JComboBox comboLanguage;
 
 
   // the calling editor, so updates can be applied
@@ -278,9 +325,25 @@ public class Preferences {
     top += vmax + GUI_BETWEEN;
 
 
+    // Preferred language: [        ] (requires restart of Arduino)
+    Container box = Box.createHorizontalBox();
+    label = new JLabel(_("Editor language: "));
+    box.add(label);
+    comboLanguage = new JComboBox(languages);
+    comboLanguage.setSelectedIndex((Arrays.asList(languagesISO)).indexOf(Preferences.get("editor.languages.current")));
+    box.add(comboLanguage);
+    label = new JLabel(_("  (requires restart of Arduino)"));
+    box.add(label);
+    pain.add(box);
+    d = box.getPreferredSize();
+    box.setForeground(Color.gray);
+    box.setBounds(left, top, d.width, d.height);
+    right = Math.max(right, left + d.width);
+    top += d.height + GUI_BETWEEN;
+    
     // Editor font size [    ]
 
-    Container box = Box.createHorizontalBox();
+    box = Box.createHorizontalBox();
     label = new JLabel(_("Editor font size: "));
     box.add(label);
     fontSizeField = new JTextField(4);
@@ -308,8 +371,16 @@ public class Preferences {
     d = box.getPreferredSize();
     box.setBounds(left, top, d.width, d.height);
     top += d.height + GUI_BETWEEN;
-    
 
+    // [ ] Verify code after upload
+    
+    verifyUploadBox = new JCheckBox(_("Verify code after upload"));
+    pain.add(verifyUploadBox);
+    d = verifyUploadBox.getPreferredSize();
+    verifyUploadBox.setBounds(left, top, d.width + 10, d.height);
+    right = Math.max(right, left + d.width);
+    top += d.height + GUI_BETWEEN;
+    
     // [ ] Use external editor
 
     externalEditorBox = new JCheckBox(_("Use external editor"));
@@ -350,7 +421,6 @@ public class Preferences {
       top += d.height + GUI_BETWEEN;
     }
 
-
     // More preferences are in the ...
 
     label = new JLabel(_("More preferences can be edited directly in the file"));
@@ -491,7 +561,8 @@ public class Preferences {
     // put each of the settings into the table
     setBoolean("build.verbose", verboseCompilationBox.isSelected());
     setBoolean("upload.verbose", verboseUploadBox.isSelected());
-
+    setBoolean("upload.verify", verifyUploadBox.isSelected());
+    
 //    setBoolean("sketchbook.closing_last_window_quits",
 //               closingLastQuitsBox.isSelected());
     //setBoolean("sketchbook.prompt", sketchPromptBox.isSelected());
@@ -538,6 +609,11 @@ public class Preferences {
     
     setBoolean("editor.update_extension", updateExtensionBox.isSelected());
 
+    // adds the selected language to the preferences file
+    Object newItem = comboLanguage.getSelectedItem();
+    int pos = (Arrays.asList(languages)).indexOf(newItem.toString());  // position in the languages array
+    set("editor.languages.current",(Arrays.asList(languagesISO)).get(pos));        
+
     editor.applyPreferences();
   }
 
@@ -548,6 +624,7 @@ public class Preferences {
     // set all settings entry boxes to their actual status
     verboseCompilationBox.setSelected(getBoolean("build.verbose"));
     verboseUploadBox.setSelected(getBoolean("upload.verbose"));
+    verifyUploadBox.setSelected(getBoolean("upload.verify"));
 
     //closingLastQuitsBox.
     //  setSelected(getBoolean("sketchbook.closing_last_window_quits"));

app/src/processing/app/syntax/JEditTextArea.java

@@ -834,6 +834,17 @@ public class JEditTextArea extends JComponent
       return lineElement.getEndOffset();
   }
 
+  /**
+   * Returns the end offset of the specified line, but not past the end of the text
+   * @param line The line
+   * @return The end offset of the specified line, safe to use for a selection, or -1 if the line is
+   * invalid.
+   */
+  public int getSafeLineStopOffset(int line)
+  {
+    return Math.min(getLineStopOffset(line),getDocumentLength());
+  }
+
   /**
    * Returns the length of the specified line.
    * @param line The line
@@ -1144,7 +1155,7 @@ public class JEditTextArea extends JComponent
       {
         throw new IllegalArgumentException("Bounds out of"
                                            + " range: " + newStart + "," +
-                                           newEnd);
+                                           newEnd + " [" + getDocumentLength() + "]");
       }
 
     // If the new position is the same as the old, we don't
@@ -1201,6 +1212,86 @@ public class JEditTextArea extends JComponent
       //                 getLineOfOffset(end));
     }
   }
+  
+  private boolean isWordCharacter( char ch, String noWordSep )
+  {
+		return Character.isLetterOrDigit(ch) || ch=='_' || noWordSep.indexOf(ch) != -1;
+  }
+
+	protected void setNewSelectionWord( int line, int offset )
+	{
+		if (getLineLength(line) == 0) {
+			newSelectionStart = getLineStartOffset(line);
+			newSelectionEnd = newSelectionStart;
+			return;
+		}
+		
+		String noWordSep = (String)document.getProperty("noWordSep");
+		if(noWordSep == null)
+			noWordSep = "";
+
+		String lineText = getLineText(line);
+
+		int wordStart = 0;
+		int wordEnd = lineText.length();
+
+		char ch = lineText.charAt(Math.max(0,offset - 1));
+
+		// special case for whitespace (fry 0122, bug #348)
+		// this is really nasty.. turns out that double-clicking any non-letter
+		// or digit char gets lumped together.. sooo, this quickly gets messy,
+		// because really it needs to check whether the chars are of the same
+		// type.. so a double space or double - might be grouped together,
+		// but what about a +=1? do + and - get grouped but not the 1? blech,
+		// coming back to this later. it's not a difficult fix, just a
+		// time-consuming one to track down all the proper cases.
+		/*
+		if (ch == ' ') {
+			//System.out.println("yeehaa");
+
+			for(int i = offset - 1; i >= 0; i--) {
+				if (lineText.charAt(i) == ' ') {
+					wordStart = i;
+				} else {
+					break;
+				}
+			}
+			for(int i = offset; i < lineText.length(); i++) {
+				if (lineText.charAt(i) == ' ') {
+					wordEnd = i + 1;
+				} else {
+					break;
+				}
+			}
+
+		} else {
+		*/
+
+		// If the user clicked on a non-letter char,
+		// we select the surrounding non-letters
+		boolean selectNoLetter = !isWordCharacter(ch,noWordSep);
+
+		for(int i = offset - 1; i >= 0; i--) {
+			ch = lineText.charAt(i);
+			if (selectNoLetter ^ !isWordCharacter(ch,noWordSep)) {
+				wordStart = i + 1;
+				break;
+			}
+		}
+
+		for(int i = offset; i < lineText.length(); i++) {
+			ch = lineText.charAt(i);
+			if(selectNoLetter ^ !isWordCharacter(ch,noWordSep)) {
+				wordEnd = i;
+				break;
+			}
+		}
+		//}
+		int lineStart = getLineStartOffset(line);
+		
+		newSelectionStart = lineStart + wordStart;
+		newSelectionEnd = lineStart + wordEnd;
+	}
 
 
   /**
@@ -1684,6 +1775,14 @@ public class JEditTextArea extends JComponent
   protected int selectionEnd;
   protected int selectionEndLine;
   protected boolean biasLeft;
+  
+  protected int newSelectionStart; // hack to get around lack of multiple returns in Java
+  protected int newSelectionEnd;
+
+  protected boolean selectWord;
+  protected boolean selectLine;
+  protected int selectionAncorStart;
+  protected int selectionAncorEnd;
 
   protected int bracketPosition;
   protected int bracketLine;
@@ -2021,9 +2120,26 @@ public class JEditTextArea extends JComponent
     {
       if (popup != null && popup.isVisible()) return;
 
-      setSelectionRectangular((evt.getModifiers()
-                               & InputEvent.CTRL_MASK) != 0);
-      select(getMarkPosition(),xyToOffset(evt.getX(),evt.getY()));
+      if ( !selectWord && !selectLine ) {
+        setSelectionRectangular((evt.getModifiers()
+                                 & InputEvent.CTRL_MASK) != 0);
+        select(getMarkPosition(),xyToOffset(evt.getX(),evt.getY()));
+      } else {
+        int line = yToLine(evt.getY());
+        if ( selectWord ) {
+          setNewSelectionWord( line, xToOffset(line,evt.getX()) );
+        } else {
+          newSelectionStart = getLineStartOffset(line);
+          newSelectionEnd = getSafeLineStopOffset(line);
+        }
+        if ( newSelectionStart < selectionAncorStart ) {
+          select(newSelectionStart,selectionAncorEnd);
+        } else if ( newSelectionEnd > selectionAncorEnd ) {
+          select(selectionAncorStart,newSelectionEnd);
+        } else {
+          select(newSelectionStart,newSelectionEnd);
+        }
+      }
     }
 
     final Cursor normalCursor = new Cursor(Cursor.DEFAULT_CURSOR);
@@ -2094,6 +2210,9 @@ public class JEditTextArea extends JComponent
       int offset = xToOffset(line,evt.getX());
       int dot = getLineStartOffset(line) + offset;
 
+      selectLine = false;
+      selectWord = false;
+
       switch(evt.getClickCount()) {
 
       case 1:
@@ -2159,74 +2278,11 @@ public class JEditTextArea extends JComponent
         bl.printStackTrace();
       }
 
-      String noWordSep = (String)document.getProperty("noWordSep");
-      if(noWordSep == null)
-        noWordSep = "";
-
-      // Ok, it's not a bracket... select the word
-      String lineText = getLineText(line);
-
-      int wordStart = 0;
-      int wordEnd = lineText.length();
-
-      char ch = lineText.charAt(Math.max(0,offset - 1));
-
-      // special case for whitespace (fry 0122, bug #348)
-      // this is really nasty.. turns out that double-clicking any non-letter
-      // or digit char gets lumped together.. sooo, this quickly gets messy,
-      // because really it needs to check whether the chars are of the same
-      // type.. so a double space or double - might be grouped together,
-      // but what about a +=1? do + and - get grouped but not the 1? blech,
-      // coming back to this later. it's not a difficult fix, just a
-      // time-consuming one to track down all the proper cases.
-      /*
-      if (ch == ' ') {
-        //System.out.println("yeehaa");
-
-        for(int i = offset - 1; i >= 0; i--) {
-          if (lineText.charAt(i) == ' ') {
-            wordStart = i;
-          } else {
-            break;
-          }
-        }
-        for(int i = offset; i < lineText.length(); i++) {
-          if (lineText.charAt(i) == ' ') {
-            wordEnd = i + 1;
-          } else {
-            break;
-          }
-        }
-
-      } else {
-      */
-
-      // If the user clicked on a non-letter char,
-      // we select the surrounding non-letters
-      boolean selectNoLetter = (!Character.isLetterOrDigit(ch)
-                                && noWordSep.indexOf(ch) == -1);
-
-      for(int i = offset - 1; i >= 0; i--) {
-        ch = lineText.charAt(i);
-        if (selectNoLetter ^ (!Character.isLetterOrDigit(ch) &&
-                              noWordSep.indexOf(ch) == -1)) {
-          wordStart = i + 1;
-          break;
-        }
-      }
-
-      for(int i = offset; i < lineText.length(); i++) {
-        ch = lineText.charAt(i);
-        if(selectNoLetter ^ (!Character.isLetterOrDigit(ch) &&
-                             noWordSep.indexOf(ch) == -1)) {
-          wordEnd = i;
-          break;
-        }
-      }
-      //}
-
-      int lineStart = getLineStartOffset(line);
-      select(lineStart + wordStart,lineStart + wordEnd);
+      setNewSelectionWord( line, offset );
+      select(newSelectionStart,newSelectionEnd);
+      selectWord = true;
+      selectionAncorStart = selectionStart;
+      selectionAncorEnd = selectionEnd;
 
       /*
         String lineText = getLineText(line);
@@ -2242,7 +2298,10 @@ public class JEditTextArea extends JComponent
     private void doTripleClick(MouseEvent evt, int line,
                                int offset, int dot)
     {
-      select(getLineStartOffset(line),getLineStopOffset(line)-1);
+      selectLine = true;
+      select(getLineStartOffset(line),getSafeLineStopOffset(line));
+      selectionAncorStart = selectionStart;
+      selectionAncorEnd = selectionEnd;
     }
   }
 

app/src/processing/app/syntax/TextAreaPainter.java

@@ -515,7 +515,10 @@ implements TabExpander, Printable
    */
   public Dimension getMinimumSize()
   {
-    return getPreferredSize();
+    Dimension dim = new Dimension();
+    dim.width = fm.charWidth('w') * 10;
+    dim.height = fm.getHeight() * 4;
+    return dim;
   }
 
   // package-private members