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 for 211423: TextFileBufferManager failed to notify an ITextFileBufferListener

Browse source
This commit is contained in:
Anton Leherbauer 2007-12-07 12:42:18 +00:00
parent f61f0b09a6
commit 88a3de11fd
1 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
View file

@ -26,6 +26,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
@ -626,7 +627,9 @@ public class CDocumentProvider extends TextFileDocumentProvider {
} }
private Object getAnnotations(Position position) { private Object getAnnotations(Position position) {
return fReverseMap.get(position); synchronized (getLockObject()) {
return fReverseMap.get(position);
}
} }
/* /*
@ -635,17 +638,19 @@ public class CDocumentProvider extends TextFileDocumentProvider {
protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) throws BadLocationException { protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) throws BadLocationException {
super.addAnnotation(annotation, position, fireModelChanged); super.addAnnotation(annotation, position, fireModelChanged);
Object cached= fReverseMap.get(position); synchronized (getLockObject()) {
if (cached == null) Object cached= fReverseMap.get(position);
fReverseMap.put(position, annotation); if (cached == null)
else if (cached instanceof List) { fReverseMap.put(position, annotation);
List list= (List) cached; else if (cached instanceof List) {
list.add(annotation); List list= (List) cached;
} else if (cached instanceof Annotation) { list.add(annotation);
List list= new ArrayList(2); } else if (cached instanceof Annotation) {
list.add(cached); List list= new ArrayList(2);
list.add(annotation); list.add(cached);
fReverseMap.put(position, list); list.add(annotation);
fReverseMap.put(position, list);
}
} }
} }
@ -654,7 +659,9 @@ public class CDocumentProvider extends TextFileDocumentProvider {
*/ */
protected void removeAllAnnotations(boolean fireModelChanged) { protected void removeAllAnnotations(boolean fireModelChanged) {
super.removeAllAnnotations(fireModelChanged); super.removeAllAnnotations(fireModelChanged);
fReverseMap.clear(); synchronized (getLockObject()) {
fReverseMap.clear();
}
} }
/* /*
@ -662,16 +669,18 @@ public class CDocumentProvider extends TextFileDocumentProvider {
*/ */
protected void removeAnnotation(Annotation annotation, boolean fireModelChanged) { protected void removeAnnotation(Annotation annotation, boolean fireModelChanged) {
Position position= getPosition(annotation); Position position= getPosition(annotation);
Object cached= fReverseMap.get(position); synchronized (getLockObject()) {
if (cached instanceof List) { Object cached= fReverseMap.get(position);
List list= (List) cached; if (cached instanceof List) {
list.remove(annotation); List list= (List) cached;
if (list.size() == 1) { list.remove(annotation);
fReverseMap.put(position, list.get(0)); if (list.size() == 1) {
list.clear(); fReverseMap.put(position, list.get(0));
list.clear();
}
} else if (cached instanceof Annotation) {
fReverseMap.remove(position);
} }
} else if (cached instanceof Annotation) {
fReverseMap.remove(position);
} }
super.removeAnnotation(annotation, fireModelChanged); super.removeAnnotation(annotation, fireModelChanged);
} }
@ -679,17 +688,17 @@ public class CDocumentProvider extends TextFileDocumentProvider {
protected static class GlobalAnnotationModelListener implements IAnnotationModelListener, IAnnotationModelListenerExtension { protected static class GlobalAnnotationModelListener implements IAnnotationModelListener, IAnnotationModelListenerExtension {
private ArrayList fListenerList; private ListenerList fListenerList;
public GlobalAnnotationModelListener() { public GlobalAnnotationModelListener() {
fListenerList= new ArrayList(); fListenerList= new ListenerList(ListenerList.IDENTITY);
} }
/** /**
* @see IAnnotationModelListener#modelChanged(IAnnotationModel) * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
*/ */
public void modelChanged(IAnnotationModel model) { public void modelChanged(IAnnotationModel model) {
Object[] listeners= fListenerList.toArray(); Object[] listeners= fListenerList.getListeners();
for (int i= 0; i < listeners.length; i++) { for (int i= 0; i < listeners.length; i++) {
((IAnnotationModelListener) listeners[i]).modelChanged(model); ((IAnnotationModelListener) listeners[i]).modelChanged(model);
} }
@ -699,7 +708,7 @@ public class CDocumentProvider extends TextFileDocumentProvider {
* @see IAnnotationModelListenerExtension#modelChanged(AnnotationModelEvent) * @see IAnnotationModelListenerExtension#modelChanged(AnnotationModelEvent)
*/ */
public void modelChanged(AnnotationModelEvent event) { public void modelChanged(AnnotationModelEvent event) {
Object[] listeners= fListenerList.toArray(); Object[] listeners= fListenerList.getListeners();
for (int i= 0; i < listeners.length; i++) { for (int i= 0; i < listeners.length; i++) {
Object curr= listeners[i]; Object curr= listeners[i];
if (curr instanceof IAnnotationModelListenerExtension) { if (curr instanceof IAnnotationModelListenerExtension) {