Fix error message for existing configs in projects that have errors, but were filtered out by filtering prefs. Error message was left off, if there was one.
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Mon Jul 26 15:21:29 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Mon Jul 26 16:18:24 2010 -0500
@@ -359,7 +359,19 @@
@Override
public String toString() {
ISymbianBuildContext context = (ISymbianBuildContext)getValue();
- return stripSDKIDFromConfigName(context.getDisplayString(), context.getSDK().getUniqueId());
+ String sdkId = context.getSDK().getUniqueId();
+ String newDisplayString = stripSDKIDFromConfigName(context.getDisplayString(), sdkId);
+ if (context instanceof ISBSv2BuildContext){
+ ISBSv2BuildContext v2Context = (ISBSv2BuildContext)context;
+ if (v2Context.getConfigQueryData() == null){
+ newDisplayString += " ERROR: " + "Unable to load configuration data because the query to sbs failed."; // $NON-NLS-N$
+ }
+ else if (v2Context.getConfigQueryData().getConfigurationErrorMessage() != null &&
+ v2Context.getConfigQueryData().getConfigurationErrorMessage().length() > 0){
+ newDisplayString += " ERROR: " + v2Context.getConfigQueryData().getConfigurationErrorMessage();
+ }
+ }
+ return newDisplayString;
}
};
}
@@ -371,7 +383,19 @@
@Override
public String toString() {
ISymbianBuildContext context = (ISymbianBuildContext)getValue();
- return stripSDKIDFromConfigName(context.getDisplayString(), context.getSDK().getUniqueId());
+ String sdkId = context.getSDK().getUniqueId();
+ String newDisplayString = stripSDKIDFromConfigName(context.getDisplayString(), sdkId);
+ if (context instanceof ISBSv2BuildContext){
+ ISBSv2BuildContext v2Context = (ISBSv2BuildContext)context;
+ if (v2Context.getConfigQueryData() == null){
+ newDisplayString += " ERROR: " + "Unable to load configuration data because the query to sbs failed."; // $NON-NLS-N$
+ }
+ else if (v2Context.getConfigQueryData().getConfigurationErrorMessage() != null &&
+ v2Context.getConfigQueryData().getConfigurationErrorMessage().length() > 0){
+ newDisplayString += " ERROR: " + v2Context.getConfigQueryData().getConfigurationErrorMessage();
+ }
+ }
+ return newDisplayString;
}
};
}