Fix bug 10591. Support com.nokia.symbian (Symbian^3 SDK ID) so we treat it as it it was S60 5th Ed.
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Thu Jan 28 12:09:31 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Thu Jan 28 12:35:30 2010 -0600
@@ -194,8 +194,15 @@
public String getFamily() {
String[] parts = getName().split("\\.");
- if (parts.length == 3)
- return parts[2];
+ if (parts.length == 3){
+ if (getSDKVersion().getMajor() == 5 && getName().equalsIgnoreCase(NOKIA_SF_SDK_NAME)){
+ // A vendor of "symbian" and SDK major version 5 is the same as prior naming for "com.nokia.s60" & 5th Edition.
+ // Return "s60" so that project template generation continues to work as it's a S60 5th ed. SDK.
+ return ISymbianSDK.S60_FAMILY_ID;
+ } else {
+ return parts[2];
+ }
+ }
return "";
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Thu Jan 28 12:09:31 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Thu Jan 28 12:35:30 2010 -0600
@@ -48,10 +48,12 @@
public static final String S80_FAMILY_ID = "Series80";
public static final String UIQ_FAMILY_ID = "UIQ";
public static final String TECHVIEW_FAMILY_ID = "TechView";
+ public static final String SYMBIAN_FOUNDATION_FAMILY_ID = "symbian"; // Symbian Foundation, starting with Symbian^3
// Unique Ids include the vendor
public static final String SERIES60_SDK_NAME = "com.nokia." + SERIES60_FAMILY_ID;
public static final String S60_SDK_NAME = "com.nokia." + S60_FAMILY_ID;
+ public static final String NOKIA_SF_SDK_NAME = "com.nokia." + SYMBIAN_FOUNDATION_FAMILY_ID; // Nokia+Symbian Foundation SDK
public static final String S80_SDK_NAME = "com.nokia." + S80_FAMILY_ID;
public static final String UIQ_SDK_NAME = "com.symbian." + UIQ_FAMILY_ID;
public static final String TECHVIEW_SDK_NAME = "com.symbian." + TECHVIEW_FAMILY_ID;
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/TemplateUtils.java Thu Jan 28 12:09:31 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/TemplateUtils.java Thu Jan 28 12:35:30 2010 -0600
@@ -50,7 +50,7 @@
*/
public static boolean sdkMatchesTemplate(ISymbianSDK symbianSDK, ITemplate template) {
Version sdkVersion = symbianSDK.getSDKVersion();
- String family = symbianSDK.getFamily(); // ??? is this S60, UIQ, etc. ???
+ String family = symbianSDK.getFamily(); // S60, symbian... 3rd segment of devices.xml 'name' attrib
return sdkMatchesTemplate(sdkVersion, family, template);
}