From c1165cf2128981e38053e863afc7763a903cceb1 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 19 Feb 2010 16:55:17 +0000 Subject: [PATCH] bug 303095: Remove deprecated IOption.overridesOnlyValue() --- .../cdt/managedbuilder/core/IOption.java | 9 ------- .../managedbuilder/internal/core/Option.java | 26 ------------------- .../internal/core/OptionReference.java | 8 +----- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java index b43a4b354cf..b608c6e25a7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IOption.java @@ -453,15 +453,6 @@ public interface IOption extends IBuildObject { */ public boolean isExtensionElement(); - /** - * @return true if this option only overrides the value attribute - * of its superclass and false if it overrides other attributes. - * - * @deprecated as of 3.0.1 - */ - @Deprecated - public boolean overridesOnlyValue(); - /** * @return true if this option is valid and false * if the option cannot be safely used due to an error in the MBS grammar. 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 c2c0e6f54c6..821f8a4f015 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 @@ -1979,32 +1979,6 @@ public class Option extends BuildObject implements IOption, IBuildPropertiesRest return isExtensionOption; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.core.IOption#overridesOnlyValue() - * Deprecated since 3.0.1 - */ - public boolean overridesOnlyValue() { - if (superClass != null && - unusedChildren == null && - browseType == null && - browseFilterExtensions == null && - (builtIns == null || builtIns.size() == 0) && - category == null && - categoryId == null && - command == null && - commandFalse == null && - tip == null && - contextId == null && - enumList == null && - enumCommands == null && - enumNames == null && - defaultValue == null) { - return true; - } else { - return false; - } - } - /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IOption#isDirty() */ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java index c43a2110239..82c507c1d5a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java @@ -741,13 +741,7 @@ public class OptionReference implements IOption { public boolean isExtensionElement() { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.core.IOption#overridesOnlyValue() - */ - public boolean overridesOnlyValue() { - return false; - } - + /* (non-Javadoc) * Sets the raw value. */