Merge branch 'master' of https://github.com/arduino/Arduino

Author: Wilhelm Wiens

app/src/processing/app/Base.java

@@ -1486,11 +1486,16 @@ public void actionPerformed(ActionEvent actionevent) {
 
         // Add a title for each platform
         String platformLabel = targetPlatform.getPreferences().get("name");
-        if (platformLabel != null && !targetPlatform.getBoards().isEmpty()) {
-          JMenuItem menuLabel = new JMenuItem(tr(platformLabel));
-          menuLabel.setEnabled(false);
-          boardMenu.add(menuLabel);
-        }
+        if (platformLabel == null)
+          platformLabel = targetPackage.getId() + "-" + targetPlatform.getId();
+
+        // add an hint that this core lives in sketchbook
+        if (targetPlatform.isInSketchbook())
+          platformLabel += " (in sketchbook)";
+
+        JMenu platformBoardsMenu = new JMenu(platformLabel);
+        MenuScroller.setScrollerFor(platformBoardsMenu);
+        platformMenus.add(platformBoardsMenu);
 
         // Cycle through all boards of this platform
         for (TargetBoard board : targetPlatform.getBoards().values()) {

app/test/processing/app/debug/TargetPlatformStub.java

@@ -99,4 +99,10 @@ public TargetBoard getBoard(String boardId) {
   public TargetPackage getContainerPackage() {
     return targetPackage;
   }
+
+  @Override
+  public boolean isInSketchbook() {
+    // TODO Auto-generated method stub
+    return false;
+  }
 }

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

@@ -245,4 +245,9 @@ public String toString() {
       res += "  " + boardId + " = " + boards.get(boardId) + "\n";
     return res + "}";
   }
+
+  @Override
+  public boolean isInSketchbook() {
+	return getFolder().getAbsolutePath().startsWith(BaseNoGui.getSketchbookHardwareFolder().getAbsolutePath());
+  }
 }

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

@@ -94,4 +94,10 @@ public interface TargetPlatform {
    */
   public TargetPackage getContainerPackage();
 
+  /**
+   * Returns true if the platform is installed in a subfolder of the sketchbook
+   *
+   * @return
+   */
+  public boolean isInSketchbook();
 }

arduino-core/src/processing/app/legacy/PApplet.java

@@ -16,27 +16,6 @@ public class PApplet {
   /** Path to sketch folder */
   public String sketchPath; //folder;
 
-  /**
-   * Full name of the Java version (i.e. 1.5.0_11).
-   * Prior to 0125, this was only the first three digits.
-   */
-  public static final String javaVersionName =
-    System.getProperty("java.version");
-
-  /**
-   * Version of Java that's in use, whether 1.1 or 1.3 or whatever,
-   * stored as a float.
-   * <P>
-   * Note that because this is stored as a float, the values may
-   * not be <EM>exactly</EM> 1.3 or 1.4. Instead, make sure you're
-   * comparing against 1.3f or 1.4f, which will have the same amount
-   * of error (i.e. 1.40000001). This could just be a double, but
-   * since Processing only uses floats, it's safer for this to be a float
-   * because there's no good way to specify a double with the preproc.
-   */
-  public static final float javaVersion =
-    new Float(javaVersionName.substring(0, 3)).floatValue();
-
   /**
    * Current platform in use, one of the
    * PConstants WINDOWS, MACOSX, MACOS9, LINUX or OTHER.