Commit for Vlad (PR 63471 and PR 68019)

3 files changed, 42 insertions, 1 deletions

diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
index 1f9ae0f1a3f..fe3e7308707 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
@@ -248,6 +248,8 @@ ScannerConfigOptionsDialog.siProvider.cmd.use_default=Use default
 ScannerConfigOptionsDialog.siProvider.cmd.label=Generate scanner info command:
 ScannerConfigOptionsDialog.siProvider.parser.label=Command output parser:
 ScannerConfigOptionsDialog.siProvider.cmd.error_message=Must enter a 'generate scanner info' command
+ScannerConfigOptionsDialog.siProblem.group.label=Discovery problem reporting
+ScannerConfigOptionsDialog.siProblem.generation.enable.label=Report path detection problems
 
 # --- DiscoveredScannerConfigurationContainerPage ---
 DiscoveredScannerConfigurationContainerPage.title=Edit container
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java
index 3f8ee70e877..e4d20fc8fdb 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java
@@ -85,6 +85,8 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 	private static final String SI_PROVIDER_CMD_LABEL = PREFIX + ".siProvider.cmd.label"; //$NON-NLS-1$
 	private static final String SI_PROVIDER_PARSER_LABEL = PREFIX + ".siProvider.parser.label"; //$NON-NLS-1$
 	private static final String SI_PROVIDER_CMD_ERROR_MESSAGE = PREFIX + ".siProvider.cmd.error_message"; //$NON-NLS-1$
+	private static final String SI_PROBLEM_GROUP = PREFIX + ".siProblem.group.label"; //$NON-NLS-1$
+	private static final String ENABLE_SI_PROBLEM_GENERATION = PREFIX + ".siProblem.generation.enable.label"; //$NON-NLS-1$
 
 	private Button scEnabledButton;
 	private boolean needsSCNature = false;
@@ -95,6 +97,7 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 	private Combo makeBuilderSIParserComboBox;
 	private Button enableProviderCommandButton;
 	private Combo esiProviderParserComboBox;
+	private Button enableProblemGenerationButton;
 
 	private Preferences fPrefs;
 	private IScannerConfigBuilderInfo fBuildInfo;
@@ -186,6 +189,7 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 						}
 						buildInfo.setESIProviderConsoleParserId((String)providerParsers.get(esiProviderParserComboBox.getText()));
 					}
+					buildInfo.setSIProblemGenerationEnabled(isProblemGenerationEnabled());
 				}
 			}
 		};
@@ -276,6 +280,7 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 		if (createScannerConfigControls(composite, tabColumns)) {
 			createBuildOutputParserControls(composite);
 			createAfterBuildCmdControls(composite);
+			createProblemGenerationControls(composite);
 			// enable controls depending on the state of auto discovery
 			enableAllControls();
 		}
@@ -454,7 +459,28 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 	}
 
 	/**
-	 *  
+	 * @param composite
+	 */
+	private void createProblemGenerationControls(Composite parent) {
+		Group problemGroup = ControlFactory.createGroup(parent, MakeUIPlugin.getResourceString(SI_PROBLEM_GROUP), 2);
+		((GridData)problemGroup.getLayoutData()).horizontalSpan = 2;
+
+		enableProblemGenerationButton = ControlFactory.createCheckBox(problemGroup,
+				MakeUIPlugin.getResourceString(ENABLE_SI_PROBLEM_GENERATION));
+		((GridData)enableProblemGenerationButton.getLayoutData()).horizontalSpan = 2;
+		((GridData)enableProblemGenerationButton.getLayoutData()).horizontalAlignment = GridData.FILL_HORIZONTAL;
+		boolean enabledProblemGeneration = fBuildInfo.isSIProblemGenerationEnabled();
+		enableProblemGenerationButton.setSelection(enabledProblemGeneration);
+		enableProblemGenerationButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				getContainer().updateContainer();
+			}
+		});
+		
+	}
+
+	/**
+	 * @param buildInfo
 	 */
 	private void setESIProviderCommandFrom(IScannerConfigBuilderInfo buildInfo) {
 		IPath sCommand = buildInfo.getESIProviderCommand();
@@ -498,6 +524,10 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
 		return enableProviderCommandButton.getSelection();
 	}
 
+	private boolean isProblemGenerationEnabled() {
+		return enableProblemGenerationButton.getSelection();
+	}
+
 	/**
 	 * Retrieves the state of scanner config discovery
 	 * 
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/ScannerConfigOptionsDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/ScannerConfigOptionsDialog.java
index e780c92679d..70c6060a410 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/ScannerConfigOptionsDialog.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/ScannerConfigOptionsDialog.java
@@ -98,6 +98,7 @@ public class ScannerConfigOptionsDialog extends Dialog {
 		private IPath fESIProviderCommand;
 		private String fESIProviderArguments;
 		private String fESIProviderConsoleParserId;
+		private boolean fSIParserGenerationEnabled;
 
 		public LocalStore(IScannerConfigBuilderInfo info) {
 			try {
@@ -109,6 +110,7 @@ public class ScannerConfigOptionsDialog extends Dialog {
 				setESIProviderCommand(info.getESIProviderCommand());
 				setESIProviderArguments(info.getESIProviderArguments());
 				setESIProviderConsoleParserId(info.getESIProviderConsoleParserId());
+				setSIProblemGenerationEnabled(info.isSIProblemGenerationEnabled());
 			} catch (CoreException e) {
 			}
 		}
@@ -169,6 +171,13 @@ public class ScannerConfigOptionsDialog extends Dialog {
 		public void setESIProviderConsoleParserId(String parserId) throws CoreException {
 			fESIProviderConsoleParserId = new String(parserId);
 		}
+
+		public boolean isSIProblemGenerationEnabled() {
+			return fSIParserGenerationEnabled;
+		}
+		public void setSIProblemGenerationEnabled(boolean enabled) throws CoreException {
+			fSIParserGenerationEnabled = enabled;
+		}
 	}
 
 	/**