# HG changeset patch
# User wpaul
# Date 1282605292 18000
# Node ID 4d38e1ac1cff232fae26bbd8ec8e0181d71d043b
# Parent  0142fe025ce616e801dd59988febffaf78b6966f
fixed incorrect use of @Override.  cleaned up a few warnings.

diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.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/BuildContextSBSv1.java	Mon Aug 23 18:14:52 2010 -0500
@@ -439,29 +439,24 @@
 		return getCachedData().getSystemIncludePaths();
 	}
 
-	@Override
 	public void loadConfigurationSettings(ICStorageElement se) {
 		if (se.getName().equals(ARGUMENTS_DATA_ID)) {
 			loadBuildArgsFromStorage(se);
 		}
 	}
 
-	@Override
 	public IBuildArgumentsInfo getBuildArgumentsInfo() {
 		return (IBuildArgumentsInfo)buildArgumentsInfo;
 	}
 	
-	@Override
 	public BuildArgumentsInfo getBuildArgumentsInfoCopy() {
 		return new BuildArgumentsInfo(buildArgumentsInfo);
 	}
 	
-	@Override
 	public void setBuildArgumentsInfo(BuildArgumentsInfo buildArgumentsInfo) {
 		this.buildArgumentsInfo = buildArgumentsInfo;
 	}
 	
-	@SuppressWarnings("deprecation")
 	private void loadBuildArgsFromStorage(ICStorageElement rootStorage) {
 		buildArgumentsInfo = new BuildArgumentsInfo(getSDK());
 		String value = rootStorage.getAttribute(BuildArgumentsInfo.BLDMAKEBLDFILESARGSSTORAGE);
@@ -570,12 +565,10 @@
 		}
 	}
 
-	@Override
 	public void saveConfigurationSettings(ICStorageElement se, ISymbianBuildContext context) {
 		saveBuildArgsToStorage(se.createChild(ARGUMENTS_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
@@ -676,7 +669,6 @@
 		return variantCFGMacros;
 	}
 
-	@Override
 	public List<IDefine> getBuildMacros() {
 		ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 		List<IDefine> defines = new ArrayList<IDefine>();
@@ -699,7 +691,6 @@
 		return defines;
 	}
 
-	@Override
 	public List<IDefine> getMetadataMacros() {
 		ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 		List<IDefine> defines = new ArrayList<IDefine>();
@@ -710,7 +701,6 @@
 		return defines;
 	}
 
-	@Override
 	public IDefine getTargetTypeMacro(String targettype) {
 		ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)getSDK().getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 		return DefineFactory.createDefine(sbsv1BuildInfo.getTargetTypeMacro(targettype));
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java
--- 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));
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISBSv2BuildInfo.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISBSv2BuildInfo.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/ISBSv2BuildInfo.java	Mon Aug 23 18:14:52 2010 -0500
@@ -13,7 +13,6 @@
 
 package com.nokia.carbide.cpp.internal.api.sdk;
 
-import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IPath;
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.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/SBSv2Utils.java	Mon Aug 23 18:14:52 2010 -0500
@@ -176,7 +176,6 @@
 	 * @return true if SBSv1 is available, false otherwise
 	 */
 	
-	@SuppressWarnings("unused")
 	public static boolean enableSBSv1Support() {
 		
 		// hard-coded shut off
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SDKCacheUtils.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SDKCacheUtils.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/SDKCacheUtils.java	Mon Aug 23 18:14:52 2010 -0500
@@ -16,8 +16,6 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 
-import javax.swing.filechooser.FileSystemView;
-
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2ConfigQueryData.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2ConfigQueryData.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/sbsv2/SBSv2ConfigQueryData.java	Mon Aug 23 18:14:52 2010 -0500
@@ -48,47 +48,38 @@
 		parseQueryConfigResults(queryResult);
 	}
 
-	@Override
 	public String getAlias() {
 		return alias;
 	}
 
-	@Override
 	public String getBuildPrefix() {
 		return buildPrefix;
 	}
 
-	@Override
 	public Map<String, String> getBuildMacros() {
 		return buildMacros;
 	}
 	
-	@Override
 	public List<String> getTargettypes() {
 		return targettypes;
 	}
 
-	@Override
 	public String getConfigurationErrorMessage() {
 		return configurationErrorMessage;
 	}
 
