mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Merge remote-tracking branch 'cdt/master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2012-04-16 19:00:27 -04:00
commit 775d00a41d
3 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java
View file

@ -45,6 +45,7 @@ import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
@ -358,9 +359,9 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
} }
isExecuted = true; isExecuted = true;
Job job = new Job(ManagedMakeMessages.getResourceString("AbstractBuiltinSpecsDetector.DiscoverBuiltInSettingsJobName")) { //$NON-NLS-1$ WorkspaceJob job = new WorkspaceJob(ManagedMakeMessages.getResourceString("AbstractBuiltinSpecsDetector.DiscoverBuiltInSettingsJobName")) { //$NON-NLS-1$
@Override @Override
protected IStatus run(IProgressMonitor monitor) { public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
IStatus status; IStatus status;
try { try {
startup(currentCfgDescription, null); startup(currentCfgDescription, null);

25
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java
View file

@ -193,7 +193,10 @@ public class CDescriptorTests extends BaseTestCase {
}; };
t.start(); t.start();
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true); ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true);
t.join(); try {
t.join();
} catch (InterruptedException e) {
}
ICStorageElement data = desc.getProjectStorageElement("testElement0"); ICStorageElement data = desc.getProjectStorageElement("testElement0");
data.createChild("test"); data.createChild("test");
@ -253,7 +256,10 @@ public class CDescriptorTests extends BaseTestCase {
} }
for (int j = 0; j < threads.length; j++) { for (int j = 0; j < threads.length; j++) {
if (threads[j] != null) { if (threads[j] != null) {
threads[j].join(); try {
threads[j].join();
} catch (InterruptedException e) {
}
} }
assertNull("Exception occurred: "+exception[j], exception[j]); assertNull("Exception occurred: "+exception[j], exception[j]);
} }
@ -291,7 +297,10 @@ public class CDescriptorTests extends BaseTestCase {
ICStorageElement data = desc.getProjectStorageElement("testElement5"); ICStorageElement data = desc.getProjectStorageElement("testElement5");
data.createChild("test"); data.createChild("test");
desc.saveProjectData(); desc.saveProjectData();
t.join(); try {
t.join();
} catch (InterruptedException e) {
}
fLastEvent = null; fLastEvent = null;
} }
@ -324,7 +333,10 @@ public class CDescriptorTests extends BaseTestCase {
ICStorageElement data = desc.getProjectStorageElement("testElement6"); ICStorageElement data = desc.getProjectStorageElement("testElement6");
data.createChild("test"); data.createChild("test");
desc.saveProjectData(); desc.saveProjectData();
t.join(); try {
t.join();
} catch (InterruptedException e) {
}
fLastEvent = null; fLastEvent = null;
} }
@ -356,7 +368,10 @@ public class CDescriptorTests extends BaseTestCase {
ICStorageElement data = desc.getProjectStorageElement("testElement0"); ICStorageElement data = desc.getProjectStorageElement("testElement0");
data.createChild("test"); data.createChild("test");
desc.saveProjectData(); desc.saveProjectData();
t.join(); try {
t.join();
} catch (InterruptedException e) {
}
fLastEvent = null; fLastEvent = null;
} }

1
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
View file

@ -590,6 +590,7 @@ public class LanguageSettingsProvidersSerializer {
} }
}; };
job.setRule(ResourcesPlugin.getWorkspace().getRoot());
job.schedule(); job.schedule();
} }