Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Evoy2004-05-12 14:33:12 +0000
committerSean Evoy2004-05-12 14:33:12 +0000
commit7ba7c61143d279c8cb10e34930292401408475cb (patch)
treee219736037baed8942af587c39f6f0e8265505e8 /build/org.eclipse.cdt.managedbuilder.ui/src
parent9de996037cf7aa509b958362c5cb153245e0d5f7 (diff)
downloadorg.eclipse.cdt-7ba7c61143d279c8cb10e34930292401408475cb.tar.gz
org.eclipse.cdt-7ba7c61143d279c8cb10e34930292401408475cb.tar.xz
org.eclipse.cdt-7ba7c61143d279c8cb10e34930292401408475cb.zip
Final work for PR 61596 - changing the storage of a enumerated option choice from its value to its ID
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui/src')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java5
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java
index 376ecde93c..2236eb2265 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java
@@ -139,8 +139,9 @@ public class BuildOptionSettingsPage extends BuildSettingsPage {
case IOption.ENUMERATED :
String enumVal = getPreferenceStore().getString(
option.getId());
- ManagedBuildManager.setOption(configuration, option,
- enumVal);
+ String enumId = option.getEnumeratedId(enumVal);
+ ManagedBuildManager.setOption(configuration, option,
+ (enumId.length() > 0) ? enumId : enumVal);
break;
case IOption.STRING :
String strVal = getPreferenceStore().getString(
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 b1c6905c80..23059e8289 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
@@ -431,7 +431,9 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
break;
case IOption.ENUMERATED :
String enumVal = getPreferenceStore().getString(option.getId());
- ManagedBuildManager.setOption(configuration, option, enumVal);
+ String enumId = option.getEnumeratedId(enumVal);
+ ManagedBuildManager.setOption(configuration, option,
+ (enumId.length() > 0) ? enumId : enumVal);
break;
case IOption.STRING :
String strVal = getPreferenceStore().getString(option.getId());

Back to the top