diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
index d49fbea15f3..3c7c9b02588 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
- *    Anton Leherbauer (Wind River Systems)
+ *     Markus Schorn - initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.core.model;
 
@@ -27,9 +27,7 @@ import org.eclipse.core.runtime.PlatformObject;
  * @since 4.0
  */
 public abstract class AbstractLanguage extends PlatformObject implements ILanguage {
-	/*
-	 * @see org.eclipse.cdt.core.model.ILanguage#getName()
-	 */
+	@Override
 	public String getName() {
 		ILanguageDescriptor languageDescriptor= LanguageManager.getInstance().getLanguageDescriptor(getId());
 		if (languageDescriptor != null) {
@@ -43,6 +41,7 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
 	 * IncludeFileContentProvider, IIndex, int, IParserLogService)}
 	 */
 	@Deprecated
+	@Override
 	public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader, 
 			IScannerInfo scanInfo,
 			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
 	 */
+	@Override
 	@SuppressWarnings("deprecation")
 	public IASTTranslationUnit getASTTranslationUnit(FileContent content, IScannerInfo scanInfo,
 			IncludeFileContentProvider fileCreator, IIndex index, int options, IParserLogService log)
@@ -67,6 +67,7 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	@SuppressWarnings("deprecation")
 	public IASTCompletionNode getCompletionNode(FileContent reader, IScannerInfo scanInfo,
 			IncludeFileContentProvider fileCreator, IIndex index, IParserLogService log, int offset)
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AssemblyLanguage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AssemblyLanguage.java
index e11443a07f5..f0899e56834 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AssemblyLanguage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AssemblyLanguage.java
@@ -60,9 +60,7 @@ public class AssemblyLanguage extends AbstractLanguage implements IAsmLanguage,
 		return DEFAULT_INSTANCE;
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.ILanguage#createModelBuilder(org.eclipse.cdt.core.model.ITranslationUnit)
-	 */
+	@Override
 	public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) {
 		IContributedModelBuilder modelBuilder= null;
 		IContributedModelBuilder.Factory modelBuilderFactory= (IContributedModelBuilder.Factory)getAdapter(IContributedModelBuilder.Factory.class);
@@ -78,75 +76,57 @@ public class AssemblyLanguage extends AbstractLanguage implements IAsmLanguage,
 		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
+	@Override
 	public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
 			IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index,
 			IParserLogService log) throws CoreException {
 		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
+	@Override
 	public IASTCompletionNode getCompletionNode(org.eclipse.cdt.core.parser.CodeReader reader,
 			IScannerInfo scanInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory fileCreator, IIndex index,
 			IParserLogService log, int offset) throws CoreException {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.ILanguage#getId()
-	 */
+	@Override
 	public String getId() {
 		return fId;
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.ILanguage#getSelectedNames(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit, int, int)
-	 */
+	@Override
 	public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
 		return null;
 	}
 
 	// IAsmLanguage
 	
-	/*
-	 * @see org.eclipse.cdt.core.model.IAsmLanguage#getLineCommentCharacters()
-	 */
+	@Override
 	public char[] getLineCommentCharacters() {
 		return fLineCommentCharacters;
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.IAsmLanguage#getLineSeparatorCharacter()
-	 */
+	@Override
 	public char getLineSeparatorCharacter() {
 		return '\0';
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.IAsmLanguage#getDirectiveKeywords()
-	 */
+	@Override
 	public String[] getDirectiveKeywords() {
 		return DIRECTIVE_KEYWORDS;
 	}
 
-	/*
-	 * @see org.eclipse.cdt.core.model.IAsmLanguage#getPreprocessorKeywords()
-	 */
+	@Override
 	public String[] getPreprocessorKeywords() {
 		Set<String> ppDirectives= ParserFactory.getKeywordSet(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.C);
 		String[] result= ppDirectives.toArray(new String[ppDirectives.size()]);
 		return result;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
+	@Override
 	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
 		if (data instanceof String) {
 			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$
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.NO_LINKAGE_ID;
 	}