Bundled core is again inside the hardware folder.

Fixed a handful of glitches when dealing with multiple installed cores

Author: Federico Fissore

app/lib/java-semver-0.8.0.jar

@@ -29,15 +29,16 @@
 package cc.arduino.contributions.libraries.ui;
 
 import cc.arduino.contributions.VersionComparator;
+import cc.arduino.contributions.VersionHelper;
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.ContributedLibraryComparator;
-import cc.arduino.contributions.libraries.filters.BuiltInPredicate;
-import cc.arduino.contributions.libraries.filters.InstalledLibraryPredicate;
+import cc.arduino.contributions.filters.BuiltInPredicate;
 import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;
+import com.github.zafarkhaja.semver.Version;
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -66,7 +67,6 @@
 @SuppressWarnings("serial")
 public class ContributedLibraryTableCell extends InstallerTableCell {
 
-  private final LibraryManagerUI indexer;
   private JPanel panel;
   private JButton installButton;
   private Component installButtonPlaceholder;
@@ -77,9 +77,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
   private JPanel inactiveButtonsPanel;
   private JLabel statusLabel;
 
-  public ContributedLibraryTableCell(LibraryManagerUI indexer) {
-    this.indexer = indexer;
-
+  public ContributedLibraryTableCell() {
     {
       installButton = new JButton(_("Install"));
       installButton.addActionListener(new ActionListener() {
@@ -359,7 +357,7 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
 
     // ...version.
     if (installed != null) {
-      String installedVer = installed.getVersion();
+      Version installedVer = VersionHelper.valueOf(installed.getVersion());
       if (installedVer == null) {
         desc += " " + _("Version unknown");
       } else {

app/lib/java-semver.LICENSE.MIT.txt

@@ -1,20 +1,20 @@
 package cc.arduino.contributions.libraries.ui;
 
-import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.filters.BuiltInPredicate;
+import cc.arduino.contributions.filters.BuiltInPredicate;
+import cc.arduino.contributions.packages.DownloadableContribution;
 import cc.arduino.contributions.ui.DropdownItem;
 import com.google.common.base.Predicate;
 
 import static processing.app.I18n._;
 
-public class DropdownBuiltInLibrariesItem implements DropdownItem<ContributedLibrary> {
+public class DropdownBuiltInLibrariesItem implements DropdownItem<DownloadableContribution> {
 
   public String toString() {
     return _("Built-in");
   }
 
   @Override
-  public Predicate<ContributedLibrary> getFilterPredicate() {
+  public Predicate<DownloadableContribution> getFilterPredicate() {
     return new BuiltInPredicate();
   }
 }

app/src/cc/arduino/contributions/libraries/filters/BuiltInPredicate.java

@@ -28,30 +28,41 @@
  */
 package cc.arduino.contributions.libraries.ui;
 
-import cc.arduino.contributions.VersionComparator;
+import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
+import cc.arduino.contributions.VersionHelper;
+import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.ui.FilteredAbstractTableModel;
+import com.github.zafarkhaja.semver.Version;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 @SuppressWarnings("serial")
 public class LibrariesIndexTableModel extends FilteredAbstractTableModel<ContributedLibrary> {
 
   public final static int DESCRIPTION_COL = 0;
 
   public static class ContributedLibraryReleases implements Comparable<ContributedLibraryReleases> {
+
     public final String name;
-    public final List<ContributedLibrary> releases = new ArrayList<ContributedLibrary>();
-    public final List<String> versions = new ArrayList<String>();
-    public ContributedLibrary selected = null;
+    public final List<ContributedLibrary> releases;
+    public final List<Version> versions;
+
+    public ContributedLibrary selected;
 
     public ContributedLibraryReleases(ContributedLibrary library) {
-      name = library.getName();
+      this.name = library.getName();
+      this.versions = new LinkedList<Version>();
+      this.releases = new LinkedList<ContributedLibrary>();
+      this.selected = null;
       add(library);
     }
 
@@ -61,40 +72,28 @@ public boolean shouldContain(ContributedLibrary lib) {
 
     public void add(ContributedLibrary library) {
       releases.add(library);
-      versions.add(library.getVersion());
+      Version version = VersionHelper.valueOf(library.getVersion());
+      if (version != null) {
+        versions.add(version);
+      }
       selected = getLatest();
     }
 
     public ContributedLibrary getInstalled() {
-      List<ContributedLibrary> installedReleases = new LinkedList<ContributedLibrary>(Collections2.filter(releases, new Predicate<ContributedLibrary>() {
-        @Override
-        public boolean apply(ContributedLibrary contributedLibrary) {
-          return contributedLibrary.isInstalled();
-        }
-      }));
+      List<ContributedLibrary> installedReleases = new LinkedList<ContributedLibrary>(Collections2.filter(releases, new InstalledPredicate()));
+      Collections.sort(installedReleases, new DownloadableContributionBuiltInAtTheBottomComparator());
+
+      if (installedReleases.isEmpty()) {
+        return null;
+      }
 
-      return getLatestOf(installedReleases);
+      return installedReleases.get(0);
     }
 
     public ContributedLibrary getLatest() {
       return getLatestOf(releases);
     }
 
-    private ContributedLibrary getLatestOf(List<ContributedLibrary> libs) {
-      Collections.sort(new LinkedList<ContributedLibrary>(libs), new Comparator<ContributedLibrary>() {
-        @Override
-        public int compare(ContributedLibrary lib1, ContributedLibrary lib2) {
-          return VersionComparator.VERSION_COMPARATOR.compare(lib1.getVersion(), lib2.getVersion());
-        }
-      });
-
-      if (libs.isEmpty()) {
-        return null;
-      }
-
-      return libs.get(libs.size() - 1);
-    }
-
     public ContributedLibrary getSelected() {
       return selected;
     }
@@ -223,7 +222,7 @@ public boolean isCellEditable(int row, int col) {
     return col == DESCRIPTION_COL;
   }
 
-  public List<String> getReleasesVersions(int row) {
+  public List<Version> getReleasesVersions(int row) {
     return contributions.get(row).versions;
   }
 

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java

@@ -61,12 +61,12 @@ private LibrariesIndexTableModel getContribModel() {
 
   @Override
   protected InstallerTableCell createCellRenderer() {
-    return new ContributedLibraryTableCell(this);
+    return new ContributedLibraryTableCell();
   }
 
   @Override
   protected InstallerTableCell createCellEditor() {
-    return new ContributedLibraryTableCell(this) {
+    return new ContributedLibraryTableCell() {
       @Override
       protected void onInstall(ContributedLibrary selectedLibrary, ContributedLibrary installedLibrary) {
         if (selectedLibrary.isReadOnly()) {

app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java

@@ -29,7 +29,9 @@
 package cc.arduino.contributions.packages.ui;
 
 import cc.arduino.contributions.VersionComparator;
+import cc.arduino.contributions.VersionHelper;
 import cc.arduino.contributions.filters.InstalledPredicate;
+import cc.arduino.contributions.filters.BuiltInPredicate;
 import cc.arduino.contributions.packages.ContributedBoard;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributedPlatformComparator;
@@ -263,7 +265,7 @@ public Component getTableCellEditorComponent(JTable table, Object value,
     java.util.List<ContributedPlatform> releases = new LinkedList<ContributedPlatform>(editorValue.releases);
     java.util.List<ContributedPlatform> uninstalledReleases = new LinkedList<ContributedPlatform>(Collections2.filter(releases, Predicates.not(new InstalledPredicate())));
 
-    java.util.List<ContributedPlatform> installedBuiltIn = new LinkedList<ContributedPlatform>();
+    java.util.List<ContributedPlatform> installedBuiltIn = new LinkedList<ContributedPlatform>(Collections2.filter(releases, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
 
     if (installed != null && !installedBuiltIn.contains(installed)) {
       uninstalledReleases.addAll(installedBuiltIn);
@@ -330,8 +332,7 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
       upgradable = false;
     } else {
       installable = false;
-      //removable = !installed.isReadOnly() && !hasBuiltInRelease;
-      removable = !hasBuiltInRelease;
+      removable = !installed.isReadOnly() && !hasBuiltInRelease;
       upgradable = new ContributedPlatformComparator().compare(selected, installed) > 0;
     }
     if (installable) {
@@ -352,17 +353,18 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     if (author != null && !author.isEmpty()) {
       desc += " " + format("by <b>{0}</b>", author);
     }
-    if (removable) {
-      desc += " " + format(_("version <b>{0}</b>"), installed.getVersion()) + " <strong><font color=\"#00979D\">INSTALLED</font></strong>";
+    if (installed != null) {
+      desc += " " + format(_("version <b>{0}</b>"), VersionHelper.valueOf(installed.getVersion())) + " <strong><font color=\"#00979D\">INSTALLED</font></strong>";
     }
     desc += "<br />";
 
     desc += _("Boards included in this package:") + "<br />";
-    for (ContributedBoard board : selected.getBoards())
-      desc += format("{0}, ", board.getName());
+    for (ContributedBoard board : selected.getBoards()) {
+      desc += board.getName() + ", ";
+    }
     desc = desc.substring(0, desc.lastIndexOf(',')) + ".<br />";
 
-    if (author != null && !author.isEmpty()) {
+    if (url != null && !url.isEmpty()) {
       desc += " " + format("<a href=\"{0}\">More info</a>", url);
     }
 

app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java

@@ -28,34 +28,40 @@
  */
 package cc.arduino.contributions.packages.ui;
 
+import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
+import cc.arduino.contributions.VersionHelper;
+import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionsIndex;
 import cc.arduino.contributions.ui.FilteredAbstractTableModel;
+import com.github.zafarkhaja.semver.Version;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import static processing.app.I18n._;
-
 @SuppressWarnings("serial")
 public class ContributionIndexTableModel extends FilteredAbstractTableModel<ContributedPlatform> {
 
   public final static int DESCRIPTION_COL = 0;
 
   public static class ContributedPlatformReleases {
-    public ContributedPackage packager;
-    public String arch;
-    public List<ContributedPlatform> releases = new ArrayList<ContributedPlatform>();
-    public List<String> versions = new ArrayList<String>();
+    public final ContributedPackage packager;
+    public final String arch;
+    public final List<ContributedPlatform> releases;
+    public final List<Version> versions;
     public ContributedPlatform selected = null;
 
     public ContributedPlatformReleases(ContributedPlatform platform) {
-      packager = platform.getParentPackage();
-      arch = platform.getArchitecture();
+      this.packager = platform.getParentPackage();
+      this.arch = platform.getArchitecture();
+      this.releases = new LinkedList<ContributedPlatform>();
+      this.versions = new LinkedList<Version>();
       add(platform);
     }
 
@@ -67,39 +73,26 @@ public boolean shouldContain(ContributedPlatform platform) {
 
     public void add(ContributedPlatform platform) {
       releases.add(platform);
-      versions.add(platform.getVersion());
+      Version version = VersionHelper.valueOf(platform.getVersion());
+      if (version != null) {
+        versions.add(version);
+      }
       selected = getLatest();
     }
 
     public ContributedPlatform getInstalled() {
-      List<ContributedPlatform> installedPlatforms = new LinkedList<ContributedPlatform>();
-      for (ContributedPlatform platform : releases) {
-        if (platform.isInstalled()) {
-          installedPlatforms.add(platform);
-        }
-      }
+      List<ContributedPlatform> installedReleases = new LinkedList<ContributedPlatform>(Collections2.filter(releases, new InstalledPredicate()));
+      Collections.sort(installedReleases, new DownloadableContributionBuiltInAtTheBottomComparator());
 
-      if (installedPlatforms.size() > 1) {
-        throw new IllegalStateException(_("More than one platform is currently installed! Only one can be installed at any given time"));
+      if (installedReleases.isEmpty()) {
+        return null;
       }
 
-      if (!installedPlatforms.isEmpty()) {
-        return installedPlatforms.get(0);
-      }
-
-      return null;
+      return installedReleases.get(0);
     }
 
     public ContributedPlatform getLatest() {
-      ContributedPlatform latest = null;
-      for (ContributedPlatform plat : releases) {
-        if (latest == null)
-          latest = plat;
-        // TODO a better version compare
-        if (plat.getVersion().compareTo(latest.getVersion()) > 0)
-          latest = plat;
-      }
-      return latest;
+      return getLatestOf(releases);
     }
 
     public ContributedPlatform getSelected() {
@@ -224,7 +217,7 @@ public boolean isCellEditable(int row, int col) {
     return col == DESCRIPTION_COL;
   }
 
-  public List<String> getReleasesVersions(int row) {
+  public List<Version> getReleasesVersions(int row) {
     return contributions.get(row).versions;
   }