From 09ed69dcb6b91b1da22c00c50a57a6253f5ce6b1 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Fri, 29 Jul 2005 13:28:03 +0000 Subject: [PATCH] Checked in the patch from Bob Monteleone that fixes the problem with updating a CDT 1.2 project to CDT 3.0 where a property of type enumeration has changed --- .../projectconverter/UpdateManagedProject12.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java index f4d29bac882..7101f12a67b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java @@ -385,6 +385,12 @@ class UpdateManagedProject12 { String name = optRef.getAttribute(IOption.DEFAULT_VALUE); // Convert it to the ID String idValue = newOpt.getEnumeratedId(name); + if (idValue == null) { + // If the name does not match one of the enumerations values, probably because + // the list of enumerands has changed, set the name to be the name used for the + // enumeration's default value + name = (String)newOpt.getDefaultValue(); + } configuration.setOption(tool, newOpt, idValue != null ? idValue : name); break; case IOption.STRING_LIST: