From ac6c8db915f9bf57c7139828625e5566fbe8b764 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 9 Jun 2005 16:07:10 +0000 Subject: [PATCH] 2005-06-08 Alain Magloire Move to the IContentTypeManager framework: PR 86645 * src.org.eclipse/cdt/ui/tests/DOMAST/DOMAST.java --- core/org.eclipse.cdt.ui.tests/ChangeLog | 4 ++++ .../src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ChangeLog b/core/org.eclipse.cdt.ui.tests/ChangeLog index 30736fd8053..9673752e53e 100644 --- a/core/org.eclipse.cdt.ui.tests/ChangeLog +++ b/core/org.eclipse.cdt.ui.tests/ChangeLog @@ -1,3 +1,7 @@ +2005-06-08 Alain Magloire + Move to the IContentTypeManager framework: PR 86645 + * src.org.eclipse/cdt/ui/tests/DOMAST/DOMAST.java + 2005-03-13 Bogdan Gheorghe Updated references to IndexManager to reflect new indexing framework. diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java index 3832ef761e1..2392341b9ff 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java @@ -42,8 +42,6 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator; import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorChainInitializer; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; -import org.eclipse.cdt.core.filetype.ICFileType; -import org.eclipse.cdt.core.filetype.ICFileTypeConstants; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; @@ -66,6 +64,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; @@ -1259,9 +1258,13 @@ public class DOMAST extends ViewPart { } IProject project = file.getProject(); - ICFileType type = CCorePlugin.getDefault().getFileType(project, file.getFullPath().lastSegment()); - String lid = type.getLanguage().getId(); - if ( lid != null && lid.equals(ICFileTypeConstants.LANG_CXX) ) { + String lid = null; + IContentType type = CCorePlugin.getContentType(project, file.getFullPath().lastSegment()); + if (type != null) { + lid = type.getId(); + } + if ( lid != null + && ( lid.equals(CCorePlugin.CONTENT_TYPE_CXXSOURCE) || lid.equals(CCorePlugin.CONTENT_TYPE_CXXHEADER)) ) { return ParserLanguage.CPP; }