-	@Override
 	public Map<String, String> getMetaDataMacros() {
 		return metaDataMacros;
 	}
 
-	@Override
 	public List<String> getMetaDataIncludes() {
 		return metaDataIncludes;
 	}
 
-	@Override
 	public String getMetaDataVariantHRH() {
 		return metaDataVariantHRH;
 	}
 
-	@Override
 	public String getOutputPathString() {
 		return outputPathString;
 	}
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java	Fri Aug 20 09:39:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java	Mon Aug 23 18:14:52 2010 -0500
@@ -259,7 +259,6 @@
 		return buildContexts;
 	}
 
-	@Override
 	public List<String> getBuiltinMacros(ISymbianBuildContext context) {
 		List<String> macros = new ArrayList<String>();
 		
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java	Fri Aug 20 09:39:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java	Mon Aug 23 18:14:52 2010 -0500
@@ -62,7 +62,6 @@
 		this.sdk = sdk;
 	}
 
-	@Override
 	public List<ISymbianBuildContext> getAllBuildConfigurations() {
 		// This really only applies to SBSv1. We never return the full list of configs for SBSv2, only the filtered ones
 		return sbsv2FilteredConetxts;
@@ -77,7 +76,6 @@
 		cachedVariantHRHFile = null;
 	}
 	
-	@Override
 	public List<ISymbianBuildContext> getFilteredBuildConfigurations() {
 		
 		if (aliasToMeaningMap.size() == 0){
diff -r 0142fe025ce6 -r 4d38e1ac1cff core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Fri Aug 20 09:39:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Mon Aug 23 18:14:52 2010 -0500
@@ -16,15 +16,10 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
@@ -50,7 +45,6 @@
 import org.xml.sax.SAXException;
 
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.ISymbianSDKModifier;
 import com.nokia.carbide.cpp.internal.sdk.core.gen.Devices.DeviceType;
 import com.nokia.carbide.cpp.sdk.core.ISDKBuildInfo;
@@ -82,7 +76,6 @@
 	private Version osVersion;
 	private Map<String, ISDKBuildInfo> buildInfoMap = new HashMap<String, ISDKBuildInfo>();
 	private Map<String, File> prefixFileMap = new HashMap<String, File>();
-	@SuppressWarnings("rawtypes")
 	private Set<Object> sdkFeatures = new HashSet<Object>();
 
 	public SymbianSDK(DeviceType device) {
@@ -90,7 +83,6 @@
 		scanSDK();
 	}
 
-	@SuppressWarnings("unchecked")
 	public void addSupportedFeature(Object feature) {
 		sdkFeatures.add(feature);
 	}
@@ -380,7 +372,6 @@
 		
 		try {
 			
-			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 			Node node = XPathAPI.selectSingleNode(doc, "sdk/paths");
 			for (NodeIterator nodeIter = XPathAPI.selectNodeIterator(doc, "sdk"); (node = nodeIter.nextNode()) != null;) {
 				NamedNodeMap attribs = node.getAttributes();
@@ -472,7 +463,6 @@
 			setOSVersion(new Version("9.5.0"));  // Set a default version that will work with all EKA2
 		
 		try {
-			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 			char[] cbuf = new char[(int) bldInfoFile.length()];
 			Reader reader = new FileReader(bldInfoFile);
 			reader.read(cbuf);
@@ -537,7 +527,6 @@
 		}
 	}
 	
-	@SuppressWarnings("unchecked")
 	private void setSupportFeatures() {
 		scanForWINSCW_UREL();
 		scanForWINSCW_UDEB();
@@ -573,7 +562,6 @@
 	/**
 	 * Check to see whether or not we should support WINSCW UREL
 	 */
-	@SuppressWarnings("unchecked")
 	private void scanForWINSCW_UREL(){
 		String winscwURELFullPathStr = getEPOCROOT();
 		winscwURELFullPathStr += WINSCW_UREL_DIR;
@@ -590,7 +578,6 @@
 	/**
 	 * Check to see whether or not we should support WINSCW UDEB
 	 */
-	@SuppressWarnings("unchecked")
 	private void scanForWINSCW_UDEB(){
 		String winscwURELFullPathStr = getEPOCROOT();
 		winscwURELFullPathStr += WINSCW_UDEB_DIR;