Bug 486724 - Fixes for SparkFun Arduino boards.

The SparkFun package json file is a bit different. Need to merge
packages.

Also fix a couple of NPEs.

Change-Id: Ida495af0b497ba3cd6dbd3e95045c8923f8e9bc8

toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java

@@ -33,7 +33,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.remote.core.IRemoteConnection;
@@ -66,9 +65,11 @@ public class FullIntegration {
 		URL[] urls = new URL[] {
 				new URL("http://downloads.arduino.cc/packages/package_index.json"),
 				new URL("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"),
-				new URL("http://arduino.esp8266.com/stable/package_esp8266com_index.json"),
 				new URL("http://drazzy.com/package_drazzy.com_index.json"),
 				new URL("https://github.com/chipKIT32/chipKIT-core/raw/master/package_chipkit_index.json"),
+				// esp8266com and sparkfun overlap with the esp8266 package.
+				new URL("http://arduino.esp8266.com/stable/package_esp8266com_index.json"),
+				//new URL("https://raw.githubusercontent.com/sparkfun/Arduino_Boards/master/IDE_Board_Manager/package_sparkfun_index.json"),
 		};
 		ArduinoPreferences.setBoardUrlList(urls);
 

toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java

@@ -304,8 +304,13 @@ public class ArduinoManager {
 							try (Reader reader = new FileReader(path.toFile())) {
 								PackageIndex index = new Gson().fromJson(reader, PackageIndex.class);
 								for (ArduinoPackage pkg : index.getPackages()) {
+									ArduinoPackage p = packages.get(pkg.getName());
+									if (p == null) {
 										pkg.init();
 										packages.put(pkg.getName(), pkg);
+									} else {
+										p.merge(pkg);
+									}
 								}
 							} catch (IOException e) {
 								Activator.log(e);

toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoPackage.java

@@ -31,6 +31,7 @@ public class ArduinoPackage {
 	// end JSON fields
 
 	private Map<String, ArduinoPlatform> installedPlatforms;
+	private Map<String, ArduinoTool> latestTools;
 
 	public String getName() {
 		return name;
@@ -65,6 +66,34 @@ public class ArduinoPackage {
 		}
 	}
 
+	void merge(ArduinoPackage other) {
+		// Redo calculated fields
+		installedPlatforms = null;
+		latestTools = null;
+		
+		if (other.platforms != null) {
+			if (platforms != null) {
+				platforms.addAll(other.platforms);
+			} else {
+				platforms = other.platforms;
+			}
+			for (ArduinoPlatform platform : other.platforms) {
+				platform.init(this);
+			}
+		}
+
+		if (other.tools != null) {
+			if (tools != null) {
+				tools.addAll(other.tools);
+			} else {
+				tools = other.tools;
+			}
+			for (ArduinoTool tool : other.tools) {
+				tool.init(this);
+			}
+		}
+	}
+
 	public ArduinoPlatform getPlatform(String architecture, String version) {
 		if (platforms != null) {
 			for (ArduinoPlatform plat : platforms) {
@@ -129,9 +158,9 @@ public class ArduinoPackage {
 		Map<String, ArduinoPlatform> platformMap = new HashMap<>();
 		for (ArduinoPlatform platform : platforms) {
 			if (!installedPlatforms.containsKey(platform.getArchitecture())) {
-				ArduinoPlatform p = platformMap.get(platform.getName());
+				ArduinoPlatform p = platformMap.get(platform.getArchitecture());
 				if (p == null || ArduinoManager.compareVersions(platform.getVersion(), p.getVersion()) > 0) {
-					platformMap.put(platform.getName(), platform);
+					platformMap.put(platform.getArchitecture(), platform);
 				}
 			}
 		}
@@ -151,29 +180,40 @@ public class ArduinoPackage {
 		return null;
 	}
 
-	public ArduinoTool getLatestTool(String toolName) {
+	private void initLatestTools() {
-		ArduinoTool latest = null;
+		if (latestTools == null) {
+			latestTools = new HashMap<>();
+			
 			for (ArduinoTool tool : tools) {
-			if (tool.getName().equals(toolName) && tool.isInstalled()) {
+				ArduinoTool current = latestTools.get(tool.getName());
-				if (latest == null || ArduinoManager.compareVersions(tool.getVersion(), latest.getVersion()) > 0) {
+				if (current == null || ArduinoManager.compareVersions(tool.getVersion(), current.getVersion()) > 0) {
-					latest = tool;
+					latestTools.put(tool.getName(), tool);
 				}
 			}
 		}
-		return latest;
+	}
+
+	public ArduinoTool getLatestTool(String toolName) {
+		initLatestTools();
+		return latestTools.get(toolName);
+	}
+
+	public Collection<ArduinoTool> getLatestTools() {
+		initLatestTools();
+		return latestTools.values();
 	}
 
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof ArduinoPackage) {
-			return ((ArduinoPackage) obj).getName().equals(name);
+			return ((ArduinoPackage) obj).getName().equals(getName());
 		}
 		return super.equals(obj);
 	}
 
 	@Override
 	public int hashCode() {
-		return name.hashCode();
+		return getName().hashCode();
 	}
 
 }

toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java

@@ -231,15 +231,16 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration implements Te
 			properties.put("build.variant.path", //$NON-NLS-1$
 					platform.getInstallPath().resolve("variants").resolve("{build.variant}").toString()); //$NON-NLS-1$ //$NON-NLS-2$
 
-			// Everyone seems to want to use the avr-gcc and avrdude tools
+			// Everyone seems to want to use arduino package tools
 			ArduinoPackage arduinoPackage = manager.getPackage("arduino"); //$NON-NLS-1$
-			ArduinoTool avrgcc = arduinoPackage.getLatestTool("avr-gcc"); //$NON-NLS-1$
+			if (arduinoPackage != null) {
-			if (avrgcc != null) {
+				for (ArduinoTool tool : arduinoPackage.getLatestTools()) {
-				properties.put("runtime.tools.avr-gcc.path", avrgcc.getInstallPath().toString()); //$NON-NLS-1$
+					properties.put("runtime.tools." + tool.getName() + ".path", tool.getInstallPath().toString()); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				for (ArduinoTool tool : arduinoPackage.getTools()) {
+					properties.put("runtime.tools." + tool.getName() + '-' + tool.getVersion() + ".path", //$NON-NLS-1$ //$NON-NLS-2$
+							tool.getInstallPath().toString());
 				}
-			ArduinoTool avrdude = arduinoPackage.getLatestTool("avrdude"); //$NON-NLS-1$
-			if (avrdude != null) {
-				properties.put("runtime.tools.avrdude.path", avrdude.getInstallPath().toString()); //$NON-NLS-1$
 			}
 
 			// Super Platform

toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/launch/ArduinoLaunchConfigurationProvider.java

@@ -23,10 +23,12 @@ public class ArduinoLaunchConfigurationProvider extends ProjectLaunchConfigProvi
 
 	@Override
 	public boolean supports(ILaunchDescriptor descriptor, ILaunchTarget target) throws CoreException {
+		if (target != null) {
 			IRemoteConnection connection = target.getAdapter(IRemoteConnection.class);
 			if (connection != null) {
 				return connection.getConnectionType().getId().equals(ArduinoRemoteConnection.TYPE_ID);
 			}
+		}
 		return false;
 	}
 

toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/downloads/ArduinoDownloadsManager.java

@@ -19,6 +19,7 @@ import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
 public class ArduinoDownloadsManager extends WizardDialog {
@@ -83,8 +84,11 @@ public class ArduinoDownloadsManager extends WizardDialog {
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		super.createButtonsForButtonBar(parent);
-		getButton(IDialogConstants.CANCEL_ID).dispose();
+		getButton(IDialogConstants.CANCEL_ID).setVisible(false);
-		getButton(IDialogConstants.FINISH_ID).setText("Done");
+		Button finishButton = getButton(IDialogConstants.FINISH_ID);
+		finishButton.setText("Done");
+		// make sure it's far right
+		finishButton.moveBelow(null);
 	}
 
 }

toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/remote/BoardPropertyControl.java

@@ -192,8 +192,10 @@ public class BoardPropertyControl extends Composite {
 				control.dispose();
 			}
 			menuControls.clear();
+			if (programmerLabel != null) {
 				programmerLabel.dispose();
 				programmerCombo.dispose();
+			}
 
 			board = newBoard;
 			updateBoardMenu();