Ordering is compliant with order in Boards.txt #1450

Author: jan

io.sloeber.core/src/io/sloeber/core/txt/BoardTxtFile.java

@@ -53,7 +53,7 @@ public String getMenuItemIDFromMenuItemName(String boardID, String menuID, Strin
      * @return The nice names that are the possible selections
      */
     public String[] getMenuItemNamesFromMenuID(String menuID, String boardID) {
-        HashSet<String> ret = new HashSet<>();
+        List<String> ret = new LinkedList<>();
 
         KeyValueTree boardMenuInfo = myData.getChild(boardID + DOT + MENU + DOT + menuID);
         for (KeyValueTree menuData : boardMenuInfo.getChildren().values()) {
@@ -174,7 +174,7 @@ public String[] getAllSectionNames() {
      */
     public String[] getAllSectionNames(String[] toaddNames) {
 
-        HashSet<String> allNames = new HashSet<>();
+        LinkedList<String> allNames = new LinkedList<>();
         for (String curName : toaddNames) {
             allNames.add(curName);
         }
@@ -186,10 +186,7 @@ public String[] getAllSectionNames(String[] toaddNames) {
                 }
             }
         }
-        String[] sBoards = new String[allNames.size()];
-        allNames.toArray(sBoards);
-        Arrays.sort(sBoards);
-        return sBoards;
+        return allNames.toArray( new String[allNames.size()]);
     }
 
     public List<String> getAllBoardIDs() {

io.sloeber.core/src/io/sloeber/core/txt/KeyValueTree.java

@@ -110,7 +110,7 @@ private String dump(KeyValueTree theRoot) {
 
     private Map<String, String> toKeyValues(String prefix, KeyValueTree theRoot) {
 
-        Map<String, String> ret = new HashMap<>();
+        Map<String, String> ret = new LinkedHashMap<>();
         Entry<String, String> firstEntry = this.toKeyValue(prefix, theRoot);
         if (firstEntry != null) {
             ret.put(firstEntry.getKey(), firstEntry.getValue());

io.sloeber.ui/src/io/sloeber/ui/project/properties/BoardSelectionPage.java

@@ -86,7 +86,7 @@ public void handleEvent(Event e) {
 
 
 			genericListenerEnd();
-			setTheLabelCombos(true,true);
+			setTheLabelCombos(true);
 		}
 
 	};
@@ -99,7 +99,7 @@ public void handleEvent(Event e) {
 			}
 
 			genericListenerEnd();
-			setTheLabelCombos(true,true);
+			setTheLabelCombos(true);
 		}
 	};
 	protected Listener myChangeListener = new Listener() {
@@ -195,6 +195,7 @@ public void handleEvent(Event e) {
 		myControlUploadProtocol.addListener(myChangeListener);
 		myControlUploadPort.addListener(myChangeListener);
 		genericListenerEnd();
+		setTheLabelCombos(true); 
 
 	}
 
@@ -284,7 +285,7 @@ protected void updateScreen(boolean updateData) {
 		}
 
 		myControlUploadPort.setText(myBoardDesc.getUploadPort());
-		setTheLabelCombos(	 boardsFileChanged , boardIDChanged);
+		setTheLabelCombos(	 boardsFileChanged || boardIDChanged);
 		disableListeners = false;
 	}
 
@@ -300,9 +301,9 @@ private void getBoardFromScreen() {
 		}
 	}
 
-	private void setTheLabelCombos(		boolean boardsFileChanged ,boolean boardIDChanged) {
+	private void setTheLabelCombos(boolean recreateOptions) {
 		saveUsedOptionValues();
-		if (boardsFileChanged || boardIDChanged) {
+		if (recreateOptions) {
 			for (LabelCombo labelCombo : myBoardOptionCombos.values()) {
 				labelCombo.dispose();
 			}
@@ -328,8 +329,8 @@ private void setTheLabelCombos(		boolean boardsFileChanged ,boolean boardIDChang
 					} else {
 						// use last used name for this menu ID
 						optionValue = myUsedOptionValues.get(menuID);
-						if(optionValue==null) {
-							optionValue = myBoardDesc.getDefaultValueNameFromMenu( menuID);
+						if (optionValue == null) {
+							optionValue = myBoardDesc.getDefaultValueNameFromMenu(menuID);
 						}
 					}
 					if (optionValue != null) {