Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorSean Evoy2004-08-06 14:58:16 -0400
committerSean Evoy2004-08-06 14:58:16 -0400
commitd52cfb4834932f139cfc6d3fe768d9d60698e073 (patch)
tree9c15a8f96461e153b51d0ce8347e615248575d89 /build
parentf8f5b6ab826ee432bf3824d2b2994b0d2df63b84 (diff)
downloadorg.eclipse.cdt-d52cfb4834932f139cfc6d3fe768d9d60698e073.tar.gz
org.eclipse.cdt-d52cfb4834932f139cfc6d3fe768d9d60698e073.tar.xz
org.eclipse.cdt-d52cfb4834932f139cfc6d3fe768d9d60698e073.zip
Commit for Leo Treggiari -- Fix for bugzilla 71254
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
index 02833e10888..bc1cd780e04 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
@@ -307,11 +307,19 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
// the option value
switch (opt.getValueType()) {
case IOption.BOOLEAN :
- if (opt.getCommand().equals(optionValue)) {
+ String boolCommand;
+ boolCommand = opt.getCommand();
+ if (boolCommand != null && boolCommand.equals(optionValue)) {
getPreferenceStore()
.setValue(opt.getId(), true);
optionValueExist = true;
}
+ boolCommand = opt.getCommandFalse();
+ if (boolCommand != null && boolCommand.equals(optionValue)) {
+ getPreferenceStore()
+ .setValue(opt.getId(), false);
+ optionValueExist = true;
+ }
break;
case IOption.ENUMERATED :
String enum = ""; //$NON-NLS-1$
@@ -400,9 +408,14 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
switch (opt.getValueType()) {
case IOption.BOOLEAN :
ArrayList optsList = new ArrayList(optionsArr);
- if (opt.getCommand() != null
+ if (opt.getCommand() != null
+ && opt.getCommand().length() > 0
&& !optsList.contains(opt.getCommand()))
getPreferenceStore().setValue(opt.getId(), false);
+ if (opt.getCommandFalse() != null
+ && opt.getCommandFalse().length() > 0
+ && !optsList.contains(opt.getCommandFalse()))
+ getPreferenceStore().setValue(opt.getId(), true);
break;
case IOption.STRING :
// TODO create a lst of valid default string options for the tool

Back to the top