From dc3905bfb1d51b615364fb0fd6831377d8956604 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Mon, 26 Feb 2007 12:22:22 +0000
Subject: [PATCH] Bug #112787 ManagedCommandLineGenerator not called to show
 Tool Settings. Applied patch.

---
 .../ui/newui/ToolSettingsPrefStore.java          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
index ddc070387d3..5b6efbf699c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
@@ -17,6 +17,8 @@ import org.eclipse.cdt.core.settings.model.ICSettingBase;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator;
+import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineInfo;
 import org.eclipse.cdt.managedbuilder.core.IOption;
 import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
 import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
@@ -27,9 +29,9 @@ import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacroProvider;
 import org.eclipse.cdt.managedbuilder.internal.macros.BuildfileMacroSubstitutor;
 import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 public class ToolSettingsPrefStore implements IPreferenceStore {
@@ -146,11 +148,17 @@ public class ToolSettingsPrefStore implements IPreferenceStore {
 			else if(ALL_OPTIONS_ID.equals(name)){
 				try {
 					SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " ");  //$NON-NLS-1$
-					return listToString(((Tool)optCategory).getToolCommandFlags(
+					Tool tool = (Tool)optCategory;
+					String[] flags = tool.getToolCommandFlags(
 							null,
 							null,
-							macroSubstitutor,
-							obtainMacroProvider()));
+							macroSubstitutor, 
+							obtainMacroProvider());
+					IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator();
+					IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool,
+							EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING,
+							null,tool.getCommandLinePattern());
+					return cmdLInfo.getFlags();
 				} catch (BuildException e) {}
 			}
 		} else {