From 9877d0b3bdd357207c29c4ff725cead02cb769e4 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Thu, 14 Apr 2005 20:29:38 +0000
Subject: [PATCH] Turned new content assist on for C.

---
 .../ui/text/CSourceViewerConfiguration.java   | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
index fb9d6addde7..0e65baaef01 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
@@ -49,7 +49,6 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
@@ -205,25 +204,10 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
 
 		ContentAssistant assistant = new ContentAssistant();
 		
-        IContentAssistProcessor processor = null;
-
-		IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditor().getEditorInput());
-        
-		if (workingCopy == null)
-			return null;
-		
-		IResource resource = workingCopy.getResource();
-        if (resource != null) {
-            IProject project = resource.getProject();
-            ICFileType type = CCorePlugin.getDefault().getFileType(project, resource.getLocation().lastSegment());
-            
-            processor = type.getLanguage().getId().equals(ICFileTypeConstants.LANG_C)
-					|| getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
-                ? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
-                : (IContentAssistProcessor)new CCompletionProcessor2(getEditor());
-        } else
-            processor = new CCompletionProcessor(getEditor());
-    
+		IContentAssistProcessor processor
+			= getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
+			? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
+			: (IContentAssistProcessor)new CCompletionProcessor2(getEditor());
 		assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
 
 		//Will this work as a replacement for the configuration lines below?