Make sure to compare against sbsv2 alias name when compareing SymbianBuildContext. Also added some preliminary support to update projects from simple plat/target names to SBSv2 names.
authortimkelly
Tue, 30 Mar 2010 15:19:13 -0500
changeset 1142 1d7dae831144
parent 1138 352c0236f181
child 1143 18d2d1c4eb50
Make sure to compare against sbsv2 alias name when compareing SymbianBuildContext. Also added some preliminary support to update projects from simple plat/target names to SBSv2 names.
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Mar 29 15:56:12 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Tue Mar 30 15:19:13 2010 -0500
@@ -92,8 +92,11 @@
 		if (target == null) {
 			if (other.target != null)
 				return false;
-		} else if (!target.equals(other.target))
+		} else if (!target.equals(other.target)) {
 			return false;
+		} else if (sbsv2Alias!= null && !sbsv2Alias.equals(other.sbsv2Alias)) {
+			return false;
+		}
 		return true;
 	}
 
@@ -170,7 +173,7 @@
 		int indexEnd = displayName.indexOf(")");  //$NON-NLS-1$
 		if (indexBegin > 0 && indexEnd > 0){
 			String configPart =  displayName.substring(indexBegin+1, indexEnd);
-			if (configPart.split("_").length > 0){
+			if (configPart.split("_").length > 1){
 				return configPart;
 			}
 		} 
@@ -435,5 +438,14 @@
 	public String getSBSv2Alias() {
 		return sbsv2Alias;
 	}
+	
+	public void setSBSv2Alias(String sbsv2Alias) {
+		this.sbsv2Alias = sbsv2Alias;
+	}
+
+	public void setDisplayString(String newDisplayName) {
+		this.displayString = newDisplayName;
+		
+	}
 
 }
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Mon Mar 29 15:56:12 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Tue Mar 30 15:19:13 2010 -0500
@@ -150,4 +150,8 @@
 	 * @return the configuration name, or null if none.
 	 */
 	public String getSBSv2Alias();
+	
+	public void setSBSv2Alias(String newAlias);
+	
+	public void setDisplayString(String newDisplayName);
 }