From c6534eb2b77dff40de8ddc5fb667dcaf8b5c02cf Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Mon, 26 Mar 2007 13:28:36 +0000 Subject: [PATCH] *** empty log message *** --- .../managedbuilder/ui/properties/CPropertyVarsTab.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java index f12a604ed6b..cf74ff5b755 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java @@ -30,8 +30,8 @@ import org.eclipse.cdt.internal.core.cdtvariables.StorableCdtVariables; import org.eclipse.cdt.internal.core.cdtvariables.UserDefinedVariableSupplier; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.CDTListComparator; -import org.eclipse.cdt.ui.newui.UIMessages; import org.eclipse.cdt.ui.newui.PrefPage_Abstract; +import org.eclipse.cdt.ui.newui.UIMessages; import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver; import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor; import org.eclipse.core.runtime.CoreException; @@ -441,7 +441,6 @@ public class CPropertyVarsTab extends AbstractCPropertyTab { // get variables ICdtVariable[] _vars = mgr.getVariables(cfgd); if (_vars == null) return; - if (cfgd == null) { if (fShowSysMacros) { List lst = new ArrayList(_vars.length); @@ -521,9 +520,10 @@ public class CPropertyVarsTab extends AbstractCPropertyTab { } public void performApply(ICResourceDescription src, ICResourceDescription dst) { - if (cfgd != null) // only for project, not for prefs - fUserSupplier.setMacros(fUserSupplier.getMacros(CONTEXT, src), CONTEXT, dst); - else if (vars != null) + if (cfgd != null) {// only for project, not for prefs + ICdtVariable[] vs = fUserSupplier.getMacros(CONTEXT, src.getConfiguration()); + fUserSupplier.setMacros(vs, CONTEXT, dst.getConfiguration()); + } else if (vars != null) fUserSupplier.storeWorkspaceVariables(true); }