From 12978a0406692c0dcaf1285901eb1d460e8cff30 Mon Sep 17 00:00:00 2001
From: James Blackburn
Date: Tue, 1 Jun 2010 14:00:33 +0000
Subject: Bug 315187 Unknown tool option silently breaks ManagedBuild tool
 command line generation

---
 .../ui/properties/ToolSettingsPrefStore.java       | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'build')

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java
index c4541df01f1..d9e17f1d7de 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java
@@ -151,20 +151,18 @@ public class ToolSettingsPrefStore implements IPreferenceStore {
 			else if((optCategory.getId() + COMMAND_LINE_SUFFIX).equals(name))
 				return ((Tool)optCategory).getCommandLinePattern();
 			else if(ALL_OPTIONS_ID.equals(name)){
-				try {
-					SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " ");  //$NON-NLS-1$
-					Tool tool = (Tool)optCategory;
-					String[] flags = tool.getToolCommandFlags(
-							null,
-							null,
-							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) {}
+				SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " ");  //$NON-NLS-1$
+				Tool tool = (Tool)optCategory;
+				String[] flags = tool.getToolCommandFlags(
+						null,
+						null,
+						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();
 			}
 		} else {
 			Object val = getOptionValue(name);
-- 
cgit v1.2.3