rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Annotate custom menu to avoid name clashing

Browse Source 
Fixes #5260
This commit is contained in:
Martino Facchin 2019-05-14 12:50:43 +02:00
parent ef8d669f6a
commit 06cfbbfa74
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/processing/app/Base.java
View File

@ -1436,17 +1436,16 @@ public class Base {
boardMenu.add(new JSeparator()); boardMenu.add(new JSeparator());
// Generate custom menus for all platforms // Generate custom menus for all platforms
Set<String> customMenusTitles = new LinkedHashSet<>();
for (TargetPackage targetPackage : BaseNoGui.packages.values()) { for (TargetPackage targetPackage : BaseNoGui.packages.values()) {
for (TargetPlatform targetPlatform : targetPackage.platforms()) { for (TargetPlatform targetPlatform : targetPackage.platforms()) {
customMenusTitles.addAll(targetPlatform.getCustomMenus().values()); for (String customMenuTitle : targetPlatform.getCustomMenus().values()) {
JMenu customMenu = new JMenu(tr(customMenuTitle));
customMenu.putClientProperty("platform", targetPlatform.getId());
customMenu.putClientProperty("removeOnWindowDeactivation", true);
boardsCustomMenus.add(customMenu);
}
} }
} }
for (String customMenuTitle : customMenusTitles) {
JMenu customMenu = new JMenu(tr(customMenuTitle));
customMenu.putClientProperty("removeOnWindowDeactivation", true);
boardsCustomMenus.add(customMenu);
}
List<JMenuItem> menuItemsToClickAfterStartup = new LinkedList<>(); List<JMenuItem> menuItemsToClickAfterStartup = new LinkedList<>();
@ -1532,7 +1531,7 @@ public class Base {
PreferencesMap customMenus = targetPlatform.getCustomMenus(); PreferencesMap customMenus = targetPlatform.getCustomMenus();
for (final String menuId : customMenus.keySet()) { for (final String menuId : customMenus.keySet()) {
String title = customMenus.get(menuId); String title = customMenus.get(menuId);
JMenu menu = getBoardCustomMenu(tr(title)); JMenu menu = getBoardCustomMenu(tr(title), targetPlatform.getId());
if (board.hasMenu(menuId)) { if (board.hasMenu(menuId)) {
PreferencesMap boardCustomMenu = board.getMenuLabels(menuId); PreferencesMap boardCustomMenu = board.getMenuLabels(menuId);
@ -1595,9 +1594,9 @@ public class Base {
return false; return false;
} }
private JMenu getBoardCustomMenu(String label) throws Exception { private JMenu getBoardCustomMenu(String label, String platform) throws Exception {
for (JMenu menu : boardsCustomMenus) { for (JMenu menu : boardsCustomMenus) {
if (label.equals(menu.getText())) { if (label.equals(menu.getText()) && platform.equals(menu.getClientProperty("platform"))) {
return menu; return menu;
} }
} }