From 10f16fe5d3ec5ac688817347201645f577048af0 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 15 Nov 2006 12:38:01 +0000 Subject: [PATCH] Comment out temporarily incompatible changes --- .../internal/ui/editor/CDocumentProvider.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index 8f52f0d4988..f44419d3af9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -19,7 +19,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceRuleFactory; -import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -32,7 +31,6 @@ import org.eclipse.jface.text.ILineTracker; import org.eclipse.jface.text.Position; 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.IAnnotationAccessExtension; import org.eclipse.jface.text.source.IAnnotationModel; @@ -856,13 +854,13 @@ public class CDocumentProvider extends TextFileDocumentProvider { tuInfo.fCopy = copy; if (tuInfo.fModel == null && element instanceof IStorageEditorInput) { - IStorage storage= ((IStorageEditorInput)element).getStorage(); - IResource markerResource= original.getCProject().getProject(); - tuInfo.fModel= new ExternalSearchAnnotationModel(markerResource, storage); - IAnnotationModel fileBufferAnnotationModel= tuInfo.fTextFileBuffer.getAnnotationModel(); - if (fileBufferAnnotationModel != null) { - ((AnnotationModel)tuInfo.fModel).addAnnotationModel("secondaryModel", fileBufferAnnotationModel); //$NON-NLS-1$ - } +// IStorage storage= ((IStorageEditorInput)element).getStorage(); +// IResource markerResource= original.getCProject().getProject(); +// tuInfo.fModel= new ExternalSearchAnnotationModel(markerResource, storage); +// IAnnotationModel fileBufferAnnotationModel= tuInfo.fTextFileBuffer.getAnnotationModel(); +// if (fileBufferAnnotationModel != null) { +// ((AnnotationModel)tuInfo.fModel).addAnnotationModel("secondaryModel", fileBufferAnnotationModel); //$NON-NLS-1$ +// } } if (tuInfo.fModel instanceof TranslationUnitAnnotationModel) { TranslationUnitAnnotationModel model= (TranslationUnitAnnotationModel) tuInfo.fModel;