core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java
equal
deleted
inserted
replaced
61 this.sdk = sdk; |
61 this.sdk = sdk; |
62 this.sbsv2Alias = alias; |
62 this.sbsv2Alias = alias; |
63 this.meaning = meaning; |
63 this.meaning = meaning; |
64 this.configID = ISBSv2BuildContext.BUILDER_ID + "." + sbsv2Alias + "." + sdk.getUniqueId(); |
64 this.configID = ISBSv2BuildContext.BUILDER_ID + "." + sbsv2Alias + "." + sdk.getUniqueId(); |
65 parseQueryConfigResults(contextQueryXML); |
65 parseQueryConfigResults(contextQueryXML); |
66 |
66 this.displayString = sbsv2Alias + " [" + sdk.getUniqueId() + "]"; |
67 if (configParseErrorMessage != null && configParseErrorMessage.length() > 0){ |
|
68 this.displayString = sbsv2Alias + " ERROR: " + configParseErrorMessage; |
|
69 } else { |
|
70 this.displayString = sbsv2Alias + " [" + sdk.getUniqueId() + "]"; |
|
71 } |
|
72 } |
67 } |
73 |
68 |
74 @Override |
69 @Override |
75 public ISymbianSDK getSDK() { |
70 public ISymbianSDK getSDK() { |
76 return sdk; |
71 return sdk; |
82 if (platform == null){ |
77 if (platform == null){ |
83 return configParseErrorMessage; |
78 return configParseErrorMessage; |
84 } |
79 } |
85 |
80 |
86 if (platform.contains(".")){ |
81 if (platform.contains(".")){ |
87 return platform.split(".")[0]; |
82 String[] tok = platform.split("."); |
|
83 if (tok.length > 0) return tok[0]; |
88 } |
84 } |
89 return platform; |
85 return platform; |
90 } |
86 } |
91 |
87 |
92 public String getPlatformReleaseDirName() { |
88 public String getPlatformReleaseDirName() { |
457 |
453 |
458 /** |
454 /** |
459 * Error message, if any. |
455 * Error message, if any. |
460 * @return An error message if a problem occurred while trying to get config info from Raptor. Null if no error. |
456 * @return An error message if a problem occurred while trying to get config info from Raptor. Null if no error. |
461 */ |
457 */ |
|
458 @Override |
462 public String getConfigurationErrorMessage(){ |
459 public String getConfigurationErrorMessage(){ |
463 return configParseErrorMessage; |
460 return configParseErrorMessage; |
464 } |
461 } |
465 |
462 |
466 } |
463 } |