Merge remote-tracking branch 'arduino/master'

Author: ornithophile

.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,6 +15,7 @@
 	<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"/>

.gitignore

@@ -33,7 +33,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/

app/.classpath

@@ -3,7 +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"/>
@@ -13,6 +12,7 @@
 	<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/commons-net-3.3.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"/>
@@ -28,7 +28,6 @@
 	<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="output" path="bin"/>

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

@@ -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/commons-net-3.3.jar

@@ -34,21 +34,18 @@
 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 +69,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 +90,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();
+          }
         }
       });
     }

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

@@ -0,0 +1,138 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ *
+ * 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.
+ */
+
+package cc.arduino.contributions;
+
+import cc.arduino.contributions.libraries.LibrariesIndexer;
+import cc.arduino.contributions.libraries.LibraryInstaller;
+import cc.arduino.contributions.libraries.filters.UpdatableLibraryPredicate;
+import cc.arduino.contributions.packages.ContributionInstaller;
+import cc.arduino.contributions.packages.ContributionsIndexer;
+import cc.arduino.contributions.packages.filters.UpdatablePlatformPredicate;
+import cc.arduino.view.NotificationPopup;
+import processing.app.Base;
+import processing.app.I18n;
+
+import javax.swing.*;
+import javax.swing.event.HyperlinkListener;
+import java.util.TimerTask;
+
+import static processing.app.I18n.tr;
+
+public class ContributionsSelfCheck extends TimerTask {
+
+  private final Base base;
+  private final HyperlinkListener hyperlinkListener;
+  private final ContributionsIndexer contributionsIndexer;
+  private final ContributionInstaller contributionInstaller;
+  private final LibrariesIndexer librariesIndexer;
+  private final LibraryInstaller libraryInstaller;
+  private final ProgressListener progressListener;
+
+  private volatile boolean cancelled;
+  private volatile NotificationPopup notificationPopup;
+
+  public ContributionsSelfCheck(Base base, HyperlinkListener hyperlinkListener, ContributionsIndexer contributionsIndexer, ContributionInstaller contributionInstaller, LibrariesIndexer librariesIndexer, LibraryInstaller libraryInstaller) {
+    this.base = base;
+    this.hyperlinkListener = hyperlinkListener;
+    this.contributionsIndexer = contributionsIndexer;
+    this.contributionInstaller = contributionInstaller;
+    this.librariesIndexer = librariesIndexer;
+    this.libraryInstaller = libraryInstaller;
+    this.progressListener = new NoopProgressListener();
+    this.cancelled = false;
+  }
+
+  @Override
+  public void run() {
+    updateContributionIndex();
+    updateLibrariesIndex();
+
+    long updatablePlatforms = contributionsIndexer.getPackages().stream()
+      .flatMap(pack -> pack.getPlatforms().stream())
+      .filter(new UpdatablePlatformPredicate(contributionsIndexer)).count();
+
+    long updatableLibraries = librariesIndexer.getInstalledLibraries().stream()
+      .filter(new UpdatableLibraryPredicate(librariesIndexer))
+      .count();
+
+    if (updatableLibraries <= 0 && updatablePlatforms <= 0) {
+      return;
+    }
+
+    String text;
+    if (updatableLibraries > 0 && updatablePlatforms <= 0) {
+      text = I18n.format(tr("<br/>Update available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
+    } else if (updatableLibraries <= 0 && updatablePlatforms > 0) {
+      text = I18n.format(tr("<br/>Update available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
+    } else {
+      text = I18n.format(tr("<br/>Update available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
+    }
+
+    if (cancelled) {
+      return;
+    }
+
+    SwingUtilities.invokeLater(() -> {
+      notificationPopup = new NotificationPopup(base.getActiveEditor(), hyperlinkListener, text);
+      notificationPopup.setVisible(true);
+    });
+  }
+
+  @Override
+  public boolean cancel() {
+    cancelled = true;
+    if (notificationPopup != null) {
+      notificationPopup.close();
+    }
+    return super.cancel();
+  }
+
+  private void updateLibrariesIndex() {
+    if (cancelled) {
+      return;
+    }
+    try {
+      libraryInstaller.updateIndex(progressListener);
+    } catch (Exception e) {
+      // ignore
+    }
+  }
+
+  private void updateContributionIndex() {
+    if (cancelled) {
+      return;
+    }
+    try {
+      contributionInstaller.updateIndex(progressListener);
+    } catch (Exception e) {
+      // ignore
+    }
+  }
+}

app/lib/guava-18.0.jar

@@ -1,3 +1,32 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ *
+ * 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.
+ */
+
 package cc.arduino.contributions.libraries.filters;
 
 import cc.arduino.contributions.VersionComparator;