creation of new config kind of works

Well it doesn't copy the config but it does not crash

Author: jantje

io.sloeber.core/src/io/sloeber/core/listeners/ConfigurationChangeListener.java

@@ -1,37 +1,19 @@
 package io.sloeber.core.listeners;
 
-/*** Message from jan baeyens
- * this listener makes sure that when you change from one configuration to another
- * the correct hardware libraries are attached to the project
- * for instance you can have a project with 2 configurations
- * one for teensy
- * one for arduino uno
- *
- *
- * when you use the spi library the library is a completely different library
- * this code takes care that you use the correct library when switching configuration
- *
- */
-
-import java.io.File;
-
 import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICDescriptionDelta;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Status;
 
 import io.sloeber.core.Activator;
 import io.sloeber.core.api.BoardDescription;
 import io.sloeber.core.api.SloeberProject;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.Const;
-import io.sloeber.core.tools.Helpers;
-import io.sloeber.core.tools.Libraries;
 
-@SuppressWarnings({ "unused" })
 public class ConfigurationChangeListener implements ICProjectDescriptionListener {
 
     @Override
@@ -55,43 +37,27 @@ public void handleEvent(CProjectDescriptionEvent event) {
                     "Ignoring configuration change during project creation " + activeProject.getName())); //$NON-NLS-1$
             return;
         }
+        ICDescriptionDelta projectDelta = event.getProjectDelta();
+        if (projectDelta != null) {
+            int projectChangeFlags = projectDelta.getChangeFlags();
+            int projectDeltaKind = projectDelta.getDeltaKind();
+        }
+        ICDescriptionDelta cfgDelta = event.getActiveCfgDelta();
+        if (cfgDelta != null) {
+            int cfgChangeFlags = cfgDelta.getChangeFlags();
+            int cfgDeltaKind = cfgDelta.getDeltaKind();
+        }
+        ICDescriptionDelta defaultDelta = event.getDefaultSettingCfgDelta();
+        if (defaultDelta != null) {
+            int changeFlags = defaultDelta.getChangeFlags();
+            int deltaKind = defaultDelta.getDeltaKind();
+        }
+        SloeberProject sloebberProject = SloeberProject.getSloeberProject(activeProject);
+
         ICProjectDescription newProjDesc = event.getNewCProjectDescription();
         ICConfigurationDescription newConf = newProjDesc.getActiveConfiguration();
-        IProject project = newConf.getProjectDescription().getProject();
-        SloeberProject newSloebberProject = SloeberProject.getSloeberProject(project);
-        BoardDescription newBoardDescriptor = newSloebberProject.getBoardDescription(newConf);
-
-        ICProjectDescription oldprojDesc = event.getOldCProjectDescription();
-        ICConfigurationDescription oldConf = oldprojDesc.getActiveConfiguration();
-        IProject oldProject = oldConf.getProjectDescription().getProject();
-        SloeberProject oldSloebberProject = SloeberProject.getSloeberProject(oldProject);
-        BoardDescription oldBoardDescriptor = oldSloebberProject.getBoardDescription(oldConf);
-
-        if (oldprojDesc.getName().equals(newProjDesc.getName())) {
-
-            File newBoardsFile = newBoardDescriptor.getReferencingBoardsFile();
-            File oldBoardsFile = oldBoardDescriptor.getReferencingBoardsFile();
-            String newBoardsName = newBoardDescriptor.getBoardName();
-            String oldBoardsName = oldBoardDescriptor.getBoardName();
-            // only if the boardsFile or variant Changed we need to reattach libraries and
-            // cores
-            if (newBoardsFile.equals(oldBoardsFile) && newBoardsName.equals(oldBoardsName)) {
-                return;
-            }
-
-            try {
-                Helpers.setDirtyFlag(activeProject, newConf);
-                Helpers.addArduinoCodeToProject(newBoardDescriptor, newConf);
-            } catch (CoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            if (!newBoardsFile.equals(oldBoardsFile)) {
-                Libraries.reAttachLibrariesToProject(newConf);
-            }
-        } else {
-            // we are doing a swap between configs
-        }
+        BoardDescription newBoardDescriptor = sloebberProject.getBoardDescription(newConf);
+        sloebberProject.setBoardDescription(newConf, newBoardDescriptor);
     }
 
 }

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

@@ -394,14 +394,22 @@ private void doOK() {
 		getValues();
 		ICConfigurationDescription confdesc = getConfdesc();
 		ICProjectDescription projDesc = confdesc.getProjectDescription();
-		try {
+		SloeberProject sProject = getSloeberProject();
+
 			for (Entry<String, BoardDescription> curEntry : myBoardDescs.entrySet()) {
 				ICConfigurationDescription curConfDesc = projDesc.getConfigurationById(curEntry.getKey());
-				getSloeberProject().setBoardDescription(curConfDesc, curEntry.getValue());
+				BoardDescription boardDesc = curEntry.getValue();
+				try {
+					if ((curConfDesc != null) && (boardDesc != null)) {
+						sProject.setBoardDescription(curConfDesc, boardDesc);
+					} else {
+						Activator.log(new Status(IStatus.ERROR, Activator.getId(), Messages.error_adding_arduino_code));
+					}
+				} catch (Exception e) {
+					Activator.log(new Status(IStatus.ERROR, Activator.getId(), Messages.error_adding_arduino_code, e));
+				}
+
 			}
-		} catch (Exception e) {
-			Activator.log(new Status(IStatus.ERROR, Activator.getId(), Messages.error_adding_arduino_code, e));
-		}
 	}
 
 	private SloeberProject getSloeberProject() {
@@ -489,7 +497,15 @@ public BoardDescription getBoardDescription() {
 			} else {
 				ICProjectDescription projDesc = getConfdesc().getProjectDescription();
 				for (ICConfigurationDescription curConfDesc : projDesc.getConfigurations()) {
-					myBoardDescs.put(curConfDesc.getId(), getSloeberProject().getBoardDescription(curConfDesc));
+					BoardDescription boardDesc = getSloeberProject().getBoardDescription(curConfDesc);
+					if (boardDesc == null) {
+						// TOFIX new configuration is normally copy of but
+						// I don't know what has been used to copy from
+						// so make default for now
+						boardDesc = new BoardDescription();
+					}
+					myBoardDescs.put(curConfDesc.getId(), boardDesc);
+
 				}
 				myActiveBoardDesc = myBoardDescs.get(activeConfDesc.getId());
 				if (myActiveBoardDesc == null) {