Fixed bug 277967: [content assist][implementation] ContentAssistantFacade and SourceViewer check twice for IContentAssistantExtension4, and never for IContentAssistantExtension2

2 files changed, 4 insertions, 3 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ContentAssistantFacade.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ContentAssistantFacade.java
index 7ab43413433..e3990869ba2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ContentAssistantFacade.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ContentAssistantFacade.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,7 +38,7 @@ public final class ContentAssistantFacade {
 	 * @param contentAssistant the content assistant which implements {@link IContentAssistantExtension2} and {@link IContentAssistantExtension4}
 	 */
 	public ContentAssistantFacade(IContentAssistant contentAssistant) {
-		Assert.isLegal(contentAssistant instanceof IContentAssistantExtension4 && contentAssistant instanceof IContentAssistantExtension4);
+		Assert.isLegal(contentAssistant instanceof IContentAssistantExtension2 && contentAssistant instanceof IContentAssistantExtension4);
 		fContentAssistant= contentAssistant;
 	}
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
index 2c1812feb6c..54ec20a3e63 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
@@ -45,6 +45,7 @@ import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.TextViewer;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistantExtension2;
 import org.eclipse.jface.text.contentassist.IContentAssistantExtension4;
 import org.eclipse.jface.text.formatter.FormattingContext;
 import org.eclipse.jface.text.formatter.FormattingContextProperties;
@@ -374,7 +375,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		fContentAssistant= configuration.getContentAssistant(this);
 		if (fContentAssistant != null) {
 			fContentAssistant.install(this);
-			if (fContentAssistant instanceof IContentAssistantExtension4)
+			if (fContentAssistant instanceof IContentAssistantExtension2 && fContentAssistant instanceof IContentAssistantExtension4)
 				fContentAssistantFacade= new ContentAssistantFacade(fContentAssistant);
 			fContentAssistantInstalled= true;
 		}