1 files changed, 8 insertions, 1 deletions
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/widgets/ParametersComposite.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/widgets/ParametersComposite.java
index 47fc0aa6aa9..3a6ad142616 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/widgets/ParametersComposite.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/widgets/ParametersComposite.java
@@ -24,6 +24,7 @@ import org.eclipse.cdt.codan.core.param.IProblemPreference;
 import org.eclipse.cdt.codan.core.param.IProblemPreferenceCompositeDescriptor;
 import org.eclipse.cdt.codan.core.param.LaunchModeProblemPreference;
 import org.eclipse.cdt.codan.core.param.ListProblemPreference;
+import org.eclipse.cdt.codan.core.param.SuppressionCommentProblemPreference;
 import org.eclipse.cdt.codan.internal.ui.CodanUIMessages;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.preference.BooleanFieldEditor;
@@ -55,17 +56,19 @@ public class ParametersComposite extends Composite {
 	private FieldEditorPreferencePage page;
 	private IProblem problem;
 	private PreferenceStore prefStore;
+	private boolean combined;
 
 	/**
 	 * @param parent
 	 * @param problem
 	 * @param style
 	 */
-	public ParametersComposite(Composite parent, final IProblem problem) {
+	public ParametersComposite(Composite parent, final IProblem problem, final boolean combined) {
 		super(parent, SWT.NONE);
 		if (problem == null)
 			throw new NullPointerException();
 		this.setLayout(new GridLayout(2, false));
+		this.combined = combined;
 		this.problem = problem;
 		this.prefStore = new PreferenceStore();
 		page = new FieldEditorPreferencePage(FieldEditorPreferencePage.GRID) {
@@ -125,6 +128,8 @@ public class ParametersComposite extends Composite {
 					return; // skip the scope
 				if (info.getKey() == LaunchModeProblemPreference.KEY)
 					return; // skip the launch
+				if (info.getKey() == SuppressionCommentProblemPreference.KEY && combined)
+					return; // skip the suppression comment in multi selection
 				switch (info.getType()) {
 				case TYPE_STRING: {
 					StringFieldEditor fe = new StringFieldEditor(info.getQualifiedKey(), info.getLabel(),
@@ -246,6 +251,8 @@ public class ParametersComposite extends Composite {
 		if (desc == null)
 			return;
 		String key = desc.getQualifiedKey();
+		if (!prefStore.contains(key) && combined)
+			return;
 		switch (desc.getType()) {
 		case TYPE_STRING:
 			desc.setValue(prefStore.getString(key));