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

Fixed compiler warnings.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-17 19:26:13 -07:00
parent 432fafe8b9
commit a328f88fad
2 changed files with 17 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
View file

@ -6,8 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.model; package org.eclipse.cdt.core.model;
@ -27,9 +27,7 @@ import org.eclipse.core.runtime.PlatformObject;
* @since 4.0 * @since 4.0
*/ */
public abstract class AbstractLanguage extends PlatformObject implements ILanguage { public abstract class AbstractLanguage extends PlatformObject implements ILanguage {
/* @Override
* @see org.eclipse.cdt.core.model.ILanguage#getName()
*/
public String getName() { public String getName() {
ILanguageDescriptor languageDescriptor= LanguageManager.getInstance().getLanguageDescriptor(getId()); ILanguageDescriptor languageDescriptor= LanguageManager.getInstance().getLanguageDescriptor(getId());
if (languageDescriptor != null) { if (languageDescriptor != null) {
@ -43,6 +41,7 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
* IncludeFileContentProvider, IIndex, int, IParserLogService)} * IncludeFileContentProvider, IIndex, int, IParserLogService)}
*/ */
@Deprecated @Deprecated
@Override
public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader, public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
IScannerInfo scanInfo, IScannerInfo scanInfo,
org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index, int options, IParserLogService log) org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index, int options, IParserLogService log)
@ -54,6 +53,7 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
/** /**
* @since 5.2 * @since 5.2
*/ */
@Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public IASTTranslationUnit getASTTranslationUnit(FileContent content, IScannerInfo scanInfo, public IASTTranslationUnit getASTTranslationUnit(FileContent content, IScannerInfo scanInfo,
IncludeFileContentProvider fileCreator, IIndex index, int options, IParserLogService log) IncludeFileContentProvider fileCreator, IIndex index, int options, IParserLogService log)
@ -67,6 +67,7 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
/** /**
* @since 5.2 * @since 5.2
*/ */
@Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public IASTCompletionNode getCompletionNode(FileContent reader, IScannerInfo scanInfo, public IASTCompletionNode getCompletionNode(FileContent reader, IScannerInfo scanInfo,
IncludeFileContentProvider fileCreator, IIndex index, IParserLogService log, int offset) IncludeFileContentProvider fileCreator, IIndex index, IParserLogService log, int offset)

41
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AssemblyLanguage.java
View file

@ -60,9 +60,7 @@ public class AssemblyLanguage extends AbstractLanguage implements IAsmLanguage,
return DEFAULT_INSTANCE; return DEFAULT_INSTANCE;
} }
/* @Override
* @see org.eclipse.cdt.core.model.ILanguage#createModelBuilder(org.eclipse.cdt.core.model.ITranslationUnit)
*/
public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) { public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) {
IContributedModelBuilder modelBuilder= null; IContributedModelBuilder modelBuilder= null;
IContributedModelBuilder.Factory modelBuilderFactory= (IContributedModelBuilder.Factory)getAdapter(IContributedModelBuilder.Factory.class); IContributedModelBuilder.Factory modelBuilderFactory= (IContributedModelBuilder.Factory)getAdapter(IContributedModelBuilder.Factory.class);
@ -78,75 +76,57 @@ public class AssemblyLanguage extends AbstractLanguage implements IAsmLanguage,
return modelBuilder; return modelBuilder;
} }
/*
* @see org.eclipse.cdt.core.model.ILanguage#getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader, org.eclipse.cdt.core.parser.IScannerInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory, org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.parser.IParserLogService)
*/
@Deprecated @Deprecated
@Override
public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader, public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index, IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index,
IParserLogService log) throws CoreException { IParserLogService log) throws CoreException {
return null; return null;
} }
/*
* @see org.eclipse.cdt.core.model.ILanguage#getCompletionNode(org.eclipse.cdt.core.parser.CodeReader, org.eclipse.cdt.core.parser.IScannerInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory, org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.parser.IParserLogService, int)
*/
@Deprecated @Deprecated
@Override
public IASTCompletionNode getCompletionNode(org.eclipse.cdt.core.parser.CodeReader reader, public IASTCompletionNode getCompletionNode(org.eclipse.cdt.core.parser.CodeReader reader,
IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index, IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index,
IParserLogService log, int offset) throws CoreException { IParserLogService log, int offset) throws CoreException {
return null; return null;
} }
/* @Override
* @see org.eclipse.cdt.core.model.ILanguage#getId()
*/
public String getId() { public String getId() {
return fId; return fId;
} }
/* @Override
* @see org.eclipse.cdt.core.model.ILanguage#getSelectedNames(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit, int, int)
*/
public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) { public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
return null; return null;
} }
// IAsmLanguage // IAsmLanguage
/* @Override
* @see org.eclipse.cdt.core.model.IAsmLanguage#getLineCommentCharacters()
*/
public char[] getLineCommentCharacters() { public char[] getLineCommentCharacters() {
return fLineCommentCharacters; return fLineCommentCharacters;
} }
/* @Override
* @see org.eclipse.cdt.core.model.IAsmLanguage#getLineSeparatorCharacter()
*/
public char getLineSeparatorCharacter() { public char getLineSeparatorCharacter() {
return '\0'; return '\0';
} }
/* @Override
* @see org.eclipse.cdt.core.model.IAsmLanguage#getDirectiveKeywords()
*/
public String[] getDirectiveKeywords() { public String[] getDirectiveKeywords() {
return DIRECTIVE_KEYWORDS; return DIRECTIVE_KEYWORDS;
} }
/* @Override
* @see org.eclipse.cdt.core.model.IAsmLanguage#getPreprocessorKeywords()
*/
public String[] getPreprocessorKeywords() { public String[] getPreprocessorKeywords() {
Set<String> ppDirectives= ParserFactory.getKeywordSet(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.C); Set<String> ppDirectives= ParserFactory.getKeywordSet(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.C);
String[] result= ppDirectives.toArray(new String[ppDirectives.size()]); String[] result= ppDirectives.toArray(new String[ppDirectives.size()]);
return result; return result;
} }
/* @Override
* @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
if (data instanceof String) { if (data instanceof String) {
fLineCommentCharacters= ((String)data).toCharArray(); fLineCommentCharacters= ((String)data).toCharArray();
@ -154,6 +134,7 @@ public class AssemblyLanguage extends AbstractLanguage implements IAsmLanguage,
fId= CCorePlugin.PLUGIN_ID + '.' + config.getAttribute("id"); //$NON-NLS-1$ fId= CCorePlugin.PLUGIN_ID + '.' + config.getAttribute("id"); //$NON-NLS-1$
} }
@Override
public int getLinkageID() { public int getLinkageID() {
return ILinkage.NO_LINKAGE_ID; return ILinkage.NO_LINKAGE_ID;
} }