#1343 #1333 #1321 still problems with multiple configs

The environment variables are causing problems due to racing conditions

Author: jantje

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

@@ -10,7 +10,6 @@
 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;
@@ -530,9 +529,6 @@ public String[] getMenuItemNamesFromMenuID(String menuID) {
         return this.myTxtFile.getMenuItemNamesFromMenuID(menuID, this.myBoardID);
     }
 
-    public Set<String> getAllMenuNames() {
-        return this.myTxtFile.getMenuNames();
-    }
 
     public TreeMap<String, IPath> getAllExamples() {
         updateWhenDirty();
@@ -1134,4 +1130,8 @@ public void reloadTxtFile() {
 
     }
 
+    public Map<String, String> getAllMenus() {
+        return myTxtFile.getMenus();
+    }
+
 }

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

@@ -24,12 +24,25 @@ public enum WarningLevels {
          * @param customCommand
          *            the command that needs to be used
          */
-        public void setCustomWarningLevel(String customCommand) {
+        public void setCustomWarningLevel(String customWarningLevel) {
             if (this == CUSTOM) {
-                myCustomWarningLevel = customCommand;
+                myCustomWarningLevel = customWarningLevel;
             }
         }
 
+        public void setCustomWarningLevel(String customWarningLevel, boolean force) {
+            if (force) {
+                myCustomWarningLevel = customWarningLevel;
+            } else {
+                setCustomWarningLevel(customWarningLevel);
+            }
+
+        }
+
+        public String getCustomWarningLevel() {
+            return myCustomWarningLevel;
+        }
+
         /**
          * Get the string that should be put in the environment variable that places the
          * warning part in the command string This is a non expanded string for Arduino
@@ -52,6 +65,7 @@ public String getEnvValue() {
             return "${compiler.warning_flags.none}"; //$NON-NLS-1$
         }
 
+
     }
 
     private WarningLevels myWarningLevel = WarningLevels.NONE;

io.sloeber.ui/src/io/sloeber/ui/LabelCombo.java

@@ -11,14 +11,9 @@
  * a class containing a label and a combobox in one. This makes it easier to make both visible together
  */
 public class LabelCombo {
-	private GridData myComboGriddata;
-	private GridData myLabelGriddata;
-	private String myID = new String();
 	private Label myLabel;
 	private Combo myCombo;
-	private String myValue = ""; //$NON-NLS-1$
 	private String myMenuName;
-	private Listener myListener = null;
 
 	/**
 	 * Create a combo box with a label in front of it.
@@ -28,11 +23,10 @@ public class LabelCombo {
 	 * @param horSpan
 	 * @param fixedList if true only items of the list can be selected. If false you can type any text you want
 	 */
-	public LabelCombo(Composite composite, String menuName, String ID, int horSpan, boolean fixedList) {
-		myID = ID;
+	public LabelCombo(Composite composite, String menuName, int horSpan, boolean fixedList) {
 		myLabel = new Label(composite, SWT.NONE);
 		myLabel.setText(menuName + " :"); //$NON-NLS-1$
-		myLabelGriddata = new GridData();
+		GridData myLabelGriddata = new GridData();
 		myLabelGriddata.horizontalSpan = 1;
 		myLabelGriddata.horizontalAlignment = SWT.FILL;
 		myLabel.setLayoutData(myLabelGriddata);
@@ -41,41 +35,26 @@ public LabelCombo(Composite composite, String menuName, String ID, int horSpan,
 		} else {
 			myCombo = new Combo(composite, SWT.BORDER);
 		}
-		myComboGriddata = new GridData();
+		GridData myComboGriddata = new GridData();
 		myComboGriddata.horizontalSpan = horSpan;
 		myComboGriddata.horizontalAlignment = SWT.FILL;
 		myCombo.setLayoutData(myComboGriddata);
 		myMenuName = menuName;
+		myCombo.layout();
 
 	}
 
 	public void addListener(Listener listener) {
 		myCombo.addListener(SWT.Modify, listener);
-		myListener = listener;
-	}
-
-
-
-	public String getValue() {
-		myValue = myCombo.getText().trim();
-		return myValue;
 	}
 
 	public String getMenuName() {
 		return myMenuName.trim();
 	}
 
-	public void setValue(String value) {
-		myValue = value;
-		myCombo.setText(value);
-	}
-
-	public void setVisible(boolean visible) {
-		boolean newvisible = visible && (myCombo.getItemCount() > 0);
-		myLabel.setVisible(newvisible);
-		myCombo.setVisible(newvisible);
-		myComboGriddata.exclude = !newvisible;
-		myLabelGriddata.exclude = !newvisible;
+	public void dispose() {
+		myLabel.dispose();
+		myCombo.dispose();
 	}
 
 	public boolean isValid() {
@@ -87,26 +66,23 @@ public void setEnabled(boolean enabled) {
 	}
 
 	public void setItems(String[] items) {
-		if (myListener != null)
-			myCombo.removeListener(SWT.Modify, myListener);
+		Listener[] listeners = myCombo.getListeners(SWT.Modify);
+		for (Listener curListener : listeners) {
+			myCombo.removeListener(SWT.Modify, curListener);
+		}
+		String curValue = getText();
 		myCombo.setItems(items);
-		myCombo.setText(myValue);
-		if (myListener != null)
-			myCombo.addListener(SWT.Modify, myListener);
+		myCombo.setText(curValue);
+		for (Listener curListener : listeners) {
+			myCombo.addListener(SWT.Modify, curListener);
+		}
 
 	}
 
 	public void add(String item) {
 		myCombo.add(item);
 	}
 
-	public String getID() {
-		return myID;
-	}
-
-	public boolean isVisible() {
-		return (myCombo.getItemCount() > 0);
-	}
 
 	public void setLabel(String newLabel) {
 		myLabel.setText(newLabel);
@@ -122,7 +98,7 @@ public void select(int ordinal) {
 	}
 
 	public String getText() {
-		return myCombo.getText();
+		return myCombo.getText().trim();
 	}
 
 	public void setText(String text) {
@@ -134,4 +110,5 @@ public void addListener(int event, Listener comboListener) {
 		myCombo.addListener( event,  comboListener);
 
 	}
+
 }

io.sloeber.ui/src/io/sloeber/ui/monitor/views/OpenSerialDialogBox.java

@@ -42,11 +42,11 @@ protected Control createDialogArea(Composite parent) {
 	GridLayout layout = new GridLayout();
 	layout.numColumns = 2;
 	parent.setLayout(layout);
-	mySerialPorts = new LabelCombo(parent, Messages.openSerialDialogBoxSerialPortToConnectTo, null, 1, false);
+	mySerialPorts = new LabelCombo(parent, Messages.openSerialDialogBoxSerialPortToConnectTo, 1, false);
 	mySerialPorts.setItems(SerialManager.listComPorts());
 	mySerialPorts.setText(MyPreferences.getLastUsedPort());
 
-	myBaudRates = new LabelCombo(parent, Messages.openSerialDialogBoxSelectTheBautRate, null, 1, false);
+	myBaudRates = new LabelCombo(parent, Messages.openSerialDialogBoxSelectTheBautRate, 1, false);
 	myBaudRates.setItems(SerialManager.listBaudRates());
 	myBaudRates.setText(MyPreferences.getLastUsedRate());