mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 03:45:35 +02:00
Code Issues Wiki Activity

Bug 412519. Avoid using deprecated getScannerExtensionConfiguration()

Browse source 
method
This commit is contained in:
Sergey Prigogin 2013-08-25 09:31:09 -07:00
parent 9f3c46474e
commit 40f2edf0d9
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2009 IBM Corporation and others. * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -9,6 +9,7 @@
* Anton Leherbauer (Wind River Systems) - initial API and implementation * Anton Leherbauer (Wind River Systems) - initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Mike Kucera (IBM) * Mike Kucera (IBM)
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.dom.parser; package org.eclipse.cdt.core.dom.parser;
@ -26,6 +27,7 @@ import org.eclipse.cdt.core.model.AbstractLanguage;
import org.eclipse.cdt.core.model.ICLanguageKeywords; import org.eclipse.cdt.core.model.ICLanguageKeywords;
import org.eclipse.cdt.core.model.IContributedModelBuilder; import org.eclipse.cdt.core.model.IContributedModelBuilder;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
import org.eclipse.cdt.core.parser.FileContent; import org.eclipse.cdt.core.parser.FileContent;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.IScanner;
@ -44,7 +46,7 @@ import org.eclipse.core.runtime.CoreException;
* for the DOM parser framework. * for the DOM parser framework.
* *
* This class uses the template method pattern, derived classes need only implement * This class uses the template method pattern, derived classes need only implement
* {@link AbstractCLikeLanguage#getScannerExtensionConfiguration()}, * {@link AbstractCLikeLanguage#getScannerExtensionConfiguration(IScannerInfo info)},
* {@link AbstractCLikeLanguage#getParserLanguage()} and * {@link AbstractCLikeLanguage#getParserLanguage()} and
* {@link AbstractCLikeLanguage#createParser(IScanner scanner, ParserMode parserMode, * {@link AbstractCLikeLanguage#createParser(IScanner scanner, ParserMode parserMode,
* IParserLogService logService, IIndex index)}. * IParserLogService logService, IIndex index)}.
@ -255,13 +257,15 @@ public abstract class AbstractCLikeLanguage extends AbstractLanguage implements
} }
private ICLanguageKeywords cLanguageKeywords; private ICLanguageKeywords cLanguageKeywords;
private synchronized ICLanguageKeywords getCLanguageKeywords() { private synchronized ICLanguageKeywords getCLanguageKeywords() {
if (cLanguageKeywords == null) if (cLanguageKeywords == null) {
cLanguageKeywords = new CLanguageKeywords(getParserLanguage(), getScannerExtensionConfiguration()); cLanguageKeywords = new CLanguageKeywords(getParserLanguage(),
getScannerExtensionConfiguration(new ExtendedScannerInfo()));
}
return cLanguageKeywords; return cLanguageKeywords;
} }
@Override @Override
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) { public Object getAdapter(Class adapter) {