Merge pull request #1886 from arduino/ide-1.5.6-r2

Fixes for 1.5.6-r2 release
2014-02-21 18:02:03 +01:00 · 2014-02-21 18:02:03 +01:00 · 34009f075d
parent c39a6a26da f3619c3123
commit 34009f075d
20 changed files with 6 additions and 27 deletions
--- a/app/src/cc/arduino/packages/Uploader.java
+++ b/app/src/cc/arduino/packages/Uploader.java
@ -20,8 +20,6 @@
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
 */

 package cc.arduino.packages;
--- a/app/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/app/src/cc/arduino/packages/uploaders/SerialUploader.java
@ -22,8 +22,6 @@
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
 */

 package cc.arduino.packages.uploaders;
--- a/app/src/processing/app/Serial.java
+++ b/app/src/processing/app/Serial.java
@ -175,7 +175,7 @@ public class Serial implements SerialPortEventListener {
  public synchronized void serialEvent(SerialPortEvent serialEvent) {
    if (serialEvent.isRXCHAR()) {
      try {
-        byte[] buf = port.readBytes();
+        byte[] buf = port.readBytes(serialEvent.getEventValue());
        if (buf.length > 0) {
          if (bufferLast == buffer.length) {
            byte temp[] = new byte[bufferLast << 1];
--- a/app/src/processing/app/debug/Sizer.java
+++ b/app/src/processing/app/debug/Sizer.java
@ -20,8 +20,6 @@
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
 */

 package processing.app.debug;
--- a/app/src/processing/app/debug/TargetPackage.java
+++ b/app/src/processing/app/debug/TargetPackage.java
@ -18,8 +18,6 @@
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- $Id$
 */
 package processing.app.debug;

--- a/app/src/processing/app/debug/TargetPlatform.java
+++ b/app/src/processing/app/debug/TargetPlatform.java
@ -18,8 +18,6 @@
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- $Id$
 */
 package processing.app.debug;

--- a/app/src/processing/app/helpers/PreferencesMap.java
+++ b/app/src/processing/app/helpers/PreferencesMap.java
@ -18,8 +18,6 @@
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- $Id$
 */
 package processing.app.helpers;

--- a/app/src/processing/app/helpers/StringReplacer.java
+++ b/app/src/processing/app/helpers/StringReplacer.java
@ -18,8 +18,6 @@
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- $Id$
 */
 package processing.app.helpers;

--- a/app/src/processing/app/syntax/CTokenMarker.java
+++ b/app/src/processing/app/syntax/CTokenMarker.java
@ -15,7 +15,6 @@ import javax.swing.text.Segment;
 * C token marker.
 *
 * @author Slava Pestov
- * @version $Id: CTokenMarker.java 1268 2005-04-09 02:30:37Z benfry $
 */
 public class CTokenMarker extends TokenMarker
 {
--- a/app/src/processing/app/syntax/DefaultInputHandler.java
+++ b/app/src/processing/app/syntax/DefaultInputHandler.java
@ -19,7 +19,6 @@ import java.util.StringTokenizer;
 * The default input handler. It maps sequences of keystrokes into actions
 * and inserts key typed events into the text area.
 * @author Slava Pestov
- * @version $Id: DefaultInputHandler.java 1438 2005-05-11 08:34:16Z benfry $
 */
 public class DefaultInputHandler extends InputHandler
 {
--- a/app/src/processing/app/syntax/InputHandler.java
+++ b/app/src/processing/app/syntax/InputHandler.java
@ -24,7 +24,6 @@ import java.util.*;
 * to the implementations of this class to do so.
 *
 * @author Slava Pestov
- * @version $Id: InputHandler.java 6126 2010-02-16 23:43:53Z fry $
 */
 public abstract class InputHandler extends KeyAdapter
 {
--- a/app/src/processing/app/syntax/JEditTextArea.java
+++ b/app/src/processing/app/syntax/JEditTextArea.java
@ -55,7 +55,6 @@ import processing.app.syntax.im.InputMethodSupport;
 *     + "}");</pre>
 *
 * @author Slava Pestov
- * @version $Id: JEditTextArea.java 6123 2010-02-16 21:43:44Z fry $
 */
 public class JEditTextArea extends JComponent
 {
--- a/app/src/processing/app/syntax/KeywordMap.java
+++ b/app/src/processing/app/syntax/KeywordMap.java
@ -20,7 +20,6 @@ import javax.swing.text.Segment;
 * This class is used by <code>CTokenMarker</code> to map keywords to ids.
 *
 * @author Slava Pestov, Mike Dillon
- * @version $Id: KeywordMap.java 2050 2006-03-11 00:50:01Z fry $
 */
 public class KeywordMap
 {
--- a/app/src/processing/app/syntax/SyntaxDocument.java
+++ b/app/src/processing/app/syntax/SyntaxDocument.java
@ -18,7 +18,6 @@ import javax.swing.undo.UndoableEdit;
 * system.
 *
 * @author Slava Pestov
- * @version $Id: SyntaxDocument.java 1268 2005-04-09 02:30:37Z benfry $
 */
 public class SyntaxDocument extends PlainDocument
 {
--- a/app/src/processing/app/syntax/SyntaxStyle.java
+++ b/app/src/processing/app/syntax/SyntaxStyle.java
@ -21,7 +21,6 @@ import javax.swing.JComponent;
 * A simple text style class. It can specify the color, italic flag,
 * and bold flag of a run of text.
 * @author Slava Pestov
- * @version $Id: SyntaxStyle.java 4824 2008-10-11 23:41:40Z fry $
 */
 public class SyntaxStyle
 {
--- a/app/src/processing/app/syntax/SyntaxUtilities.java
+++ b/app/src/processing/app/syntax/SyntaxUtilities.java
@ -20,7 +20,6 @@ import java.util.regex.Pattern;
 * subsystem.
 *
 * @author Slava Pestov
- * @version $Id: SyntaxUtilities.java 1268 2005-04-09 02:30:37Z benfry $
 */
 public class SyntaxUtilities
 {
--- a/app/src/processing/app/syntax/TextUtilities.java
+++ b/app/src/processing/app/syntax/TextUtilities.java
@ -14,7 +14,6 @@ import javax.swing.text.*;
 /**
 * Class with several utility functions used by the text area component.
 * @author Slava Pestov
- * @version $Id: TextUtilities.java 1268 2005-04-09 02:30:37Z benfry $
 */
 public class TextUtilities
 {
--- a/app/src/processing/app/syntax/Token.java
+++ b/app/src/processing/app/syntax/Token.java
@ -17,7 +17,6 @@ package processing.app.syntax;
 * token in the text, and a pointer to the next token in the list.
 *
 * @author Slava Pestov
- * @version $Id: Token.java 1268 2005-04-09 02:30:37Z benfry $
 */
 public class Token
 {
--- a/build/linux/dist/tools/avrdude.conf
+++ b/build/linux/dist/tools/avrdude.conf
@ -1,5 +1,3 @@
-# $Id: avrdude.conf.in 991 2011-08-26 20:50:32Z joerg_wunsch $ -*- text -*-
-#
 # AVRDUDE Configuration File
 #
 # This file contains configuration data used by AVRDUDE which describes
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@ -1,4 +1,9 @@

+ARDUINO 1.5.6-r2 BETA 2014.02.21
+
+[ide]
+* JSSC: Fixed NPE when RXCHAR event with no bytes (José Pereda)
+
 ARDUINO 1.5.6 BETA 2014.02.20

 [ide]