--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Fri Aug 20 09:39:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Mon Aug 23 18:14:52 2010 -0500
@@ -74,12 +74,10 @@
 		this.displayString = sbsv2Alias + " [" + sdk.getUniqueId() + "]"; 
 	}
 
-	@Override
 	public ISymbianSDK getSDK() {
 		return sdk;
 	}
 
-	@Override
 	public String getPlatformString() {
 		
 		if (platform == null){
@@ -97,7 +95,6 @@
 		return platform;
 	}
 
-	@Override
 	public String getTargetString() {
 		if (target == null){
 			return configQueryData.getConfigurationErrorMessage();
@@ -109,7 +106,6 @@
 		return configID;
 	}
 	
-	@Override
 	public String getDisplayString() {
 		Check.checkState(displayString != null);
 		return displayString;
@@ -120,7 +116,6 @@
 		return getConfigID();
 	}
 
-	@Override
 	public String getDefaultDefFileDirectoryName() {
 	
 		String dirName = getDefFileDirectoryNameForPlatform(platform);
@@ -142,7 +137,6 @@
 		return null;
 	}
 	
-	@Override
 	public IPath getCompilerPrefixFile() {
 		
 		if (sbsv2Alias.toUpperCase().contains(TOOLCHAIN_GCCE) ||
@@ -156,17 +150,14 @@
 		return null;
 	}
 	
-	@Override
 	public List<IDefine> getVariantHRHDefines() {
 		return getCachedData().getVariantHRHDefines();
 	}
 
-	@Override
 	public List<File> getVariantHRHIncludes() {
 		return getCachedData().getPrefixFileIncludes();
 	}
 
-	@Override
 	public List<IDefine> getCompilerPreincludeDefines() {
 		IPath prefixFile = getCompilerPrefixFile();
 		if (prefixFile == null || !prefixFile.toFile().exists()) {
@@ -176,13 +167,11 @@
 		return getCachedData().getCompilerMacros(prefixFile);
 	}
 
-	@Override
 	public String getBuildVariationName() {
 		// Not needed for Raptor
 		return "";
 	}
 	
-	@Override
 	public String getSBSv2Alias() {
 		return sbsv2Alias;
 	}
@@ -319,12 +308,10 @@
 		return configQueryData;
 	}
 
-	@Override
 	public ISBSv2ConfigQueryData getConfigQueryData() {
 		return configQueryData;
 	}
 
-	@Override
 	public String getToolChain() {
 		
 		if (configQueryData != null) {
@@ -350,7 +337,6 @@
 		return TOOLCHAIN_UNKNOWN;
 	}
 
-	@Override
 	public List<IPath> getSystemIncludes() {
 		if (configQueryData != null) {
 			List<String> includes = configQueryData.getMetaDataIncludes();
@@ -372,13 +358,11 @@
 		return null;
 	}
 
-	@Override
 	public List<String> getSupportedTargettypes() {
 		return configQueryData.getTargettypes();
 	}
 
 
-	@Override
 	public void loadConfigurationSettings(ICStorageElement se) {
 		if (sbsv2BuildInfo == null){
 			sbsv2BuildInfo = new SBSv2BuilderInfo();
@@ -387,13 +371,11 @@
 		sbsv2BuildInfo.loadFromStorage(se);
 	}
 
-	@Override
 	public void saveConfigurationSettings(ICStorageElement se, ISymbianBuildContext context) {
 		sbsv2BuildInfo = new SBSv2BuilderInfo((ISBSv2BuildContext)context);
 		sbsv2BuildInfo.saveToStorage(se.createChild(SBSV2_DATA_ID)); 
 	}
 
-	@Override
 	/**
 	 * Get the unique ID for this build configuration.
 	 * For ABLD it is the display name, for SBSv2, it is the builder ID (cconfiguration 'id')
@@ -412,7 +394,6 @@
 		return sbsv2BldInfo.getPrefixFromVariantCfg();
 	}
 
-	@Override
 	public List<IDefine> getBuildMacros() {
 		ISBSv2BuildInfo sbsv2BldInfo = ((ISBSv2BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER));
 		Map<String, String> buildMacroMap = sbsv2BldInfo.getBuildMacros(getSBSv2Alias());
@@ -424,7 +405,6 @@
 		return defines;
 	}
 
-	@Override
 	public List<IDefine> getMetadataMacros() {
 		ISBSv2BuildInfo sbsv2BldInfo = ((ISBSv2BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER));
 		Map<String, String> platMacroMap = sbsv2BldInfo.getMetadataMacros(getSBSv2Alias());
@@ -436,7 +416,6 @@
 		return defines;
 	}
 
-	@Override
 	public IDefine getTargetTypeMacro(String targettype) {
 		ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
 		return DefineFactory.createDefine(sbsv2BuildInfo.getTargetTypeMacro(targettype));