From 60679c40444d77e24949dcfb8a42223b901b6bba Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 26 May 2005 15:13:52 +0000 Subject: [PATCH] fixed some minor bugs --- .../internal/envvar/UserDefinedEnvironmentSupplier.java | 5 ++--- .../managedbuilder/internal/macros/BuildMacroProvider.java | 2 +- .../internal/macros/BuildfileMacroSubstitutor.java | 3 ++- .../internal/macros/ExternalExtensionMacroSupplier.java | 5 ++--- .../eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/UserDefinedEnvironmentSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/UserDefinedEnvironmentSupplier.java index d80209d10ec..89fb51ec0d1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/UserDefinedEnvironmentSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/UserDefinedEnvironmentSupplier.java @@ -314,12 +314,11 @@ public class UserDefinedEnvironmentSupplier extends } protected String getValidName(String name){ - name = EnvVarOperationProcessor.normalizeName(name); - if(name == null) + if(name == null || (name = name.trim()).length() == 0) return null; if(fNonOverloadableVariables != null){ for(int i = 0; i < fNonOverloadableVariables.length; i++){ - if(name.equals(fNonOverloadableVariables[i])) + if(fNonOverloadableVariables[i].equals(EnvVarOperationProcessor.normalizeName(name))) return null; } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java index e8eec067566..56df3d6e8ae 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java @@ -196,7 +196,7 @@ public class BuildMacroProvider implements IBuildMacroProvider { IMacroContextInfo info = getMacroContextInfo(contextType,contextData); if(info != null) - MacroResolver.resolveToStringList(value,getMacroSubstitutor(info,nonexistentMacrosValue, " ")); //$NON-NLS-1$ + return MacroResolver.resolveToStringList(value,getMacroSubstitutor(info,nonexistentMacrosValue, " ")); //$NON-NLS-1$ return null; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java index f4a3c6ce511..ded3226a299 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java @@ -168,7 +168,8 @@ public class BuildfileMacroSubstitutor extends DefaultMacroSubstitutor { protected ResolvedMacro resolveMacro(IBuildMacro macro) throws BuildMacroException{ ResolvedMacro resolved = null; - if(!UserDefinedMacroSupplier.getInstance().areMacrosExpanded(fConfiguration) && + if(fConfiguration != null && fBuilder != null && + !UserDefinedMacroSupplier.getInstance().areMacrosExpanded(fConfiguration) && macro instanceof EnvironmentMacroSupplier.EnvVarMacro){ String ref = getMacroReference(macro); if(ref != null) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExternalExtensionMacroSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExternalExtensionMacroSupplier.java index 17d9b37d4cb..0f1c97c985d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExternalExtensionMacroSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExternalExtensionMacroSupplier.java @@ -165,12 +165,11 @@ public class ExternalExtensionMacroSupplier implements IBuildMacroSupplier { } protected String getValidName(String name){ - name = EnvVarOperationProcessor.normalizeName(name); - if(name == null) + if(name == null || (name = name.trim()).length() == 0) return null; if(fNonOverloadableMacros != null){ for(int i = 0; i < fNonOverloadableMacros.length; i++){ - if(name.equals(fNonOverloadableMacros[i].toUpperCase())) + if(fNonOverloadableMacros[i].equals(EnvVarOperationProcessor.normalizeName(name))) return null; } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java index b33ac94c02a..f29c530548c 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java @@ -1128,12 +1128,12 @@ public class MacrosBlock extends AbstractCOptionPage { * answers whether the macro of a given name can be sreated */ public boolean canCreate(String name){ - if((name = EnvVarOperationProcessor.normalizeName(name)) == null) + if(name == null || (name = name.trim()).length() == 0) return false; if(fHiddenMacros != null){ for(int i = 0; i < fHiddenMacros.length; i++){ - if(name.equals(fHiddenMacros[i].toUpperCase())) + if(fHiddenMacros[i].equals(EnvVarOperationProcessor.normalizeName(name))) return false; } }