fix project creation over existing cmake4eclipse project of versions <

4.x
15knots · Oct 6, 2023 · 38b405d · 38b405d
1 parent 00aab09
commit 38b405d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/....cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NewProjectTemplateWizard.java b/....cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NewProjectTemplateWizard.java
@@ -202,7 +202,7 @@ private IProject createIProject(final String name, final URI location, IProgress
       newProject.open(subMonitor.split(25));
     }
     IProgressMonitor continueCreationMonitor = subMonitor.split(25);
-    C4ENature.addNature(newProject, SubMonitor.convert(continueCreationMonitor, "Add Project Nature", 1).split(1));
+    C4ENature.setNatures(newProject, SubMonitor.convert(continueCreationMonitor, "Add Project Nature", 1).split(1));
 
     return newProject;
   }

diff --git a/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/nature/C4ENature.java b/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/nature/C4ENature.java
@@ -15,6 +15,7 @@
 
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -37,14 +38,15 @@ public class C4ENature implements IProjectNature {
   private IProject project;
 
   /**
-   * Adds the natures to the specified project.
+   * Sets the natures of the specified project.
    *
    * @throws CoreException
    */
-  public static void addNature(IProject project, IProgressMonitor monitor) throws CoreException {
-    CProjectNature.addNature(project, NATURE_ID, monitor);
-    CProjectNature.addCNature(project, monitor);
-    CCProjectNature.addCCNature(project, monitor);
+  public static void setNatures(IProject project, IProgressMonitor monitor) throws CoreException {
+    IProjectDescription description = project.getDescription();
+    String[] newNatures = { NATURE_ID, CProjectNature.C_NATURE_ID, CCProjectNature.CC_NATURE_ID };
+    description.setNatureIds(newNatures);
+    project.setDescription(description, monitor);
   }
 
   @Override
@@ -63,7 +65,7 @@ private void addBuilders(IProgressMonitor monitor) throws CoreException {
     List<ICommand> commands = new ArrayList<>(Arrays.asList(description.getBuildSpec()));
     commands.add(0, bldrCommand);
 
-    ICommand[] cmds = commands.stream().distinct().toArray(ICommand[]::new);
+    ICommand[] cmds = commands.stream().filter(c -> !ManagedCProjectNature.BUILDER_ID.equals(c.getBuilderName()) ). distinct().toArray(ICommand[]::new);
     description.setBuildSpec(cmds);
     project.setDescription(description, monitor);
   }
@@ -74,7 +76,7 @@ public void deconfigure() throws CoreException {
     List<ICommand> commands = new ArrayList<>(Arrays.asList(description.getBuildSpec()));
     for (Iterator<ICommand> iter = commands.iterator(); iter.hasNext();) {
       ICommand iCommand = iter.next();
-      if(Activator.BUILDER_ID.equals(iCommand.getBuilderName())) {
+      if (Activator.BUILDER_ID.equals(iCommand.getBuilderName())) {
         iter.remove();
         break;
       }