From ed3ae35c1dc0e68c8ebc13972381dd628db1fb20 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Wed, 15 Jun 2005 12:54:15 +0000 Subject: [PATCH] The fix for setting/getting the valueHandler Extra Argument from Bala Torati --- .../cdt/managedbuilder/internal/core/Option.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java index b70cadb4a34..22189eaa4d4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java @@ -1443,7 +1443,9 @@ public class Option extends BuildObject implements IOption { if (valueHandlerExtraArgument == null) { if (superClass != null) { return superClass.getValueHandlerExtraArgument(); - } + } else { + return EMPTY_STRING; + } } return valueHandlerExtraArgument; } @@ -1452,11 +1454,12 @@ public class Option extends BuildObject implements IOption { * @see org.eclipse.cdt.managedbuilder.core.IOption#setValueHandlerExtraArgument(String)) */ public void setValueHandlerExtraArgument(String extraArgument) { - if (extraArgument == null) - extraArgument = ""; //$NON-NLS-1$ - if (valueHandlerExtraArgument == null || !valueHandlerExtraArgument.equals(extraArgument)) { + if (extraArgument == null && valueHandlerExtraArgument == null) return; + if (extraArgument == null || + valueHandlerExtraArgument == null || + !extraArgument.equals(valueHandlerExtraArgument)) { valueHandlerExtraArgument = extraArgument; - setDirty(true); + isDirty = true; } }