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

Bug 545373 - User Defined Toolchains are not getting saved

Browse source 
Change-Id: I41fa5c60d25936465e19ce4e4f2d820b14102b85
Signed-off-by: Kondal Kolipaka <kondal.kolipaka@gmail.com>
This commit is contained in:
Kondal Kolipaka 2019-12-04 14:57:01 +05:30 • committed by Jonah Graham
parent 2042418982
commit 4b7b3c5e79
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
Bundle-Version: 6.6.100.qualifier Bundle-Version: 6.6.200.qualifier
Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

21
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.ui.build; package org.eclipse.cdt.ui.build;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.build.IToolChain; import org.eclipse.cdt.core.build.IToolChain;
@ -314,8 +315,24 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
} }
try { try {
if (!toolChains.equals(manager.getAllToolChains())) { Collection<IToolChain> latestToolchains = manager.getAllToolChains();
manager.setToolChainOrder(toolChains); if (!toolChains.equals(latestToolchains)) {
List<IToolChain> newOrderedList = new ArrayList<>();
for (IToolChain toolChain : toolChains) {
if (latestToolchains.contains(toolChain)) { //Still there? - for example: existing user defined tool chain would have been removed
newOrderedList.add(toolChain);
}
}
//add the remaining list at the end - for example: newly added user defined tool chains
for (IToolChain toolChain : latestToolchains) {
if (!newOrderedList.contains(toolChain)) {
newOrderedList.add(toolChain);
}
}
manager.setToolChainOrder(newOrderedList);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.log(e.getStatus()); CUIPlugin.log(e.getStatus());