From f497803515d09922a250ec0422646bf8ed7769a7 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Mon, 28 Jan 2008 17:39:05 +0000
Subject: [PATCH] Bug #182450 - Multi-cfg

---
 .../ui/properties/BuildBehaviourTab.java      | 29 ++++++++-----------
 .../ui/properties/BuilderSettingsTab.java     |  4 +--
 .../cdt/ui/newui/AbstractCPropertyTab.java    |  8 ++++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
index dee3bf39d4d..3b4b09da2bd 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2008  Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -188,35 +188,30 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
 	 *    3: cfg.getInternalBuilderParallel()
 	 */
 	 static int[] calc3states(ICPropertyProvider p, 
-			 Button b3, 
 			 IConfiguration c,
 			 boolean p0) {
 		if (p.isMultiCfg() &&
 			c instanceof ICMultiItemsHolder) 
 		{ 
 			IConfiguration[] cfs = (IConfiguration[])((ICMultiItemsHolder)c).getItems();
-			IBuilder b = cfs[0].getEditableBuilder();
+			IBuilder b = cfs[0].getBuilder();
 			int[]   res = new int[TRI_STATES_SIZE];
 			boolean[] x = new boolean[TRI_STATES_SIZE];
-			x[0] = (p0) ? b.isManagedBuildOn() : b.isStopOnError();
-			x[1] = (p0) ? b.isDefaultBuildCmd(): b.supportsStopOnError(true);
-			x[2] = (p0) ? b.canKeepEnvironmentVariablesInBuildfile() : 
+			x[0] = p0 ? b.isManagedBuildOn() : b.isStopOnError();
+			x[1] = p0 ? b.isDefaultBuildCmd(): b.supportsStopOnError(true);
+			x[2] = p0 ? b.canKeepEnvironmentVariablesInBuildfile() : 
 								 b.supportsStopOnError(false);
-			x[3] = (p0) ? b.keepEnvironmentVariablesInBuildfile() : 
+			x[3] = p0 ? b.keepEnvironmentVariablesInBuildfile() : 
 				                 ((Configuration)cfs[0]).getInternalBuilderParallel();
 			for (int i=1; i<cfs.length; i++) {
-				b = cfs[i].getEditableBuilder();
-				if (res[0] != TRI_UNKNOWN && 
-						x[0] != (p0) ? b.isManagedBuildOn() : b.isStopOnError())
+				b = cfs[i].getBuilder();
+				if (x[0] != (p0 ? b.isManagedBuildOn() : b.isStopOnError()))
 					res[0] = TRI_UNKNOWN;
-				if (res[1] != TRI_UNKNOWN && 
-						x[1] != (p0) ? b.isDefaultBuildCmd() : b.supportsStopOnError(true))
+				if (x[1] != (p0 ? b.isDefaultBuildCmd() : b.supportsStopOnError(true)))
 					res[1] = TRI_UNKNOWN;
-				if (res[2] != TRI_UNKNOWN && 
-						x[2] != (p0) ? b.canKeepEnvironmentVariablesInBuildfile() : b.supportsStopOnError(false))
+				if (x[2] != (p0 ? b.canKeepEnvironmentVariablesInBuildfile() : b.supportsStopOnError(false)))
 					res[2] = TRI_UNKNOWN;
-				if (res[3] != TRI_UNKNOWN && 
-						x[3] != (p0) ? b.keepEnvironmentVariablesInBuildfile() : ((Configuration)cfs[i]).getInternalBuilderParallel())
+				if (x[3] != (p0 ? b.keepEnvironmentVariablesInBuildfile() : ((Configuration)cfs[i]).getInternalBuilderParallel()))
 					res[3] = TRI_UNKNOWN;
 			}
 			for (int i=0; i<TRI_STATES_SIZE; i++) {
@@ -234,7 +229,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
 	protected void updateButtons() {
 		bldr = icfg.getEditableBuilder();
 		
-		int[] extStates = calc3states(page, b_stopOnError, icfg, false);
+		int[] extStates = calc3states(page, icfg, false);
 		
 		if (extStates != null) {
 			setTriSelection(b_stopOnError, extStates[0]);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
index 5815112fb98..3e31862d6f7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2008 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -126,7 +126,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
 	protected void updateButtons() {
 		bldr = icfg.getEditableBuilder();
 		
-		int[] extStates = BuildBehaviourTab.calc3states(page, b_useDefault, icfg, true);
+		int[] extStates = BuildBehaviourTab.calc3states(page, icfg, true);
 
 		b_genMakefileAuto.setEnabled(icfg.supportsBuild(true));
 		if (extStates == null) { // no extended states available
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
index a34f29256c3..2258f818178 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2008 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -526,6 +526,12 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab {
 		return fFontMetrics;
 	}
 
+	/**
+	 * Sets checkbox to appropriate state: 
+	 * 	  unchecked, checked or unknown (grayed)
+	 * @param b - checkbox to set
+	 * @param state 
+	 */
 	public static void setTriSelection(Button b, int state) {
 		switch (state) {
 		case TRI_NO: