Merge pull request #1 from arduino/master

Update from original

Author: xeronith

.classpath

@@ -3,7 +3,6 @@
 	<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
 	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
 	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
@@ -16,15 +15,16 @@
 	<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-net-3.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-core-2.2.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-databind-2.2.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.2.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.2.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-core-2.6.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-databind-2.6.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.6.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.6.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="output" path="app/bin"/>

.gitignore

@@ -14,6 +14,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
 build/*.zip
+build/*.tar.bz2
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
@@ -33,7 +34,7 @@ build/macosx/libastylej*
 build/macosx/appbundler*.jar
 build/macosx/appbundler*.zip
 build/macosx/appbundler
-build/macosx/appbundler-1.0ea-arduino3
+build/macosx/appbundler-1.0ea-arduino?
 build/macosx/appbundler-1.0ea-arduino*.zip
 build/macosx/appbundler-1.0ea-upstream*.zip
 build/linux/work/

README.md

@@ -10,7 +10,8 @@ IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
 
 * For more information, see the website at: http://www.arduino.cc/
 or the forums at: http://www.arduino.cc/forum/  
-You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
+You can also follow Arduino on twitter at: https://twitter.com/arduino or
+like Arduino on Facebook at: https://www.facebook.com/official.arduino
 
 * To report a *bug* in the software or to request *a simple enhancement* go to:
 http://github.com/arduino/Arduino/issues
@@ -35,11 +36,18 @@ Credits
 --------
 Arduino is an open source project, supported by many.
 
-The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
-Gianluca Martino, Daniela Antonietti, and David A. Mellis.
-
-Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
-[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
+The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe
+and David A. Mellis.
+
+Arduino uses
+[GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc),
+[GCC ARM Embedded toolchain](https://launchpad.net/gcc-arm-embedded),
+[avr-libc](http://www.nongnu.org/avr-libc/),
+[avrdude](http://www.nongnu.org/avrdude/),
+[bossac](http://www.shumatech.com/web/products/bossa),
+[openOCD](http://openocd.org/)
+and code from [Processing](http://www.processing.org)
+and [Wiring](http://wiring.org.co).
 
 Icon and about image designed by [ToDo](http://www.todo.to.it/)
 

app/.classpath

@@ -3,8 +3,6 @@
 	<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
@@ -13,10 +11,11 @@
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
@@ -28,8 +27,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
-	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.7.1+arduino.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/.classpath_macosx

@@ -13,7 +13,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/video"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/build.xml

@@ -102,6 +102,7 @@
       <fileset dir="test" includes="**/*.json*" />
       <fileset dir="test" includes="**/*.key" />
       <fileset dir="test" includes="**/*.hex" />
+      <fileset dir="test" includes="**/*.pac" />
     </copy>
 
     <junit printsummary="yes" dir="${work.dir}" fork="true">

app/lib/antlr-2.7.7.LICENSE.PUBLIC-DOMAIN.txt

@@ -200,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

app/lib/antlr.jar

