When using cores from other packages also the referenced platforms.txt is imported

See #1157

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

@@ -132,12 +132,13 @@ private PreferencesMap createBuildPreferences(String _buildPath,
       throw re;
     }
 
-    TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetBoard targetBoard = Base.getTargetBoard();
+    TargetPlatform targetPlatform = targetBoard.getContainerPlatform();
 
     // Merge all the global preference configuration in order of priority
     PreferencesMap p = new PreferencesMap();
     p.putAll(Preferences.getMap());
-    p.putAll(targetPlatform.getPreferences());
+    p.putAll(targetBoard.getMergedPlatformPreferences());
     p.putAll(Base.getBoardPreferences());
     for (String k : p.keySet()) {
       if (p.get(k) == null)
@@ -146,28 +147,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(":")) {
-      tp = targetPlatform;
-    } else {
-      String[] split = core.split(":", 2);
-      tp = Base.getTargetPlatform(split[0], Preferences.get("target_platform"));
-      core = split[1];
-    }
+    TargetPlatform tp = targetBoard.getReferencedPlatform();
+    if (tp == null)
+      tp = targetBoard.getContainerPlatform();
     File coreFolder = new File(tp.getFolder(), "cores");
+    String core = p.get("build.core");
     coreFolder = new File(coreFolder, 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());
 

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

@@ -1,7 +1,11 @@
 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;
 
