Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery

Author: Federico Fissore

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -49,7 +49,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
     TargetPlatform targetPlatform = Base.getTargetPlatform();
     PreferencesMap prefs = Preferences.getMap();
     prefs.putAll(Base.getBoardPreferences());
-    prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("upload.tool")));
+    String tool = prefs.getOrExcept("upload.tool");
+    if (tool.contains(":")) {
+      String[] split = tool.split(":", 2);
+      targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      tool = split[1];
+    }
+    prefs.putAll(targetPlatform.getTool(tool));
 
     // if no protocol is specified for this board, assume it lacks a 
     // bootloader and upload using the selected programmer.

app/src/processing/app/debug/TargetPackage.java

@@ -23,11 +23,14 @@
  */
 package processing.app.debug;
 
+import static processing.app.I18n._;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import processing.app.I18n;
 import processing.app.helpers.filefilters.OnlyDirs;
 
 public class TargetPackage {
@@ -47,8 +50,18 @@ public TargetPackage(String _id, File _folder) throws TargetPlatformException {
       if (!subFolder.exists() || !subFolder.canRead())
         continue;
       String arch = subFolder.getName();
-      TargetPlatform platform = new TargetPlatform(arch, subFolder, this);
-      platforms.put(arch, platform);
+      try {
+        TargetPlatform platform = new TargetPlatform(arch, subFolder, this);
+        platforms.put(arch, platform);
+      } catch (TargetPlatformException e) {
+        System.out.println(e.getMessage());
+      }
+    }
+
+    if (platforms.size() == 0) {
+      throw new TargetPlatformException(I18n
+          .format(_("No valid hardware definitions found in folder {0}."),
+                  _folder.getName()));
     }
   }