#1299 reentrance partly fixed

works for my case when project refresh on open is on

Author: jan

io.sloeber.core/src/io/sloeber/core/Activator.java

@@ -10,6 +10,7 @@
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
+import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -187,7 +188,8 @@ private static void registerListeners() {
 		singCoreModel.addCProjectDescriptionListener(new ConfigurationChangeListener(),
                 CProjectDescriptionEvent.ABOUT_TO_APPLY);
 
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(myResourceChangelistener);
+        ResourcesPlugin.getWorkspace().addResourceChangeListener(myResourceChangelistener,IResourceChangeEvent.POST_CHANGE);
+
 
 	}
 
@@ -240,7 +242,7 @@ protected IStatus run(IProgressMonitor monitor) {
 				if (InstancePreferences.useBonjour()) {
 					SloeberNetworkDiscovery.start();
 				}
-				registerListeners();
+                registerListeners();
 				return Status.OK_STATUS;
 			}
 

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

@@ -1,7 +1,6 @@
 package io.sloeber.core.api;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
@@ -580,6 +579,7 @@ private boolean readConfig(ICProjectDescription prjCDesc, boolean prjDescWritabl
             if (readConfigFromCDT(prjCDesc, prjDescWritable)) {
                 myNeedToPersist = true;
                 myNeedsClean = true;
+                projDescNeedsWriting = true;
             }
         }
         isInMemory = true;
@@ -667,6 +667,13 @@ private void setEnvironmentVariables(Collection<String> configKeys) {
      */
     private synchronized void createSloeberConfigFiles(Map<String, String> configs) {
 
+        final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+        if (workspace.isTreeLocked()) {
+            // we cant save now do it later
+            myNeedToPersist = true;
+            return;
+        }
+
         Map<String, String> configVars = new TreeMap<>();
         Map<String, String> versionVars = new TreeMap<>();
 
@@ -711,15 +718,17 @@ private synchronized void createSloeberConfigFiles(Map<String, String> configs)
         try {
             storeConfigurationFile(getConfigVersionFile(), versionVars);
             storeConfigurationFile(getConfigLocalFile(), configVars);
-        } catch (CoreException e) {
+            myNeedToPersist = false;
+        } catch (Exception e) {
             Common.log(new Status(IStatus.ERROR, io.sloeber.core.Activator.getId(),
                     "failed to save the sloeber config files", e)); //$NON-NLS-1$
+            myNeedToPersist = true;
         }
-        myNeedToPersist = false;
+
 
     }
 
-    private static void storeConfigurationFile(IFile file, Map<String, String> vars) throws CoreException {
+    private static void storeConfigurationFile(IFile file, Map<String, String> vars) throws Exception {
         String content = EMPTY;
         for (Entry<String, String> curLine : vars.entrySet()) {
             content += curLine.getKey() + '=' + curLine.getValue() + '\n';

io.sloeber.core/src/io/sloeber/core/common/Common.java

@@ -264,7 +264,7 @@ public static String makeEnvironmentVar(String variableName) {
      */
     static public String getOldWayEnvVar(ICConfigurationDescription confDesc, String envName) {
         return getBuildEnvironmentVariable(confDesc, envName,
-                getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, false), false);
+                getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, true), true);
     }
 
 

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

@@ -1,5 +1,7 @@
 package io.sloeber.core.listeners;
 
+import static io.sloeber.core.common.Const.*;
+
 import java.util.ArrayList;
 
 import org.eclipse.core.resources.IProject;
@@ -30,7 +32,7 @@ public void resourceChanged(IResourceChangeEvent event) {
         final ArrayList<IProject> changedSloeberCfgFiles = new ArrayList<>();
         IResourceDelta rootDelta = event.getDelta();
         for (IResourceDelta projectDelta : rootDelta.getAffectedChildren()) {
-            IResourceDelta sloeberCfgDelta = projectDelta.findMember(new Path("sloeber.cfg"));
+            IResourceDelta sloeberCfgDelta = projectDelta.findMember(new Path(SLOEBER_CFG));
             if (sloeberCfgDelta != null) {
                 if (sloeberCfgDelta.getKind() != IResourceDelta.REMOVED) {
                     IProject iProject = sloeberCfgDelta.getResource().getProject();
@@ -40,9 +42,9 @@ public void resourceChanged(IResourceChangeEvent event) {
                     changedSloeberCfgFiles.add(iProject);
                 }
             } else {
-                // it is not a new type sloeber project check wether it is an old type sloeber
+                // it is not a new type Sloeber project check whether it is an old type Sloeber
                 // project
-                IResourceDelta cProjectDelta = projectDelta.findMember(new Path(".cproject"));
+                IResourceDelta cProjectDelta = projectDelta.findMember(new Path(".cproject")); //$NON-NLS-1$
                 if (cProjectDelta != null)
                     if (projectDelta.getFlags() == IResourceDelta.OPEN) {
                         // as it is a open of a cdt project assume it is a sloeber project.
@@ -60,7 +62,7 @@ public void resourceChanged(IResourceChangeEvent event) {
         if (changedSloeberCfgFiles.size() == 0)
             return;
 
-        Job job = new Job("Sloeber.cfg modification processor") {
+        Job job = new Job("Sloeber.cfg modification processor") { //$NON-NLS-1$
             @Override
             protected IStatus run(IProgressMonitor monitor) {
                 final IWorkspace workspace = ResourcesPlugin.getWorkspace();