core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetTreeNode.java
equal
deleted
inserted
replaced
70 children[index++] = new TreeNode(config) { |
70 children[index++] = new TreeNode(config) { |
71 @Override |
71 @Override |
72 public String toString() { |
72 public String toString() { |
73 ISymbianBuildContext context = (ISymbianBuildContext)getValue(); |
73 ISymbianBuildContext context = (ISymbianBuildContext)getValue(); |
74 String sdkId = context.getSDK().getUniqueId(); |
74 String sdkId = context.getSDK().getUniqueId(); |
75 String newDisplayString = context.getDisplayString().replace("[" + sdkId + "]", ""); |
75 String newDisplayString = stripSDKIDFromConfigName(context.getDisplayString(), sdkId); |
76 if (context instanceof ISBSv2BuildContext){ |
76 if (context instanceof ISBSv2BuildContext){ |
77 ISBSv2BuildContext v2Context = (ISBSv2BuildContext)context; |
77 ISBSv2BuildContext v2Context = (ISBSv2BuildContext)context; |
78 if (v2Context.getConfigQueryData().getConfigurationErrorMessage() != null && |
78 if (v2Context.getConfigQueryData().getConfigurationErrorMessage() != null && |
79 v2Context.getConfigQueryData().getConfigurationErrorMessage().length() > 0){ |
79 v2Context.getConfigQueryData().getConfigurationErrorMessage().length() > 0){ |
80 newDisplayString += " ERROR: " + v2Context.getConfigQueryData().getConfigurationErrorMessage(); |
80 newDisplayString += " ERROR: " + v2Context.getConfigQueryData().getConfigurationErrorMessage(); |
165 realInput[index++] = currNode; |
165 realInput[index++] = currNode; |
166 } |
166 } |
167 } |
167 } |
168 return realInput; |
168 return realInput; |
169 } |
169 } |
|
170 |
|
171 private static String stripSDKIDFromConfigName(String configName, String sdkID){ |
|
172 return configName.replace("[" + sdkID + "]", ""); |
|
173 } |
|
174 |
170 |
175 |
171 } |
176 } |