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

Fix concurrent modification of working set elements

Browse source
This commit is contained in:
Anton Leherbauer 2007-05-16 07:57:31 +00:00
parent 69f76d62ff
commit 3d38e45585
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,9 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor; 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.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.IWorkingSetUpdater; import org.eclipse.ui.IWorkingSetUpdater;
@ -48,10 +50,11 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/ */
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
checkElementExistence(fWorkingSet); synchronized (fWorkingSet) {
checkElementExistence(fWorkingSet);
}
return Status.OK_STATUS; return Status.OK_STATUS;
} }
} }
public static final String ID= "org.eclipse.cdt.ui.CElementWorkingSetPage"; //$NON-NLS-1$ public static final String ID= "org.eclipse.cdt.ui.CElementWorkingSetPage"; //$NON-NLS-1$
@ -64,7 +67,9 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh
private boolean fChanged; private boolean fChanged;
public WorkingSetDelta(IWorkingSet workingSet) { public WorkingSetDelta(IWorkingSet workingSet) {
fWorkingSet= workingSet; fWorkingSet= workingSet;
fElements= new ArrayList(Arrays.asList(workingSet.getElements())); synchronized (fWorkingSet) {
fElements= new ArrayList(Arrays.asList(fWorkingSet.getElements()));
}
} }
public int indexOf(Object element) { public int indexOf(Object element) {
return fElements.indexOf(element); return fElements.indexOf(element);
@ -90,18 +95,26 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh
CoreModel.getDefault().addElementChangedListener(this); CoreModel.getDefault().addElementChangedListener(this);
} }
protected void installListener() {
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public void add(final IWorkingSet workingSet) { public void add(final IWorkingSet workingSet) {
synchronized (fWorkingSets) { // delay the check for existence - this may be called very early in the bootstrap
fWorkingSets.add(workingSet); // otherwise it is causing all kinds of weird exceptions
}
// delay the check - this may be called very early in the bootstrap
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); check.schedule(1000);
check.addJobChangeListener(new JobChangeAdapter() {
public void done(IJobChangeEvent event) {
synchronized (fWorkingSets) {
fWorkingSets.add(workingSet);
}
}});
} }
/** /**
@ -268,7 +281,9 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh
} }
} }
if (changed) { if (changed) {
workingSet.setElements((IAdaptable[])elements.toArray(new IAdaptable[elements.size()])); synchronized (workingSet) {
workingSet.setElements((IAdaptable[])elements.toArray(new IAdaptable[elements.size()]));
}
} }
} }
} }