mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-19 09:42:11 +03:00
Merge remote-tracking branch 'ffissore/ide-1.5.x' into ide-1.5.x
This commit is contained in:
@ -1140,7 +1140,6 @@ public class Base {
|
|||||||
// Cycle through all packages
|
// Cycle through all packages
|
||||||
for (TargetPackage targetPackage : packages.values()) {
|
for (TargetPackage targetPackage : packages.values()) {
|
||||||
String packageName = targetPackage.getName();
|
String packageName = targetPackage.getName();
|
||||||
|
|
||||||
// For every package cycle through all platform
|
// For every package cycle through all platform
|
||||||
for (TargetPlatform targetPlatform : targetPackage.platforms()) {
|
for (TargetPlatform targetPlatform : targetPackage.platforms()) {
|
||||||
String platformName = targetPlatform.getName();
|
String platformName = targetPlatform.getName();
|
||||||
@ -1247,6 +1246,7 @@ public class Base {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (menuItemsToClickAfterStartup.isEmpty()) {
|
if (menuItemsToClickAfterStartup.isEmpty()) {
|
||||||
menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));
|
menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));
|
||||||
@ -1257,7 +1257,6 @@ public class Base {
|
|||||||
menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));
|
menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private static void filterVisibilityOfSubsequentBoardMenus(String boardID, int fromIndex, ActionEvent originatingEvent) {
|
private static void filterVisibilityOfSubsequentBoardMenus(String boardID, int fromIndex, ActionEvent originatingEvent) {
|
||||||
for (int i = fromIndex; i < Editor.boardsMenus.size(); i++) {
|
for (int i = fromIndex; i < Editor.boardsMenus.size(); i++) {
|
||||||
|
Reference in New Issue
Block a user