Merge remote-tracking branch 'ffissore/ide-1.5.x' into ide-1.5.x

cmaglie · cmaglie · commit 3e7690149b26 · 2012-11-09T09:40:55.000+01:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1140,7 +1140,6 @@ public void rebuildBoardsMenu(JMenu toolsMenu, final Editor editor) {
     // Cycle through all packages
     for (TargetPackage targetPackage : packages.values()) {
       String packageName = targetPackage.getName();
-      
       // For every package cycle through all platform
       for (TargetPlatform targetPlatform : targetPackage.platforms()) {
         String platformName = targetPlatform.getName();
@@ -1247,15 +1246,15 @@ public void actionPerformed(ActionEvent e) {
           }
         }
       }
+    }
 
-      if (menuItemsToClickAfterStartup.isEmpty()) {
-        menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));
-      }
+    if (menuItemsToClickAfterStartup.isEmpty()) {
+      menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));
+    }
 
-      for (JMenuItem menuItemToClick : menuItemsToClickAfterStartup) {
-        menuItemToClick.setSelected(true);
-        menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));
-      }
+    for (JMenuItem menuItemToClick : menuItemsToClickAfterStartup) {
+      menuItemToClick.setSelected(true);
+      menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,6 @@ public void rebuildBoardsMenu(JMenu toolsMenu, final Editor editor) {`
`1140`	`1140`	`// Cycle through all packages`
`1141`	`1141`	`for (TargetPackage targetPackage : packages.values()) {`
`1142`	`1142`	`String packageName = targetPackage.getName();`
`1143`		`-`
`1144`	`1143`	`// For every package cycle through all platform`
`1145`	`1144`	`for (TargetPlatform targetPlatform : targetPackage.platforms()) {`
`1146`	`1145`	`String platformName = targetPlatform.getName();`
`@@ -1247,15 +1246,15 @@ public void actionPerformed(ActionEvent e) {`
`1247`	`1246`	`}`
`1248`	`1247`	`}`
`1249`	`1248`	`}`
	`1249`	`+ }`
`1250`	`1250`
`1251`		`- if (menuItemsToClickAfterStartup.isEmpty()) {`
`1252`		`- menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));`
`1253`		`- }`
	`1251`	`+ if (menuItemsToClickAfterStartup.isEmpty()) {`
	`1252`	`+ menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardsMenu));`
	`1253`	`+ }`
`1254`	`1254`
`1255`		`- for (JMenuItem menuItemToClick : menuItemsToClickAfterStartup) {`
`1256`		`- menuItemToClick.setSelected(true);`
`1257`		`- menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));`
`1258`		`- }`
	`1255`	`+ for (JMenuItem menuItemToClick : menuItemsToClickAfterStartup) {`
	`1256`	`+ menuItemToClick.setSelected(true);`
	`1257`	`+ menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));`
`1259`	`1258`	`}`
`1260`	`1259`	`}`
`1261`	`1260`