Improved option management

SetOptions does not replace options but adds them.
I also added a clean of any invalid menuID's

Author: jan

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.TreeMap;
 
 import org.eclipse.cdt.core.parser.util.StringUtil;
@@ -323,7 +324,7 @@ public BoardDescription(BoardDescription srcObject) {
         myUploadPort = srcObject.myUploadPort;
         myProgrammer = srcObject.myProgrammer;
         myUploadTool = srcObject.myUploadTool;
-        myOptions = new TreeMap<>(srcObject.myOptions);
+        myOptions.putAll( new TreeMap<>(srcObject.myOptions));
 
     }
 
@@ -355,6 +356,17 @@ private void setDefaultOptions() {
         }
     }
 
+    private void removeInvalidMenuIDs() {
+        Set<String> allMenuIDs = this.mySloeberBoardTxtFile.getMenus().keySet();
+        Set<String> optionKey=myOptions.keySet();
+
+        for ( String curOptionKey : optionKey) {
+        	if(!allMenuIDs.contains(curOptionKey)) {
+        		myOptions.remove(curOptionKey);
+        	}
+        }
+    }
+
     /**
      * Store the selections the user made so we can reuse them when creating a new
      * project
@@ -452,13 +464,18 @@ public void setreferencingBoardsFile(File boardsFile) {
         mySloeberBoardTxtFile = new BoardTxtFile(resolvePathEnvironmentString(myUserSelectedBoardsTxtFile));
 
     }
-
+    /**
+     * seOptions add the options to the already existing options and removes the options
+     * with an invalid menuID
+     * The enuitemID is not verified and assumed correct.
+     *
+     */
     public void setOptions(Map<String, String> options) {
-        if (options == null) {
+        if (options == null || options.size()==0) {
             return;
         }
-        myOptions.clear();
         myOptions.putAll(options);
+        removeInvalidMenuIDs();
         setDirty();
     }
 

io.sloeber.tests/src/io/sloeber/providers/Teensy.java

@@ -52,13 +52,13 @@ public static MCUBoard teensy2() {
         return new Teensy(Teensy_2_ID);
     }
 
-    private Teensy(String boardName) {
+    private Teensy(String boardID) {
         Map<String, String> options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         options.put("usb", "serialhid");
         options.put("speed", "48");
         options.put("opt", "o2std");
         options.put("keys", "en-us");
-        switch (boardName) {
+        switch (boardID) {
         case Teensy_PP2_ID:
             options.put("speed", "8");
             break;
@@ -71,7 +71,7 @@ private Teensy(String boardName) {
         default:
             break;
         }
-        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID,boardName,options);
+        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID,boardID,options);
 
         setUploadPort("none");
         setAttributes();
@@ -115,7 +115,7 @@ public Map<String, String> getBoardOptions(Example example) {
 
     @Override
     public MCUBoard createMCUBoard(BoardDescription boardDescriptor) {
-        return new Teensy(boardDescriptor);
+        return new Teensy(boardDescriptor.getBoardID());
 
     }