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

Workaround for occasional NPE when restoring working sets on startup

Browse source
This commit is contained in:
Anton Leherbauer 2007-08-16 14:12:12 +00:00
parent 2c81d31199
commit f4cfd28736
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java
View file

@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSet;
@ -40,6 +41,16 @@ import org.eclipse.cdt.core.model.IElementChangedListener;
public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementChangedListener { public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementChangedListener {
private static class SingletonRule implements ISchedulingRule {
public static final ISchedulingRule INSTANCE = new SingletonRule();
public boolean contains(ISchedulingRule rule) {
return rule == this;
}
public boolean isConflicting(ISchedulingRule rule) {
return rule == this;
}
}
private static class WorkingSetCheck extends Job { private static class WorkingSetCheck extends Job {
private final IWorkingSet fWorkingSet; private final IWorkingSet fWorkingSet;
WorkingSetCheck(final IWorkingSet workingSet) { WorkingSetCheck(final IWorkingSet workingSet) {
@ -99,12 +110,15 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh
* {@inheritDoc} * {@inheritDoc}
*/ */
public void add(final IWorkingSet workingSet) { public void add(final IWorkingSet workingSet) {
checkElementExistence(workingSet);
// delay the check for existence - this may be called very early in the bootstrap // delay the check for existence - this may be called very early in the bootstrap
// otherwise it is causing all kinds of weird exceptions // otherwise it is causing all kinds of weird exceptions
Job check= new WorkingSetCheck(workingSet); Job check= new WorkingSetCheck(workingSet);
check.setUser(false); check.setUser(false);
check.setPriority(Job.SHORT); check.setPriority(Job.SHORT);
check.schedule(1000); // make jobs run sequential
check.setRule(SingletonRule.INSTANCE);
check.schedule(2000 + fWorkingSets.size() * 100);
check.addJobChangeListener(new JobChangeAdapter() { check.addJobChangeListener(new JobChangeAdapter() {
public void done(IJobChangeEvent event) { public void done(IJobChangeEvent event) {
synchronized (fWorkingSets) { synchronized (fWorkingSets) {