Merge pull request #753 from Sloeber/release_4.1

Release 4.1

Author: jantje

io.sloeber.core/src/io/sloeber/core/managers/Manager.java

@@ -307,7 +307,7 @@ public static IPath getPlatformInstallPath(String vendor, String architecture) {
 
 		for (PackageIndex index : getPackageIndices()) {
 			for (Package pkg : index.getPackages()) {
-				for (ArduinoPlatform curPlatform : pkg.getInstalledPlatforms()) {
+				for (ArduinoPlatform curPlatform : pkg.getLatestInstalledPlatforms()) {
 					if (architecture.equalsIgnoreCase(curPlatform.getArchitecture())
 							&& (vendor.equalsIgnoreCase(pkg.getName()))) {
 						return new org.eclipse.core.runtime.Path(curPlatform.getInstallPath().toString());
@@ -337,6 +337,18 @@ public static ArduinoPlatform getPlatform(File platformTxt) {
 		return null;
 	}
 
+	static public List<ArduinoPlatform> getLatestInstalledPlatforms() {
+		List<ArduinoPlatform> platforms = new ArrayList<>();
+		for (PackageIndex index : getPackageIndices()) {
+			for (Package pkg : index.getPackages()) {
+
+				platforms.addAll(pkg.getLatestInstalledPlatforms());
+
+			}
+		}
+		return platforms;
+	}
+
 	static public List<ArduinoPlatform> getInstalledPlatforms() {
 		List<ArduinoPlatform> platforms = new ArrayList<>();
 		for (PackageIndex index : getPackageIndices()) {
@@ -353,7 +365,7 @@ static public List<Board> getInstalledBoards() {
 		List<Board> boards = new ArrayList<>();
 		for (PackageIndex index : getPackageIndices()) {
 			for (Package pkg : index.getPackages()) {
-				for (ArduinoPlatform platform : pkg.getInstalledPlatforms()) {
+				for (ArduinoPlatform platform : pkg.getLatestInstalledPlatforms()) {
 					boards.addAll(platform.getBoards());
 				}
 			}

io.sloeber.core/src/io/sloeber/core/managers/Package.java

@@ -10,6 +10,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -86,7 +87,7 @@ public Collection<ArduinoPlatform> getLatestPlatforms() {
 	 * @return the installed platforms but only one for each platform (the one
 	 *         with the highest version number)
 	 */
-	public Collection<ArduinoPlatform> getInstalledPlatforms() {
+	public Collection<ArduinoPlatform> getLatestInstalledPlatforms() {
 		Map<String, ArduinoPlatform> platformMap = new HashMap<>();
 		for (ArduinoPlatform platform : this.platforms) {
 			if (platform.isInstalled()) {
@@ -99,6 +100,22 @@ public Collection<ArduinoPlatform> getInstalledPlatforms() {
 		return Collections.unmodifiableCollection(platformMap.values());
 	}
 
+	/**
+	 * This method looks up the installed platforms So if you have 2 arduino avr
+	 * platform versions installed you will get back 2.
+	 *
+	 * @return all the installed platforms
+	 */
+	public List<ArduinoPlatform> getInstalledPlatforms() {
+		List<ArduinoPlatform> platformMap = new LinkedList<>();
+		for (ArduinoPlatform platform : this.platforms) {
+			if (platform.isInstalled()) {
+				platformMap.add(platform);
+			}
+		}
+		return platformMap;
+	}
+
 	public ArduinoPlatform getLatestPlatform(String platformName) {
 		ArduinoPlatform foundPlatform = null;
 		for (ArduinoPlatform platform : this.platforms) {

io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

@@ -718,7 +718,7 @@ private static void setTheEnvironmentVariablesAddThePlatformInfo(IContributedEnv
 			addPlatformFileTools(platform, contribEnv, confDesc);
 		}
 
-		// by adding the referencenced platform after the real platform
+		// add the referenced platform before the real platform
 		platform = Manager.getPlatform(new Path(referenceCoredPlatformFileName).append(PLATFORM_FILE_NAME).toFile());
 		if (platform != null) {
 			addPlatformFileTools(platform, contribEnv, confDesc);

io.sloeber.product/arduino.product

@@ -368,6 +368,8 @@ rights to a jury trial in any resulting litigation.</p>
       <repository location="http://download.eclipse.org/releases/neon" enabled="true" />
       <repository location="http://eclipse.baeyens.it/update/V4/nightly" enabled="false" />
       <repository location="http://eclipse.baeyens.it/update/V4/stable" enabled="true" />
+      <repository location="http://download.eclipse.org/nebula/snapshot" enabled="true" />
+      <repository location="http://gnuarmeclipse.sourceforge.net/updates" enabled="true" />
    </repositories>
 
    <preferencesInfo>