Added Contributed Platforms.

- TargetPackage / TargetPlatform / TargetBoard are now interfaces
- Contributions installed are detected during init time
- Tools must be referenced through "path" property (automatically set
  by the IDE to the contributed tool path)

arduino-core/src/processing/app/BaseNoGui.java

@@ -17,9 +17,10 @@ import org.apache.commons.logging.impl.NoOpLog;
 
 import cc.arduino.packages.DiscoveryManager;
 import cc.arduino.packages.Uploader;
-
 import processing.app.debug.Compiler;
+import cc.arduino.packages.contributions.ContributionsIndexer;
 import processing.app.debug.TargetBoard;
+import processing.app.debug.LegacyTargetPackage;
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
 import processing.app.debug.TargetPlatformException;
@@ -421,7 +422,7 @@ public class BaseNoGui {
     return list;
   }
 
-  static public void init(String[] args) {
+  static public void init(String[] args) throws Exception {
     getPlatform().init();
   
     String sketchbookPath = getSketchbookPath();
@@ -582,14 +583,16 @@ public class BaseNoGui {
     Logger.getLogger("javax.jmdns").setLevel(Level.OFF);
   }
 
-  static public void initPackages() {
+  static public void initPackages() throws Exception {
+    ContributionsIndexer indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder());
+    indexer.parseIndex();
+    indexer.syncWithFilesystem();
+    System.out.println(indexer);
+    
     packages = new HashMap<String, TargetPackage>();
     loadHardware(getHardwareFolder());
     loadHardware(getSketchbookHardwareFolder());
-    if (packages.size() == 0) {
-      System.out.println(_("No valid configured cores found! Exiting..."));
-      System.exit(3);
-    }
+    loadContributedHardware(indexer);
   }
 
   static protected void initPlatform() {
@@ -649,7 +652,7 @@ public class BaseNoGui {
       File subfolder = new File(folder, target);
       
       try {
-        packages.put(target, new TargetPackage(target, subfolder));
+        packages.put(target, new LegacyTargetPackage(target, subfolder));
       } catch (TargetPlatformException e) {
         System.out.println("WARNING: Error loading hardware folder " + target);
         System.out.println("  " + e.getMessage());
@@ -714,6 +717,12 @@ public class BaseNoGui {
     populateImportToLibraryTable();
   }
 
+  static protected void loadContributedHardware(ContributionsIndexer indexer) {
+    for (TargetPackage pack : indexer.createTargetPackages()) {
+      packages.put(pack.getId(), pack);
+    }
+  }
+  
   static public void populateImportToLibraryTable() {
     // Populate importToLibraryTable
     importToLibraryTable = new HashMap<String, Library>();

arduino-core/src/processing/app/debug/LegacyTargetBoard.java

@@ -0,0 +1,113 @@
+/*
+ TargetPackage - Represents a hardware package
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2014 Cristian Maglie
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+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 LegacyTargetBoard implements 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 LegacyTargetBoard(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));
+    }
+  }
+
+  @Override
+  public String getName() {
+    return prefs.get("name");
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public PreferencesMap getPreferences() {
+    return prefs;
+  }
+
+  @Override
+  public boolean hasMenu(String menuId) {
+    return menuOptions.containsKey(menuId);
+  }
+
+  @Override
+  public PreferencesMap getMenuLabels(String menuId) {
+    return menuOptions.get(menuId).topLevelMap();
+  }
+
+  @Override
+  public String getMenuLabel(String menuId, String selectionId) {
+    return getMenuLabels(menuId).get(selectionId);
+  }
+
+  @Override
+  public Set<String> getMenuIds() {
+    return menuOptions.keySet();
+  }
+
+  @Override
+  public PreferencesMap getMenuPreferences(String menuId, String selectionId) {
+    return menuOptions.get(menuId).subTree(selectionId);
+  }
+
+  @Override
+  public TargetPlatform getContainerPlatform() {
+    return containerPlatform;
+  }
+
+}

arduino-core/src/processing/app/debug/LegacyTargetPackage.java

@@ -0,0 +1,84 @@
+/*
+ TargetPackage - Represents a hardware package
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2011 Cristian Maglie
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package processing.app.debug;
+
+import static processing.app.I18n._;
+import static processing.app.helpers.filefilters.OnlyDirs.ONLY_DIRS;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import processing.app.I18n;
+
+public class LegacyTargetPackage implements TargetPackage {
+
+  private String id;
+  private Map<String, TargetPlatform> platforms;
+
+  public LegacyTargetPackage(String _id, File _folder) throws TargetPlatformException {
+    id = _id;
+    platforms = new LinkedHashMap<String, TargetPlatform>();
+
+    File[] folders = _folder.listFiles(ONLY_DIRS);
+    if (folders == null)
+      return;
+
+    for (File subFolder : folders) {
+      if (!subFolder.exists() || !subFolder.canRead())
+        continue;
+      String arch = subFolder.getName();
+      try {
+        TargetPlatform platform = new LegacyTargetPlatform(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()));
+    }
+  }
+
+  @Override
+  public Map<String, TargetPlatform> getPlatforms() {
+    return platforms;
+  }
+
+  @Override
+  public Collection<TargetPlatform> platforms() {
+    return platforms.values();
+  }
+
+  @Override
+  public TargetPlatform get(String platform) {
+    return platforms.get(platform);
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+}

arduino-core/src/processing/app/debug/LegacyTargetPlatform.java

@@ -0,0 +1,198 @@
+/*
+ TargetPlatform - Represents a hardware platform
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2009-2014 Arduino
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package processing.app.debug;
+
+import static processing.app.I18n._;
+import static processing.app.I18n.format;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import processing.app.helpers.PreferencesMap;
+
+public class LegacyTargetPlatform implements TargetPlatform {
+
+  private String id;
+  private File folder;
+
+  private TargetPackage containerPackage;
+  protected PreferencesMap preferences = new PreferencesMap();
+
+  private Map<String, TargetBoard> boards = new LinkedHashMap<String, TargetBoard>();
+  private TargetBoard defaultBoard;
+
+  /**
+   * Contains preferences for every defined programmer
+   */
+  private Map<String, PreferencesMap> programmers = new LinkedHashMap<String, PreferencesMap>();
+
+  /**
+   * Contains labels for top level menus
+   */
+  private PreferencesMap customMenus = new PreferencesMap();
+
+  public LegacyTargetPlatform(String _name, File _folder, TargetPackage parent)
+      throws TargetPlatformException {
+
+    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");
+    if (!boardsFile.exists() || !boardsFile.canRead())
+      throw new TargetPlatformException(
+          format(_("Could not find boards.txt in {0}. Is it pre-1.5?"),
+                 folder.getAbsolutePath()));
+
+    // Load boards
+    try {
+      Map<String, PreferencesMap> boardsPreferences = new PreferencesMap(
+          boardsFile).firstLevelMap();
+
+      // Create custom menus for this platform
+      PreferencesMap menus = boardsPreferences.get("menu");
+      if (menus != null)
+        customMenus = menus.topLevelMap();
+      boardsPreferences.remove("menu");
+
+      // Create boards
+      Set<String> boardIds = boardsPreferences.keySet();
+      for (String boardId : boardIds) {
+        PreferencesMap preferences = boardsPreferences.get(boardId);
+        TargetBoard board = new LegacyTargetBoard(boardId, preferences, this);
+        boards.put(boardId, board);
+
+        // Pick the first board as default
+        if (defaultBoard == null)
+          defaultBoard = board;
+      }
+    } catch (IOException e) {
+      throw new TargetPlatformException(format(_("Error loading {0}"),
+                                               boardsFile.getAbsolutePath()), e);
+    }
+
+    File platformsFile = new File(folder, "platform.txt");
+    try {
+      if (platformsFile.exists() && platformsFile.canRead()) {
+        preferences.load(platformsFile);
+      }
+    } catch (IOException e) {
+      throw new TargetPlatformException(
+          format(_("Error loading {0}"), platformsFile.getAbsolutePath()), e);
+    }
+
+    // Allow overriding values in platform.txt. This allows changing
+    // platform.txt (e.g. to use a system-wide toolchain), without
+    // having to modify platform.txt (which, when running from git,
+    // prevents files being marked as changed).
+    File localPlatformsFile = new File(folder, "platform.local.txt");
+    try {
+      if (localPlatformsFile.exists() && localPlatformsFile.canRead()) {
+        preferences.load(localPlatformsFile);
+      }
+    } catch (IOException e) {
+      throw new TargetPlatformException(
+          format(_("Error loading {0}"), localPlatformsFile.getAbsolutePath()), e);
+    }
+
+    File progFile = new File(folder, "programmers.txt");
+    try {
+      if (progFile.exists() && progFile.canRead()) {
+        PreferencesMap prefs = new PreferencesMap();
+        prefs.load(progFile);
+        programmers = prefs.firstLevelMap();
+      }
+    } catch (IOException e) {
+      throw new TargetPlatformException(format(_("Error loading {0}"),
+                                               progFile.getAbsolutePath()), e);
+    }
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public File getFolder() {
+    return folder;
+  }
+
+  @Override
+  public Map<String, TargetBoard> getBoards() {
+    return boards;
+  }
+
+  @Override
+  public PreferencesMap getCustomMenus() {
+    return customMenus;
+  }
+
+  @Override
+  public Set<String> getCustomMenuIds() {
+    return customMenus.keySet();
+  }
+
+  @Override
+  public Map<String, PreferencesMap> getProgrammers() {
+    return programmers;
+  }
+
+  @Override
+  public PreferencesMap getProgrammer(String programmer) {
+    return getProgrammers().get(programmer);
+  }
+
+  @Override
+  public PreferencesMap getTool(String tool) {
+    return getPreferences().subTree("tools").subTree(tool);
+  }
+
+  @Override
+  public PreferencesMap getPreferences() {
+    return preferences;
+  }
+
+  @Override
+  public TargetBoard getBoard(String boardId) {
+    if (boards.containsKey(boardId)) {
+      return boards.get(boardId);
+    }
+    return defaultBoard;
+  }
+
+  @Override
+  public TargetPackage getContainerPackage() {
+    return containerPackage;
+  }
+
+  @Override
+  public String toString() {
+    String res = "TargetPlatform: name=" + id + " boards={\n";
+    for (String boardId : boards.keySet())
+      res += "  " + boardId + " = " + boards.get(boardId) + "\n";
+    return res + "}";
+  }
+}

arduino-core/src/processing/app/debug/TargetBoard.java

@@ -1,76 +1,51 @@
+/*
+ TargetBoard - Represents a hardware board
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2014 Cristian Maglie
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 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));
-    }
-  }
+public interface TargetBoard {
 
   /**
    * Get the name of the board.
    * 
    * @return
    */
-  public String getName() {
-    return prefs.get("name");
-  }
+  public String getName();
 
   /**
    * Get the identifier of the board
    * 
    * @return
    */
-  public String getId() {
-    return id;
-  }
+  public String getId();
 
   /**
-   * Get the full preferences map of the board with a given identifier
+   * Get the full preferences map of the board
    * 
    * @return
    */
-  public PreferencesMap getPreferences() {
-    return prefs;
-  }
+  public PreferencesMap getPreferences();
 
   /**
    * Check if the board has a sub menu.
@@ -79,9 +54,7 @@ public class TargetBoard {
    *          The menu ID to check
    * @return
    */
-  public boolean hasMenu(String menuId) {
-    return menuOptions.containsKey(menuId);
-  }
+  public boolean hasMenu(String menuId);
 
   /**
    * Returns the options available on a specific menu
@@ -90,9 +63,7 @@ public class TargetBoard {
    *          The menu ID
    * @return
    */
-  public PreferencesMap getMenuLabels(String menuId) {
-    return menuOptions.get(menuId).topLevelMap();
-  }
+  public PreferencesMap getMenuLabels(String menuId);
 
   /**
    * Returns the label of the specified option in the specified menu
@@ -103,13 +74,9 @@ public class TargetBoard {
    *          The option ID
    * @return
    */
-  public String getMenuLabel(String menuId, String selectionId) {
-    return getMenuLabels(menuId).get(selectionId);
-  }
+  public String getMenuLabel(String menuId, String selectionId);
 
-  public Set<String> getMenuIds() {
-    return menuOptions.keySet();
-  }
+  public Set<String> getMenuIds();
 
   /**
    * Returns the configuration parameters to override (as a PreferenceMap) when
@@ -121,12 +88,8 @@ public class TargetBoard {
    *          The option ID
    * @return
    */
-  public PreferencesMap getMenuPreferences(String menuId, String selectionId) {
-    return menuOptions.get(menuId).subTree(selectionId);
-  }
+  public PreferencesMap getMenuPreferences(String menuId, String selectionId);
 
-  public TargetPlatform getContainerPlatform() {
-    return containerPlatform;
-  }
+  public TargetPlatform getContainerPlatform();
 
 }

arduino-core/src/processing/app/debug/TargetPackage.java

@@ -1,9 +1,8 @@
-/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 /*
  TargetPackage - Represents a hardware package
  Part of the Arduino project - http://www.arduino.cc/
 
- Copyright (c) 2011 Cristian Maglie
+ Copyright (c) 2014 Cristian Maglie
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -21,61 +20,17 @@
  */
 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 interface TargetPackage {
 
-public class TargetPackage {
+  public String getId();
+  
+  public Map<String, TargetPlatform> getPlatforms();
 
-  private String id;
+  public Collection<TargetPlatform> platforms();
 
-  Map<String, TargetPlatform> platforms = new LinkedHashMap<String, TargetPlatform>();
-
-  public TargetPackage(String _id, File _folder) throws TargetPlatformException {
-    id = _id;
-
-    File[] folders = _folder.listFiles(new OnlyDirs());
-    if (folders == null)
-      return;
-
-    for (File subFolder : folders) {
-      if (!subFolder.exists() || !subFolder.canRead())
-        continue;
-      String arch = subFolder.getName();
-      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()));
-    }
-  }
-
-  public Map<String, TargetPlatform> getPlatforms() {
-    return platforms;
-  }
-
-  public Collection<TargetPlatform> platforms() {
-    return platforms.values();
-  }
-
-  public TargetPlatform get(String platform) {
-    return platforms.get(platform);
-  }
-
-  public String getId() {
-    return id;
-  }
+  public TargetPlatform get(String platform);
+  
 }

arduino-core/src/processing/app/debug/TargetPlatform.java

@@ -1,9 +1,8 @@
-/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 /*
  TargetPlatform - Represents a hardware platform
  Part of the Arduino project - http://www.arduino.cc/
 
- Copyright (c) 2009 David A. Mellis
+ Copyright (c) 2014 Arduino
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -21,174 +20,78 @@
  */
 package processing.app.debug;
 
-import static processing.app.I18n._;
-import static processing.app.I18n.format;
-
 import java.io.File;
-import java.io.IOException;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
 import processing.app.helpers.PreferencesMap;
 
-public class TargetPlatform {
+public interface TargetPlatform {
 
-  private String id;
-  private File folder;
-  private TargetPackage containerPackage;
+  public String getId();
+
+  public File getFolder();
 
   /**
-   * Contains preferences for every defined board
+   * Get TargetBoards under this TargetPlatform into a Map that maps the board
+   * id with the corresponding TargetBoard
+   * 
+   * @return a Map<String, TargetBoard>
    */
-  private Map<String, TargetBoard> boards = new LinkedHashMap<String, TargetBoard>();
-  private TargetBoard defaultBoard;
+  public Map<String, TargetBoard> getBoards();
+
+  public PreferencesMap getCustomMenus();
 
   /**
-   * Contains preferences for every defined programmer
+   * Return ids for top level menus
+   * 
+   * @return a Set<String> with the ids of the top level custom menus
    */
-  private Map<String, PreferencesMap> programmers = new LinkedHashMap<String, PreferencesMap>();
+  public Set<String> getCustomMenuIds();
 
   /**
-   * Contains preferences for platform
+   * Get preferences for all programmers
+   * 
+   * @return
    */
-  private PreferencesMap preferences = new PreferencesMap();
+  public Map<String, PreferencesMap> getProgrammers();
 
   /**
-   * Contains labels for top level menus
+   * Get preferences for a specific programmer
+   * 
+   * @param programmer
+   * @return
    */
-  private PreferencesMap customMenus = new PreferencesMap();
+  public PreferencesMap getProgrammer(String programmer);
 
-  public TargetPlatform(String _name, File _folder, TargetPackage parent)
-      throws TargetPlatformException {
+  /**
+   * Get preferences for a specific tool
+   * 
+   * @param tool
+   * @return
+   */
+  public PreferencesMap getTool(String tool);
 
-    id = _name;
-    folder = _folder;
-    containerPackage = parent;
+  /**
+   * Return TargetPlatform preferences
+   * 
+   * @return
+   */
+  public PreferencesMap getPreferences();
 
-    // If there is no boards.txt, this is not a valid 1.5 hardware folder
-    File boardsFile = new File(folder, "boards.txt");
-    if (!boardsFile.exists() || !boardsFile.canRead())
-      throw new TargetPlatformException(
-          format(_("Could not find boards.txt in {0}. Is it pre-1.5?"),
-                 folder.getAbsolutePath()));
+  /**
+   * Get a target board
+   * 
+   * @param boardId
+   * @return
+   */
+  public TargetBoard getBoard(String boardId);
 
-    // Load boards
-    try {
-      Map<String, PreferencesMap> boardsPreferences = new PreferencesMap(
-          boardsFile).firstLevelMap();
+  /**
+   * Get the TargetPackage that contains this TargetPlatform
+   * 
+   * @return
+   */
+  public TargetPackage getContainerPackage();
 
-      // Create custom menus for this platform
-      PreferencesMap menus = boardsPreferences.get("menu");
-      if (menus != null)
-        customMenus = menus.topLevelMap();
-      boardsPreferences.remove("menu");
-
-      // Create boards
-      Set<String> boardIds = boardsPreferences.keySet();
-      for (String boardId : boardIds) {
-        PreferencesMap preferences = boardsPreferences.get(boardId);
-        TargetBoard board = new TargetBoard(boardId, preferences, this);
-        boards.put(boardId, board);
-
-        // Pick the first board as default
-        if (defaultBoard == null)
-          defaultBoard = board;
-      }
-    } catch (IOException e) {
-      throw new TargetPlatformException(format(_("Error loading {0}"),
-                                               boardsFile.getAbsolutePath()), e);
-    }
-
-    File platformsFile = new File(folder, "platform.txt");
-    try {
-      if (platformsFile.exists() && platformsFile.canRead()) {
-        preferences.load(platformsFile);
-      }
-    } catch (IOException e) {
-      throw new TargetPlatformException(
-          format(_("Error loading {0}"), platformsFile.getAbsolutePath()), e);
-    }
-
-    // Allow overriding values in platform.txt. This allows changing
-    // platform.txt (e.g. to use a system-wide toolchain), without
-    // having to modify platform.txt (which, when running from git,
-    // prevents files being marked as changed).
-    File localPlatformsFile = new File(folder, "platform.local.txt");
-    try {
-      if (localPlatformsFile.exists() && localPlatformsFile.canRead()) {
-        preferences.load(localPlatformsFile);
-      }
-    } catch (IOException e) {
-      throw new TargetPlatformException(
-          format(_("Error loading {0}"), localPlatformsFile.getAbsolutePath()), e);
-    }
-
-    File progFile = new File(folder, "programmers.txt");
-    try {
-      if (progFile.exists() && progFile.canRead()) {
-        PreferencesMap prefs = new PreferencesMap();
-        prefs.load(progFile);
-        programmers = prefs.firstLevelMap();
-      }
-    } catch (IOException e) {
-      throw new TargetPlatformException(format(_("Error loading {0}"), progFile
-          .getAbsolutePath()), e);
-    }
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public File getFolder() {
-    return folder;
-  }
-
-  public Map<String, TargetBoard> getBoards() {
-    return boards;
-  }
-
-  public PreferencesMap getCustomMenus() {
-    return customMenus;
-  }
-
-  public Set<String> getCustomMenuIds() {
-    return customMenus.keySet();
-  }
-
-  public Map<String, PreferencesMap> getProgrammers() {
-    return programmers;
-  }
-
-  public PreferencesMap getProgrammer(String programmer) {
-    return getProgrammers().get(programmer);
-  }
-
-  public PreferencesMap getTool(String tool) {
-    return getPreferences().subTree("tools").subTree(tool);
-  }
-
-  public PreferencesMap getPreferences() {
-    return preferences;
-  }
-
-  public TargetBoard getBoard(String boardId) {
-    if (boards.containsKey(boardId)) {
-      return boards.get(boardId);
-    }
-    return defaultBoard;
-  }
-
-  public TargetPackage getContainerPackage() {
-    return containerPackage;
-  }
-
-  @Override
-  public String toString() {
-    String res = "TargetPlatform: name=" + id + " boards={\n";
-    for (String boardId : boards.keySet())
-      res += "  " + boardId + " = " + boards.get(boardId) + "\n";
-    return res + "}";
-  }
 }

arduino-core/src/processing/app/helpers/filefilters/OnlyDirs.java

@@ -32,11 +32,17 @@ import java.io.FilenameFilter;
  */
 public class OnlyDirs implements FilenameFilter {
 
-	public boolean accept(File dir, String name) {
-		if (name.charAt(0) == '.')
-			return false;
-		if (name.equals("CVS"))
-			return false;
-		return new File(dir, name).isDirectory();
-	}
+  public boolean accept(File dir, String name) {
+    if (name.charAt(0) == '.')
+      return false;
+    if (name.equals("CVS"))
+      return false;
+    return new File(dir, name).isDirectory();
+  }
+  
+  /**
+   * An handy pre-instantiated object 
+   */
+  public static final OnlyDirs ONLY_DIRS = new OnlyDirs();
+  
 }