fix bug 11207 RCL_2_4
authortimkelly
Mon, 03 May 2010 08:52:54 -0500
branchRCL_2_4
changeset 1319 3d1366d12e2c
parent 1313 58751193e948
child 1320 7e25a143c598
fix bug 11207
builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Fri Apr 30 10:38:59 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Mon May 03 08:52:54 2010 -0500
@@ -288,23 +288,6 @@
 		}
 	}
 	
-	public boolean equals(Object obj) {
-		if (obj instanceof ICarbideBuildConfiguration || obj instanceof ISymbianBuildContext){
-			ISymbianBuildContext context = (ISymbianBuildContext)obj;
-			if (context.getDisplayString().equals(this.getDisplayString())){
-				return true;
-			} else if (context.getPlatformString().equals(this.getPlatformString()) && 
-					context.getTargetString().equals(this.getTargetString())        && 
-					context.getSDK().equals(this.getSDK()) && context.getSBSv2Alias() != null && context.getSBSv2Alias().split("_").length == 2){
-				
-				return true;
-			}
-		} else {
-			return false;
-		}
-		return false;
-	}
-	
 	public int getErrorParserId(){
 		String plat = this.getPlatformString();
 		
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Fri Apr 30 10:38:59 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon May 03 08:52:54 2010 -0500
@@ -103,7 +103,7 @@
 			return true;
 		if (obj == null)
 			return false;
-		if (getClass() != obj.getClass())
+		if (!(obj instanceof SymbianBuildContext))
 			return false;
 		final SymbianBuildContext other = (SymbianBuildContext) obj;
 		if (platform == null) {