@@ -10,20 +14,35 @@ public class TargetBoard {
   private String id;
   private PreferencesMap prefs;
   private Map<String, PreferencesMap> menuOptions = new LinkedHashMap<String, PreferencesMap>();
+  private TargetPlatform containerPlatform;
+
+  private String referencedPackageId;
+  private TargetPlatform referencedPlatform;
+  private TargetPackage referencedPackage;
 
   /**
    * Create a TargetBoard based on preferences passed as argument.
    * 
    * @param _prefs
    * @return
    */
-  public TargetBoard(String _id, PreferencesMap _prefs) {
+  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();
+
+    // Setup referenced platform
+    String core = prefs.get("build.core");
+    if (core.contains(":")) {
+      String[] split = core.split(":");
+      referencedPackageId = split[0];
+      prefs.put("build.core", split[1]);
+    }
   }
 
   /**
@@ -44,6 +63,15 @@ public String getId() {
     return id;
   }
 
+  /**
+   * Get the package this board refers to
+   * 
+   * @return
+   */
+  public String getReferencedPackageId() {
+    return referencedPackageId;
+  }
+
   /**
    * Get the full preferences map of the board with a given identifier
    * 
@@ -88,6 +116,10 @@ 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
@@ -98,7 +130,46 @@ public String getMenuLabel(String menuId, String selectionId) {
    *          The option ID
    * @return
    */
-  public PreferencesMap getMenuConfiguration(String menuId, String selectionId) {
+  public PreferencesMap getMenuPreferences(String menuId, String selectionId) {
     return menuOptions.get(menuId).subTree(selectionId);
   }
+
+  public TargetPlatform getContainerPlatform() {
+    return containerPlatform;
+  }
+
+  public void resolveReferencedPlatforms(Map<String, TargetPackage> packages)
+      throws Exception {
+    if (referencedPackageId == null)
+      return;
+
+    if (!packages.containsKey(referencedPackageId))
+      throw new Exception(
+          format(_("Can't find referenced package ({1}) for board {0}"), id,
+                 referencedPackageId));
+    referencedPackage = packages.get(referencedPackageId);
+
+    Map<String, TargetPlatform> platforms = referencedPackage.getPlatforms();
+
+    String ourPlatformId = getContainerPlatform().getId();
+    if (!platforms.containsKey(ourPlatformId))
+      throw new Exception(
+          format(_("Can't find referenced package ({1}) for board {0}"), id,
+                 referencedPackageId));
+    referencedPlatform = platforms.get(ourPlatformId);
+  }
+
+  public TargetPlatform getReferencedPlatform() {
+    return referencedPlatform;
+  }
+
+  public PreferencesMap getMergedPlatformPreferences() {
+    PreferencesMap res = new PreferencesMap();
+    if (referencedPlatform != null)
+      res.putAll(referencedPlatform.getPreferences());
+    if (containerPlatform.getPreferences() != null)
+      res.putAll(containerPlatform.getPreferences());
+    return res;
+  }
+
 }

app/src/processing/app/debug/TargetBoard.java

@@ -32,23 +32,22 @@
 
 public class TargetPackage {
 
-  private String name;
+  private String id;
 
   Map<String, TargetPlatform> platforms = new LinkedHashMap<String, TargetPlatform>();
 
-  public TargetPackage(String packageName, File packageFolder)
-      throws TargetPlatformException {
-    name = packageName;
+  public TargetPackage(String _id, File _folder) throws TargetPlatformException {
+    id = _id;
 
-    File[] folders = packageFolder.listFiles(new OnlyDirs());
+    File[] folders = _folder.listFiles(new OnlyDirs());
     if (folders == null)
       return;
 
-    for (File folder : folders) {
-      if (!folder.exists() || !folder.canRead())
+    for (File subFolder : folders) {
+      if (!subFolder.exists() || !subFolder.canRead())
         continue;
-      String arch = folder.getName();
-      TargetPlatform platform = new TargetPlatform(arch, folder);
+      String arch = subFolder.getName();
+      TargetPlatform platform = new TargetPlatform(arch, subFolder, this);
       platforms.put(arch, platform);
     }
   }
@@ -65,7 +64,13 @@ public TargetPlatform get(String platform) {
     return platforms.get(platform);
   }
 
-  public String getName() {
-    return name;
+  public void resolveReferencedPlatforms(Map<String, TargetPackage> packages)
+      throws Exception {
+    for (TargetPlatform platform : getPlatforms().values())
+      platform.resolveReferencedPlatforms(packages);
+  }
+
+  public String getId() {
+    return id;
   }
 }

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

@@ -36,8 +36,9 @@
 
 public class TargetPlatform {
 
-  private String name;
+  private String id;
   private File folder;
+  private TargetPackage containerPackage;
 
   /**
    * Contains preferences for every defined board
@@ -59,10 +60,12 @@ public class TargetPlatform {
    */
   private PreferencesMap customMenus = new PreferencesMap();
 
-  public TargetPlatform(String _name, File _folder)
+  public TargetPlatform(String _name, File _folder, TargetPackage parent)
       throws TargetPlatformException {
-    name = _name;
+
+    id = _name;
     folder = _folder;
+    containerPackage = parent;
 
     // If there is no boards.txt, this is not a valid 1.5 hardware folder
     File boardsFile = new File(folder, "boards.txt");
@@ -85,7 +88,7 @@ public TargetPlatform(String _name, File _folder)
       // Create boards
       for (String id : boardsPreferences.keySet()) {
         PreferencesMap preferences = boardsPreferences.get(id);
-        TargetBoard board = new TargetBoard(id, preferences);
+        TargetBoard board = new TargetBoard(id, preferences, this);
         boards.put(id, board);
       }
     } catch (IOException e) {
@@ -116,8 +119,8 @@ public TargetPlatform(String _name, File _folder)
     }
   }
 
-  public String getName() {
-    return name;
+  public String getId() {
+    return id;
   }
 
   public File getFolder() {
@@ -132,7 +135,7 @@ public PreferencesMap getCustomMenus() {
     return customMenus;
   }
 
-  public Set<String> getCustomMenusKeys() {
+  public Set<String> getCustomMenuIds() {
     return customMenus.keySet();
   }
 
@@ -155,4 +158,22 @@ public PreferencesMap getPreferences() {
   public TargetBoard getBoard(String boardId) {
     return boards.get(boardId);
   }
+
+  public TargetPackage getContainerPackage() {
+    return containerPackage;
+  }
+
+  public void resolveReferencedPlatforms(Map<String, TargetPackage> packages)
+      throws Exception {
+    for (TargetBoard board : getBoards().values())
+      board.resolveReferencedPlatforms(packages);
+  }
+
+  @Override
+  public String toString() {
+    String res = "TargetPlatform: name=" + id + " boards={\n";
+    for (String boardId : boards.keySet())
+      res += "  " + boardId + " = " + boards.get(boardId) + "\n";
+    return res + "}";
+  }
 }

app/src/processing/app/debug/TargetPlatform.java

@@ -96,7 +96,11 @@ public void handleOpenApplication(ApplicationEvent ae) {
   public void handleOpenFile(ApplicationEvent ae) {
 //    System.out.println("got open file event " + ae.getFilename());
     String filename = ae.getFilename();
-    base.handleOpen(filename);
+    try {
+      base.handleOpen(filename);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
     ae.setHandled(true);
   }