From d4b3472cc949d8451fa38ebf2683a21f90ab1c7a Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Tue, 13 Feb 2018 15:24:07 -0500
Subject: [PATCH] Bug 531121 - Fix up/down buttons in toolchains preference

The content provider was overriding the change all the time.

Change-Id: I6d406dd6dc903cd890bfc7f7788d76e4388ff905
---
 .../cdt/ui/build/ToolChainPreferencePage.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
index 798c1f8fdc7..993329a0366 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
@@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.tools.templates.ui.internal.Activator;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
@@ -85,6 +86,11 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
 
 	@Override
 	public void init(IWorkbench workbench) {
+		try {
+			toolChains = new ArrayList<>(manager.getAllToolChains());
+		} catch (CoreException e) {
+			Activator.log(e);
+		}
 	}
 
 	private static class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
@@ -130,12 +136,6 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
 		availTable.setContentProvider(new IStructuredContentProvider() {
 			@Override
 			public Object[] getElements(Object inputElement) {
-				toolChains = new ArrayList<IToolChain>();
-				try {
-					toolChains.addAll(manager.getAllToolChains());
-				} catch (CoreException e) {
-					CUIPlugin.log(e.getStatus());
-				}
 				return toolChains.toArray();
 			}
 		});