@@ -40,7 +40,6 @@
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
 import javax.swing.text.SimpleAttributeSet;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -55,70 +54,48 @@ public class ConsoleOutputStream extends ByteArrayOutputStream {
 
   private final SimpleAttributeSet attributes;
   private final PrintStream printStream;
-  private final StringBuilder buffer;
   private final Timer timer;
-  private JScrollPane scrollPane;
-  private Document document;
+
+  private volatile EditorConsole editorConsole;
+  private volatile boolean newLinePrinted;
 
   public ConsoleOutputStream(SimpleAttributeSet attributes, PrintStream printStream) {
     this.attributes = attributes;
     this.printStream = printStream;
-    this.buffer = new StringBuilder();
+    this.newLinePrinted = false;
 
-    this.timer = new Timer(100, (e) -> {
-      if (scrollPane != null) {
-        synchronized (scrollPane) {
-          scrollPane.getHorizontalScrollBar().setValue(0);
-          scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());
-        }
+    this.timer = new Timer(500, (e) -> {
+      if (editorConsole != null && newLinePrinted) {
+        editorConsole.scrollDown();
+        newLinePrinted = false;
       }
     });
     timer.setRepeats(false);
   }
 
-  public synchronized void setCurrentEditorConsole(EditorConsole console) {
-    this.scrollPane = console;
-    this.document = console.getDocument();
+  public void setCurrentEditorConsole(EditorConsole console) {
+    this.editorConsole = console;
   }
 
   public synchronized void flush() {
-    String message = toString();
+    String text = toString();
 
-    if (message.length() == 0) {
+    if (text.length() == 0) {
       return;
     }
 
-    handleAppend(message);
+    printStream.print(text);
+    printInConsole(text);
 
     reset();
   }
 
-  private void handleAppend(String message) {
-    resetBufferIfDocumentEmpty();
-
-    buffer.append(message);
-
-    clearBuffer();
-  }
-
-  private void resetBufferIfDocumentEmpty() {
-    if (document != null && document.getLength() == 0) {
-      buffer.setLength(0);
-    }
-  }
-
-  private void clearBuffer() {
-    String line = buffer.toString();
-    buffer.setLength(0);
-
-    printStream.print(line);
-
-    if (document != null) {
+  private void printInConsole(String text) {
+    newLinePrinted = newLinePrinted || text.contains("\n");
+    if (editorConsole != null) {
       SwingUtilities.invokeLater(() -> {
         try {
-          String lineWithoutSlashR = line.replace("\r\n", "\n").replace("\r", "\n");
-          int offset = document.getLength();
-          document.insertString(offset, lineWithoutSlashR, attributes);
+          editorConsole.insertString(text, attributes);
         } catch (BadLocationException ble) {
           //ignore
         }

app/lib/commons-net-3.3.jar

@@ -0,0 +1,74 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Arduino is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package cc.arduino;
+
+import processing.app.Base;
+
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import java.net.URL;
+
+public class UpdatableBoardsLibsFakeURLsHandler implements HyperlinkListener {
+
+  private static final String BOARDSMANAGER = "boardsmanager";
+  private static final String LIBRARYMANAGER = "librarymanager";
+
+  private final Base base;
+
+  public UpdatableBoardsLibsFakeURLsHandler(Base base) {
+    this.base = base;
+  }
+
+  @Override
+  public void hyperlinkUpdate(HyperlinkEvent event) {
+    if (event.getEventType() != HyperlinkEvent.EventType.ACTIVATED) {
+      return;
+    }
+
+    URL url = event.getURL();
+
+    if (BOARDSMANAGER.equals(url.getHost())) {
+      try {
+        base.openBoardsManager("", "DropdownUpdatableCoresItem");
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+      return;
+    }
+
+    if (LIBRARYMANAGER.equals(url.getHost())) {
+      base.openLibraryManager("DropdownUpdatableLibrariesItem");
+      return;
+    }
+
+    throw new IllegalArgumentException(url.getHost() + " is invalid");
+  }
+
+}

app/lib/guava-18.0.LICENSE.ASL-2.0.txt renamed to app/lib/commons-net.LICENSE.ASL-2.0.txt

@@ -33,22 +33,17 @@
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.view.Event;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 import processing.app.Base;
 import processing.app.BaseNoGui;
 import processing.app.I18n;
 import processing.app.PreferencesData;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.util.LinkedList;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static processing.app.I18n._;
+import static processing.app.I18n.tr;
 
 public class BuiltInCoreIsNewerCheck implements Runnable {
 
@@ -72,7 +67,7 @@ private void builtInPackageIsNewerCheck() throws InterruptedException {
       return;
     }
 
-    LinkedList<ContributedPlatform> contributedPlatforms = Lists.newLinkedList(Iterables.concat(Collections2.transform(BaseNoGui.indexer.getPackages(), ContributedPackage::getPlatforms)));
+    List<ContributedPlatform> contributedPlatforms = BaseNoGui.indexer.getPackages().stream().map(ContributedPackage::getPlatforms).flatMap(Collection::stream).collect(Collectors.toList());
 
     List<ContributedPlatform> installedBuiltInPlatforms = contributedPlatforms.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
     if (installedBuiltInPlatforms.size() != 1) {
@@ -93,12 +88,13 @@ private void builtInPackageIsNewerCheck() throws InterruptedException {
       SwingUtilities.invokeLater(() -> {
         PreferencesData.setInteger("builtin_platform_is_newer", BaseNoGui.REVISION);
         assert base.hasActiveEditor();
-        int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(_("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(_("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+        int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(tr("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(tr("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
         if (chosenOption == JOptionPane.YES_OPTION) {
-          Action openBoardsManager = base.getOpenBoardsManager();
-          Event event = new Event(base.getActiveEditor(), ActionEvent.ACTION_PERFORMED, installedBuiltIn.getName());
-          event.getPayload().put("filterText", installedBuiltIn.getName());
-          openBoardsManager.actionPerformed(event);
+          try {
+            base.openBoardsManager(installedBuiltIn.getName(), "");
+          } catch (Exception e) {
+            e.printStackTrace();
+          }
         }
       });
     }