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

cmaglie · cmaglie · commit 34009f075d4f · 2014-02-21T18:02:03.000+01:00
Fixes for 1.5.6-r2 release
diff --git 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;
diff --git 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;
diff --git a/app/src/processing/app/Serial.java b/app/src/processing/app/Serial.java
@@ -175,7 +175,7 @@ public void addListener(MessageConsumer consumer) {
   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];
diff --git 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;
diff --git 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;
 
diff --git 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;
 
diff --git 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;
 
diff --git 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;
 
diff --git a/app/src/processing/app/syntax/CTokenMarker.java b/app/src/processing/app/syntax/CTokenMarker.java
@@ -15,7 +15,6 @@
  * C token marker.
  *
  * @author Slava Pestov
- * @version $Id: CTokenMarker.java 1268 2005-04-09 02:30:37Z benfry $
  */
 public class CTokenMarker extends TokenMarker
 {
diff --git a/app/src/processing/app/syntax/DefaultInputHandler.java b/app/src/processing/app/syntax/DefaultInputHandler.java
@@ -19,7 +19,6 @@
  * 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
 {
diff --git a/app/src/processing/app/syntax/InputHandler.java b/app/src/processing/app/syntax/InputHandler.java
@@ -24,7 +24,6 @@
  * 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
 {
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
@@ -55,7 +55,6 @@
  *     + "}");</pre>
  *
  * @author Slava Pestov
- * @version $Id: JEditTextArea.java 6123 2010-02-16 21:43:44Z fry $
  */
 public class JEditTextArea extends JComponent
 {
diff --git a/app/src/processing/app/syntax/KeywordMap.java b/app/src/processing/app/syntax/KeywordMap.java
@@ -20,7 +20,6 @@
  * 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
 {
diff --git a/app/src/processing/app/syntax/SyntaxDocument.java b/app/src/processing/app/syntax/SyntaxDocument.java
@@ -18,7 +18,6 @@
  * system.
  *
  * @author Slava Pestov
- * @version $Id: SyntaxDocument.java 1268 2005-04-09 02:30:37Z benfry $
  */
 public class SyntaxDocument extends PlainDocument
 {
diff --git a/app/src/processing/app/syntax/SyntaxStyle.java b/app/src/processing/app/syntax/SyntaxStyle.java
@@ -21,7 +21,6 @@
  * 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
 {
diff --git a/app/src/processing/app/syntax/SyntaxUtilities.java b/app/src/processing/app/syntax/SyntaxUtilities.java
@@ -20,7 +20,6 @@
  * subsystem.
  *
  * @author Slava Pestov
- * @version $Id: SyntaxUtilities.java 1268 2005-04-09 02:30:37Z benfry $
  */
 public class SyntaxUtilities
 {
diff --git a/app/src/processing/app/syntax/TextUtilities.java b/app/src/processing/app/syntax/TextUtilities.java
@@ -14,7 +14,6 @@
 /**
  * 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
 {
diff --git a/app/src/processing/app/syntax/Token.java b/app/src/processing/app/syntax/Token.java
@@ -17,7 +17,6 @@
  * 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
 {
diff --git 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
diff --git 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]

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`* C token marker.`
`16`	`16`	`*`
`17`	`17`	`* @author Slava Pestov`
`18`		`- * @version $Id: CTokenMarker.java 1268 2005-04-09 02:30:37Z benfry $`
`19`	`18`	`*/`
`20`	`19`	`public class CTokenMarker extends TokenMarker`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`* The default input handler. It maps sequences of keystrokes into actions`
`20`	`20`	`* and inserts key typed events into the text area.`
`21`	`21`	`* @author Slava Pestov`
`22`		`- * @version $Id: DefaultInputHandler.java 1438 2005-05-11 08:34:16Z benfry $`
`23`	`22`	`*/`
`24`	`23`	`public class DefaultInputHandler extends InputHandler`
`25`	`24`	`{`