From 527a0fb83ee698e5d74d467d636302f4ce0765b5 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 28 Feb 2007 17:59:02 +0000
Subject: [PATCH] Bug #161547

---
 .../ui/viewsupport/ProblemsLabelDecorator.java        | 11 ++++++-----
 .../org/eclipse/cdt/ui/actions/BuildConfigAction.java |  2 ++
 .../org/eclipse/cdt/ui/newui/ManageConfigDialog.java  |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
index 950d1668221..499f1d0236e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
@@ -385,11 +385,12 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
 			ICConfigurationDescription [] cf = prjd.getConfigurations();
 			if (cf == null) return 0;
 			for (int i=0; i<cf.length; i++) {
-				ICResourceDescription out = cf[i].getResourceDescription(path, true);
-				if (out != null) result |= TICK_CONFIGURATION;
-			// exclude ticks behaviour is an item to discuss.	
-			//	out = cf[i].getResourceDescription(path, false);
-			//	if (out.isExcluded()) result |= TICK_EXCLUDE;
+				if (cf[i].isActive()) {
+					ICResourceDescription out = cf[i].getResourceDescription(path, true);
+					if (out != null) result |= TICK_CONFIGURATION;
+					out = cf[i].getResourceDescription(path, false);
+					if (out.isExcluded()) result |= TICK_EXCLUDE;
+				}
 			}
 		}
 		return result;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java
index a28ade6afb8..47e6cc051ba 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 /**
  * Action which changes active build configuration of the current project to 
@@ -57,6 +58,7 @@ public class BuildConfigAction extends Action {
 						configs[i].setActive();
 						try {
 							CoreModel.getDefault().setProjectDescription(prj, prjd);
+							AbstractPage.updateViews();
 						} catch (CoreException e) { }	
 						break;
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java
index dc09ad88dc9..0fc7edc51a5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java
@@ -76,6 +76,7 @@ public class ManageConfigDialog extends Dialog {
 			if (d.open() == OK) {
 				try {
 					CoreModel.getDefault().setProjectDescription(prj, prjd);
+					AbstractPage.updateViews();
 				} catch (CoreException e) { return false; }
 				return true;
 			}