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

Bug 371144 - There seems to be no easy way to add custom marker annotations to non-workspace file

Browse source
This commit is contained in:
Anton Leherbauer 2012-02-15 08:46:37 +01:00
parent 88bf01e541
commit 5a77d86898
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,6 @@ import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextUtilities;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.AnnotationModel;
import org.eclipse.jface.text.source.AnnotationModelEvent;
import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.jface.text.source.IAnnotationModelListener;
@ -887,21 +886,24 @@ public class CDocumentProvider extends TextFileDocumentProvider {
IProblemRequestor requestor= tuInfo.fModel instanceof IProblemRequestor ? (IProblemRequestor) tuInfo.fModel : null;
tuInfo.fCopy = CDTUITools.getWorkingCopyManager().getSharedWorkingCopy(original, requestor, getProgressMonitor());
if (tuInfo.fModel == null) {
IPath location = original.getLocation();
if (location != null) {
IResource markerResource= original.getCProject().getProject();
tuInfo.fModel= new ExternalSearchAnnotationModel(markerResource, location);
IAnnotationModel fileBufferAnnotationModel= tuInfo.fTextFileBuffer.getAnnotationModel();
if (fileBufferAnnotationModel != null) {
((AnnotationModel)tuInfo.fModel).addAnnotationModel("fileBufferModel", fileBufferAnnotationModel); //$NON-NLS-1$
}
tuInfo.fCachedReadOnlyState= true;
}
}
if (tuInfo.fModel instanceof TranslationUnitAnnotationModel) {
TranslationUnitAnnotationModel model= (TranslationUnitAnnotationModel) tuInfo.fModel;
model.setTranslationUnit(tuInfo.fCopy);
} else {
IPath location = original.getLocation();
if (location != null) {
IResource markerResource = CUIPlugin.getWorkspace().getRoot();
IAnnotationModel originalModel = tuInfo.fModel;
ExternalSearchAnnotationModel externalSearchModel = new ExternalSearchAnnotationModel(markerResource, location, IResource.DEPTH_ONE);
tuInfo.fModel= externalSearchModel;
IAnnotationModel fileBufferModel= tuInfo.fTextFileBuffer.getAnnotationModel();
if (fileBufferModel != null) {
externalSearchModel.addAnnotationModel("fileBufferModel", fileBufferModel); //$NON-NLS-1$
}
if (originalModel != null && originalModel != fileBufferModel) {
externalSearchModel.addAnnotationModel("originalModel", originalModel); //$NON-NLS-1$
}
}
}
if (tuInfo.fModel != null)
tuInfo.fModel.addAnnotationModelListener(fGlobalAnnotationModelListener);