Improve encapsulation within AbstractGnuToolPrefixMacro

Part of eclipse-cdt#361
jld01 · Apr 19, 2023 · b108aeb · b108aeb
1 parent 74d0478
commit b108aeb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/...gedbuilder.core/src/org/eclipse/cdt/managedbuilder/macros/AbstractGnuToolPrefixMacro.java b/...gedbuilder.core/src/org/eclipse/cdt/managedbuilder/macros/AbstractGnuToolPrefixMacro.java
@@ -15,35 +15,37 @@
  */
 public abstract class AbstractGnuToolPrefixMacro implements IBuildMacro {
 
+	public static final String MACRO_NAME = IGnuToolFactory.GNU_TOOL_PREFIX_VARIABLE;
+
 	@Override
-	public String getName() {
-		return IGnuToolFactory.GNU_TOOL_PREFIX_VARIABLE;
+	public final String getName() {
+		return MACRO_NAME;
 	}
 
 	@Override
-	public int getValueType() {
+	public final int getValueType() {
 		return IBuildMacro.VALUE_TEXT;
 	}
 
 	@Override
-	public int getMacroValueType() {
+	public final int getMacroValueType() {
 		return getValueType();
 	}
 
 	@Override
 	public abstract String getStringValue() throws BuildMacroException;
 
 	@Override
-	public String[] getStringListValue() throws BuildMacroException {
+	public final String[] getStringListValue() throws BuildMacroException {
 		throw new BuildMacroException(
-				new CdtVariableException(ICdtVariableStatus.TYPE_MACRO_NOT_STRINGLIST, getName(), null, getName()));
+				new CdtVariableException(ICdtVariableStatus.TYPE_MACRO_NOT_STRINGLIST, MACRO_NAME, null, MACRO_NAME));
 	}
 
 	protected String getStringValue(IOption option) throws BuildMacroException {
 		try {
 			return option.getStringValue();
 		} catch (BuildException e) {
-			throw new BuildMacroException(Status.error("Error getting macro value: " + getName(), e)); //$NON-NLS-1$
+			throw new BuildMacroException(Status.error("Error getting macro value: " + MACRO_NAME, e)); //$NON-NLS-1$
 		}
 	}
 

diff --git a/...t.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossBuildMacroSupplier.java b/...t.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossBuildMacroSupplier.java
@@ -20,7 +20,6 @@
 import org.eclipse.cdt.managedbuilder.macros.IBuildMacro;
 import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
 import org.eclipse.cdt.managedbuilder.macros.IConfigurationBuildMacroSupplier;
-import org.eclipse.cdt.utils.IGnuToolFactory;
 import org.eclipse.core.runtime.Status;
 
 public class CrossBuildMacroSupplier implements IConfigurationBuildMacroSupplier {
@@ -47,15 +46,15 @@ public String getStringValue() throws BuildMacroException {
 
 	@Override
 	public IBuildMacro getMacro(String macroName, IConfiguration configuration, IBuildMacroProvider provider) {
-		if (IGnuToolFactory.GNU_TOOL_PREFIX_VARIABLE.equals(macroName)) {
+		if (GnuToolPrefixMacro.MACRO_NAME.equals(macroName)) {
 			return new GnuToolPrefixMacro(configuration);
 		}
 		return null;
 	}
 
 	@Override
 	public IBuildMacro[] getMacros(IConfiguration configuration, IBuildMacroProvider provider) {
-		final IBuildMacro macro = getMacro(IGnuToolFactory.GNU_TOOL_PREFIX_VARIABLE, configuration, provider);
+		final IBuildMacro macro = getMacro(GnuToolPrefixMacro.MACRO_NAME, configuration, provider);
 		return (null == macro) ? new IBuildMacro[0] : new IBuildMacro[] { macro };
 	}