--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java Fri Apr 16 11:32:51 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java Fri Apr 16 11:33:55 2010 -0500
@@ -659,8 +659,10 @@
// Compare each of the settings to see if they are the same
boolean sisSettingsEqual = sisFilesBlock.compareConfigurationSettings(selectedConfig, writeToConfig);
- boolean sbsv2ConfigEqual = sbsv2BuildConfigTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
-
+ boolean sbsv2ConfigEqual = true;
+ if (sbsv2BuildConfigTabComposite != null) {
+ sbsv2ConfigEqual = sbsv2BuildConfigTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
+ }
// Compare envVars settings
boolean envVarsSettingsEqual = envVarList.size() == envVarListOrig.size() && envVarList.equals(envVarListOrig);
if (!envVarsSettingsEqual && writeToConfig) {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java Fri Apr 16 11:32:51 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java Fri Apr 16 11:33:55 2010 -0500
@@ -38,8 +38,8 @@
public class SBSv2BuildConfigTabComposite extends Composite {
- private static final String configCmdLabelPrefixText = "Configuration Command: -c ";
- private static final String releaseTreeLabelPrefixText = "Release Tree: ";
+ private static final String configCmdLabelPrefixText = "Configuration Command: -c "; // $NON-NLS-N$
+ private static final String releaseTreeLabelPrefixText = "Release Tree: "; // $NON-NLS-N$
Text variantEdit;