Updated libaries and core handling.

https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification
https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

Merge branch 'lib-1.5-cores' into ide-1.5.x

Author: cmaglie

app/src/processing/app/Base.java

@@ -150,7 +150,7 @@ public class Editor extends JFrame implements RunnerListener {
   Runnable exportAppHandler;
 
 
-  public Editor(Base ibase, String path, int[] location) {
+  public Editor(Base ibase, String path, int[] location) throws Exception {
     super("Arduino");
     this.base = ibase;
 
@@ -476,7 +476,7 @@ protected void applyPreferences() {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  protected void buildMenuBar() {
+  protected void buildMenuBar() throws Exception {
     JMenuBar menubar = new JMenuBar();
     menubar.add(buildFileMenu());
     menubar.add(buildEditMenu());
@@ -494,15 +494,23 @@ protected JMenu buildFileMenu() {
     item = newJMenuItem(_("New"), 'N');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          base.handleNew();
+          try {
+            base.handleNew();
+          } catch (Exception e1) {
+            e1.printStackTrace();
+          }
         }
       });
     fileMenu.add(item);
 
     item = Editor.newJMenuItem(_("Open..."), 'O');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          base.handleOpenPrompt();
+          try {
+            base.handleOpenPrompt();
+          } catch (Exception e1) {
+            e1.printStackTrace();
+          }
         }
       });
     fileMenu.add(item);
@@ -662,7 +670,7 @@ public void actionPerformed(ActionEvent e) {
   }
 
 
-  protected JMenu buildToolsMenu() {
+  protected JMenu buildToolsMenu() throws Exception {
     toolsMenu = new JMenu(_("Tools"));
     JMenu menu = toolsMenu;
     JMenuItem item;
@@ -690,6 +698,11 @@ public void actionPerformed(ActionEvent e) {
 
     if (boardsMenus == null) {
       boardsMenus = new LinkedList<JMenu>();
+
+      JMenu boardsMenu = new JMenu(_("Board"));
+      Editor.boardsMenus.add(boardsMenu);
+      toolsMenu.add(boardsMenu);
+      
       base.rebuildBoardsMenu(toolsMenu, this);
       //Debug: rebuild imports
       importMenu.removeAll();

app/src/processing/app/Editor.java

@@ -335,9 +335,13 @@ public void mousePressed(MouseEvent e) {
 
     case NEW:
       if (shiftPressed) {
-        editor.base.handleNew();
+        try {
+          editor.base.handleNew();
+        } catch (Exception e1) {
+          e1.printStackTrace();
+        }
       } else {
-      editor.base.handleNewReplace();
+        editor.base.handleNewReplace();
       }
       break;
 

app/src/processing/app/EditorToolbar.java

@@ -32,6 +32,7 @@
 import java.util.List;
 
 import processing.app.Base;
+import processing.app.I18n;
 import processing.app.Preferences;
 import processing.app.Serial;
 import processing.app.SerialException;
@@ -249,18 +250,46 @@ public boolean uploadUsingProgrammer(String buildPath, String className)
   }
 
   public boolean burnBootloader() throws RunnerException {
-    String programmer = Preferences.get("programmer");
     TargetPlatform targetPlatform = Base.getTargetPlatform();
+    
+    // Find preferences for the selected programmer
+    PreferencesMap programmerPrefs;
+    String programmer = Preferences.get("programmer");
     if (programmer.contains(":")) {
       String[] split = programmer.split(":", 2);
-      targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      TargetPlatform platform = Base
+          .getCurrentTargetPlatformFromPackage(split[0]);
       programmer = split[1];
+      programmerPrefs = platform.getProgrammer(programmer);
+    } else {
+      programmerPrefs = targetPlatform.getProgrammer(programmer);
     }
 
+    // Build configuration for the current programmer
     PreferencesMap prefs = Preferences.getMap();
     prefs.putAll(Base.getBoardPreferences());
-    prefs.putAll(targetPlatform.getProgrammer(programmer));
-    prefs.putAll(targetPlatform.getTool(prefs.get("bootloader.tool")));
+    prefs.putAll(programmerPrefs);
+    
+    // Create configuration for bootloader tool
+    PreferencesMap toolPrefs = new PreferencesMap();
+    String tool = prefs.get("bootloader.tool");
+    if (tool.contains(":")) {
+      String[] split = tool.split(":", 2);
+      TargetPlatform platform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      tool = split[1];
+      toolPrefs.putAll(platform.getTool(tool));
+      if (toolPrefs.size() == 0)
+        throw new RunnerException(
+            I18n.format(_("Could not find tool {0} from package {1}"), tool,
+                        split[0]));
+    }
+    toolPrefs.putAll(targetPlatform.getTool(tool));
+    if (toolPrefs.size() == 0)
+      throw new RunnerException(I18n.format(_("Could not find tool {0}"),
+                                            tool));
+    
+    // Merge tool with global configuration
+    prefs.putAll(toolPrefs);
     if (verbose) {
       prefs.put("erase.verbose", prefs.get("erase.params.verbose"));
       prefs.put("bootloader.verbose", prefs.get("bootloader.params.verbose"));
@@ -270,12 +299,6 @@ public boolean burnBootloader() throws RunnerException {
     }
 
     try {
-      // if (prefs.get("program.disable_flushing") == null
-      // || prefs.get("program.disable_flushing").toLowerCase().equals("false"))
-      // {
-      // flushSerialBuffer();
-      // }
-
       String pattern = prefs.get("erase.pattern");
       String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       if (!executeUploadCommand(cmd))

app/src/processing/app/debug/BasicUploader.java

@@ -132,11 +132,29 @@ private PreferencesMap createBuildPreferences(String _buildPath,
       throw re;
     }
 
+    // Check if the board needs a platform from another package 
     TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetPlatform corePlatform = null;
+    PreferencesMap boardPreferences = Base.getBoardPreferences();
+    String core = boardPreferences.get("build.core");
+    if (core.contains(":")) {
+      String[] split = core.split(":");
+      core = split[1];
+      corePlatform = Base.getTargetPlatform(split[0], targetPlatform.getId());
+      if (corePlatform == null) {
+        RunnerException re = new RunnerException(I18n
+            .format(_("Selected board depends on '{0}' core (not installed)."),
+                    split[0]));
+        re.hideStackTrace();
+        throw re;
+      }
+    }
 
     // Merge all the global preference configuration in order of priority
     PreferencesMap p = new PreferencesMap();
     p.putAll(Preferences.getMap());
+    if (corePlatform != null)
+      p.putAll(corePlatform.getPreferences());
     p.putAll(targetPlatform.getPreferences());
     p.putAll(Base.getBoardPreferences());
     for (String k : p.keySet()) {
@@ -146,28 +164,23 @@ private PreferencesMap createBuildPreferences(String _buildPath,
 
     p.put("build.path", _buildPath);
     p.put("build.project_name", _primaryClassName);
-    targetArch = targetPlatform.getName();
+    targetArch = targetPlatform.getId();
     p.put("build.arch", targetArch.toUpperCase());
 
     if (!p.containsKey("compiler.path"))
       p.put("compiler.path", Base.getAvrBasePath());
 
     // Core folder
-    String core = p.get("build.core");
-    TargetPlatform tp;
-    if (!core.contains(":")) {
+    TargetPlatform tp = corePlatform;
+    if (tp == null)
       tp = targetPlatform;
-    } else {
-      String[] split = core.split(":", 2);
-      tp = Base.getTargetPlatform(split[0], Preferences.get("target_platform"));
-      core = split[1];
-    }
     File coreFolder = new File(tp.getFolder(), "cores");
     coreFolder = new File(coreFolder, core);
+    p.put("build.core", core);
     p.put("build.core.path", coreFolder.getAbsolutePath());
 
     // System Folder
-    File systemFolder = targetPlatform.getFolder();
+    File systemFolder = tp.getFolder();
     systemFolder = new File(systemFolder, "system");
     p.put("build.system.path", systemFolder.getAbsolutePath());
 
@@ -179,8 +192,7 @@ private PreferencesMap createBuildPreferences(String _buildPath,
         t = targetPlatform;
       } else {
         String[] split = variant.split(":", 2);
-        t = Base
-            .getTargetPlatform(split[0], Preferences.get("target_platform"));
+        t = Base.getTargetPlatform(split[0], targetPlatform.getId());
         variant = split[1];
       }
       File variantFolder = new File(t.getFolder(), "variants");

app/src/processing/app/debug/Compiler.java

@@ -0,0 +1,132 @@
+package processing.app.debug;
+
+import static processing.app.I18n._;
+import static processing.app.I18n.format;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import processing.app.helpers.PreferencesMap;
+
+public class TargetBoard {
+
+  private String id;
+  private PreferencesMap prefs;
+  private Map<String, PreferencesMap> menuOptions = new LinkedHashMap<String, PreferencesMap>();
+  private TargetPlatform containerPlatform;
+
+  /**
+   * Create a TargetBoard based on preferences passed as argument.
+   * 
+   * @param _prefs
+   * @return
+   */
+  public TargetBoard(String _id, PreferencesMap _prefs, TargetPlatform parent) {
+    containerPlatform = parent;
+    id = _id;
+    prefs = new PreferencesMap(_prefs);
+
+    // Setup sub-menus
+    PreferencesMap menus = prefs.firstLevelMap().get("menu");
+    if (menus != null)
+      menuOptions = menus.firstLevelMap();
+
+    // Auto generate build.board if not set
+    if (!prefs.containsKey("build.board")) {
+      String board = containerPlatform.getId() + "_" + id;
+      board = board.toUpperCase();
+      prefs.put("build.board", board);
+      System.out
+          .println(format(
+                          _("Board {0}:{1}:{2} doesn''t define a ''build.board'' preference. Auto-set to: {3}"),
+                          containerPlatform.getContainerPackage().getId(),
+                          containerPlatform.getId(), id, board));
+    }
+  }
+
+  /**
+   * Get the name of the board.
+   * 
+   * @return
+   */
+  public String getName() {
+    return prefs.get("name");
+  }
+
+  /**
+   * Get the identifier of the board
+   * 
+   * @return
+   */
+  public String getId() {
+    return id;
+  }
+
+  /**
+   * Get the full preferences map of the board with a given identifier
+   * 
+   * @return
+   */
+  public PreferencesMap getPreferences() {
+    return prefs;
+  }
+
+  /**
+   * Check if the board has a sub menu.
+   * 
+   * @param menuId
+   *          The menu ID to check
+   * @return
+   */
+  public boolean hasMenu(String menuId) {
+    return menuOptions.containsKey(menuId);
+  }
+
+  /**
+   * Returns the options available on a specific menu
+   * 
+   * @param menuId
+   *          The menu ID
+   * @return
+   */
+  public PreferencesMap getMenuLabels(String menuId) {
+    return menuOptions.get(menuId).topLevelMap();
+  }
+
+  /**
+   * Returns the label of the specified option in the specified menu
+   * 
+   * @param menuId
+   *          The menu ID
+   * @param selectionId
+   *          The option ID
+   * @return
+   */
+  public String getMenuLabel(String menuId, String selectionId) {
+    return getMenuLabels(menuId).get(selectionId);
+  }
+
+  public Set<String> getMenuIds() {
+    return menuOptions.keySet();
+  }
+
+  /**
+   * Returns the configuration parameters to override (as a PreferenceMap) when
+   * the specified option in the specified menu is selected
+   * 
+   * @param menuId
+   *          The menu ID
+   * @param selectionId
+   *          The option ID
+   * @return
+   */
+  public PreferencesMap getMenuPreferences(String menuId, String selectionId) {
+    return menuOptions.get(menuId).subTree(selectionId);
+  }
+
+  public TargetPlatform getContainerPlatform() {
+    return containerPlatform;
+  }
+
+}