diff options
author | Doug Schaefer | 2017-11-21 03:02:25 +0000 |
---|---|---|
committer | Doug Schaefer | 2017-11-21 03:02:25 +0000 |
commit | 682243a727e6204df3789d163be9179148a35936 (patch) | |
tree | 78d142dfb38e7c4d9991b199c8ecbc89a5bd194d | |
parent | a90655bc049f296b3e661e6aabd4ffe6bc6dd98d (diff) | |
download | org.eclipse.cdt-682243a727e6204df3789d163be9179148a35936.tar.gz org.eclipse.cdt-682243a727e6204df3789d163be9179148a35936.tar.xz org.eclipse.cdt-682243a727e6204df3789d163be9179148a35936.zip |
Undo the fix I did for creating the build container.
It cause more problems than it solved. Will need to revisit later.
Change-Id: Ifbbb2a29c41f24ff08e1debb03ee5f4739d0223b
-rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java index 425c791895d..c79947593a2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java @@ -68,10 +68,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -208,23 +208,12 @@ public abstract class CBuildConfiguration extends PlatformObject IFolder buildRootFolder = project.getFolder("build"); //$NON-NLS-1$ IFolder buildFolder = buildRootFolder.getFolder(name); - if (!buildRootFolder.exists() || !buildFolder.exists()) { - new Job(Messages.CBuildConfiguration_CreateJob) { - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - if (!buildRootFolder.exists()) { - buildRootFolder.create(IResource.FORCE | IResource.DERIVED, true, monitor); - } - if (!buildFolder.exists()) { - buildFolder.create(IResource.FORCE | IResource.DERIVED, true, monitor); - } - return Status.OK_STATUS; - } catch (CoreException e) { - return e.getStatus(); - } - } - }.schedule(); + IProgressMonitor monitor = new NullProgressMonitor(); + if (!buildRootFolder.exists()) { + buildRootFolder.create(IResource.FORCE | IResource.DERIVED, true, monitor); + } + if (!buildFolder.exists()) { + buildFolder.create(IResource.FORCE | IResource.DERIVED, true, monitor); } return buildFolder; |