mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-03-26 13:28:36 +00:00
parent 11afa601f9
commit c6534eb2b7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
View file

@ -30,8 +30,8 @@ import org.eclipse.cdt.internal.core.cdtvariables.StorableCdtVariables;
import org.eclipse.cdt.internal.core.cdtvariables.UserDefinedVariableSupplier; import org.eclipse.cdt.internal.core.cdtvariables.UserDefinedVariableSupplier;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.CDTListComparator; 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.PrefPage_Abstract;
import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver; import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor; import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -441,7 +441,6 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
// get variables // get variables
ICdtVariable[] _vars = mgr.getVariables(cfgd); ICdtVariable[] _vars = mgr.getVariables(cfgd);
if (_vars == null) return; if (_vars == null) return;
if (cfgd == null) { if (cfgd == null) {
if (fShowSysMacros) { if (fShowSysMacros) {
List lst = new ArrayList(_vars.length); List lst = new ArrayList(_vars.length);
@ -521,9 +520,10 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
} }
public void performApply(ICResourceDescription src, ICResourceDescription dst) { public void performApply(ICResourceDescription src, ICResourceDescription dst) {
if (cfgd != null) // only for project, not for prefs if (cfgd != null) {// only for project, not for prefs
fUserSupplier.setMacros(fUserSupplier.getMacros(CONTEXT, src), CONTEXT, dst); ICdtVariable[] vs = fUserSupplier.getMacros(CONTEXT, src.getConfiguration());
else if (vars != null) fUserSupplier.setMacros(vs, CONTEXT, dst.getConfiguration());
} else if (vars != null)
fUserSupplier.storeWorkspaceVariables(true); fUserSupplier.storeWorkspaceVariables(true);
} }