From 793c9de63fdeb54d70d822d76e97f6e442ba4d9d Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 26 Mar 2007 08:35:38 +0000
Subject: [PATCH] Removes usage of methods deprecated in 3.3M6.

---
 .../cdt/internal/ui/editor/DocumentAdapter.java   | 15 +++++++++------
 .../LegacyCompletionProposalComputer.java         |  8 +++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
index 31bd5e94113..7c732f93585 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
@@ -27,6 +27,7 @@ import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.filebuffers.FileBuffers;
 import org.eclipse.core.filebuffers.ITextFileBuffer;
 import org.eclipse.core.filebuffers.ITextFileBufferManager;
+import org.eclipse.core.filebuffers.LocationKind;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourceAttributes;
@@ -182,13 +183,15 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
 	private List fBufferListeners= new ArrayList(3);
 	private IStatus fStatus;
 
-	private IPath fLocation;
+	final private IPath fLocation;
+	final private LocationKind fLocationKind;
 
 	
 	public DocumentAdapter(IOpenable owner, IFile file) {
 		fOwner= owner;
 		fFile= file;
 		fLocation= file.getFullPath();
+		fLocationKind= LocationKind.IFILE;
 
 		initialize();			
 	}
@@ -196,20 +199,20 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
 	public DocumentAdapter(IOpenable owner, IPath location) {
 		fOwner= owner;
 		fLocation= location;
+		fLocationKind= LocationKind.LOCATION;
 		
 		initialize();			
 	}
 
 	private void initialize() {
 		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		IPath location= fLocation;
 		try {
-			manager.connect(location, new NullProgressMonitor());
-			fTextFileBuffer= manager.getTextFileBuffer(location);
+			manager.connect(fLocation, fLocationKind, new NullProgressMonitor());
+			fTextFileBuffer= manager.getTextFileBuffer(fLocation, fLocationKind);
 			fDocument= fTextFileBuffer.getDocument();
 		} catch (CoreException x) {
 			fStatus= x.getStatus();
-			fDocument= manager.createEmptyDocument(location);
+			fDocument= manager.createEmptyDocument(fLocation, fLocationKind);
 			if (fDocument instanceof ISynchronizable)
 				((ISynchronizable)fDocument).setLockObject(new Object());
 		}
@@ -287,7 +290,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
 		if (fTextFileBuffer != null) {
 			ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
 			try {
-				manager.disconnect(fTextFileBuffer.getLocation(), new NullProgressMonitor());
+				manager.disconnect(fLocation, fLocationKind, new NullProgressMonitor());
 			} catch (CoreException x) {
 				// ignore
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/LegacyCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/LegacyCompletionProposalComputer.java
index 92c2a6cb1d2..f9a7c71053e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/LegacyCompletionProposalComputer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/LegacyCompletionProposalComputer.java
@@ -27,7 +27,6 @@ import org.eclipse.cdt.core.dom.ast.ASTCompletionNode;
 import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
 import org.eclipse.cdt.core.model.IWorkingCopy;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.text.contentassist.ICompletionContributor;
 
 /**
  * A proposal computer for handling the legacy extensions from the
@@ -43,6 +42,9 @@ public class LegacyCompletionProposalComputer extends ParsingBasedProposalComput
 	public LegacyCompletionProposalComputer() {
 	}
 
+	/**
+	 * @deprecated this is for backwards compatibility, only.
+	 */
 	protected List computeCompletionProposals(
 			CContentAssistInvocationContext context,
 			IASTCompletionNode completionNode, String prefix) throws CoreException {
@@ -72,9 +74,9 @@ public class LegacyCompletionProposalComputer extends ParsingBasedProposalComput
 				if (!"contributor".equals(element.getName())) //$NON-NLS-1$
 					continue;
 				Object contribObject = element.createExecutableExtension("class"); //$NON-NLS-1$
-				if (!(contribObject instanceof ICompletionContributor))
+				if (!(contribObject instanceof org.eclipse.cdt.ui.text.contentassist.ICompletionContributor))
 					continue;
-				ICompletionContributor contributor = (ICompletionContributor)contribObject;
+				org.eclipse.cdt.ui.text.contentassist.ICompletionContributor contributor = (org.eclipse.cdt.ui.text.contentassist.ICompletionContributor)contribObject;
 				contributor.contributeCompletionProposals(viewer, offset,
 						workingCopy, (ASTCompletionNode) completionNode,
 						prefix, proposals);