Skip to content

Commit 0241a86

Browse files
committed
fix Apply button in Toolchains tab
issue #90 When pressing Apply button the changes are saved in the project description. Signed-off-by: Iulia Vasii <[email protected]>
1 parent 1852a02 commit 0241a86

File tree

1 file changed

+18
-12
lines changed
  • ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui

1 file changed

+18
-12
lines changed

ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313

1414
package ilg.gnuarmeclipse.managedbuild.cross.ui;
1515

16-
import ilg.gnuarmeclipse.core.EclipseUtils;
17-
import ilg.gnuarmeclipse.managedbuild.cross.Activator;
18-
import ilg.gnuarmeclipse.managedbuild.cross.IDs;
19-
import ilg.gnuarmeclipse.managedbuild.cross.Option;
20-
import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition;
21-
import ilg.gnuarmeclipse.managedbuild.cross.Utils;
22-
import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage;
23-
import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage;
24-
import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage;
25-
2616
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
2717
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
2818
import org.eclipse.cdt.managedbuilder.core.BuildException;
@@ -59,6 +49,16 @@
5949
import org.eclipse.swt.widgets.Text;
6050
import org.eclipse.ui.dialogs.PreferencesUtil;
6151

52+
import ilg.gnuarmeclipse.core.EclipseUtils;
53+
import ilg.gnuarmeclipse.managedbuild.cross.Activator;
54+
import ilg.gnuarmeclipse.managedbuild.cross.IDs;
55+
import ilg.gnuarmeclipse.managedbuild.cross.Option;
56+
import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition;
57+
import ilg.gnuarmeclipse.managedbuild.cross.Utils;
58+
import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage;
59+
import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage;
60+
import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage;
61+
6262
/**
6363
* @noextend This class is not intended to be subclassed by clients.
6464
* @noinstantiate This class is not intended to be instantiated by clients.
@@ -538,9 +538,15 @@ protected void performApply(ICResourceDescription src,
538538
if (Activator.getInstance().isDebugging()) {
539539
System.out.println("TabToolchains.performApply() " + src.getName());
540540
}
541-
IConfiguration config = getCfg(src.getConfiguration());
542541

543-
updateOptions(config);
542+
// need to apply changes in both configurations
543+
// dst is the new description, will be used when saving changes on disk (set project description)
544+
// src is the old description used in current page
545+
IConfiguration config1 = getCfg(src.getConfiguration());
546+
IConfiguration config2 = getCfg(dst.getConfiguration());
547+
updateOptions(config1);
548+
updateOptions(config2);
549+
544550
// does not work like this
545551
// SpecsProvider.clear();
546552

0 commit comments

Comments
 (0)