--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Tue Mar 30 15:13:35 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Tue Mar 30 15:22:01 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 Tue Mar 30 15:13:35 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java Tue Mar 30 15:22:01 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);
}