Changing order of boards in boards menu: built-in first, boards manag…

…er second, sketchbook hardware folder third. Each group if sorted by alpha, case insensitive. Fixes esp8266#2650
GerraShmidt · May 29, 2015 · 5933a7e · 5933a7e
1 parent 1b7574a
commit 5933a7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
@@ -327,6 +327,15 @@ public List<TargetPackage> createTargetPackages() throws TargetPlatformException
         packages.add(targetPackage);
       }
     }
+
+    Collections.sort(packages, new Comparator<TargetPackage>() {
+      @Override
+      public int compare(TargetPackage p1, TargetPackage p2) {
+        assert p1.getId() != null && p2.getId() != null;
+        return p1.getId().toLowerCase().compareTo(p2.getId().toLowerCase());
+      }
+    });
+
     return packages;
   }
 

diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
@@ -621,10 +621,10 @@ static public void initPackages() throws Exception {
     }
     indexer.syncWithFilesystem(getHardwareFolder());
 
-    packages = new HashMap<String, TargetPackage>();
+    packages = new LinkedHashMap<String, TargetPackage>();
     loadHardware(getHardwareFolder());
-    loadHardware(getSketchbookHardwareFolder());
     loadContributedHardware(indexer);
+    loadHardware(getSketchbookHardwareFolder());
     createToolPreferences(indexer);
 
     librariesIndexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder(), indexer);