# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1259786451 21600
# Node ID bf7dbec89c47de37c749d3946ea44f05a0c0b28a
# Parent  d2a651a847a555639a088fb2470be089c6c6feae
Initial changes to ensure the UI shows SBSv1 support only when supported.
Also isolate some validations to be Win32-only.

diff -r d2a651a847a5 -r bf7dbec89c47 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Wed Dec 02 14:39:17 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Wed Dec 02 14:40:51 2009 -0600
@@ -112,4 +112,8 @@
     public boolean useSBSv2Builder() {
     	return useSBSv2Builder;
     }
+    
+    public void setUseSBSv2Builder(boolean useSBSv2Builder) {
+		this.useSBSv2Builder = useSBSv2Builder;
+	}
 }
diff -r d2a651a847a5 -r bf7dbec89c47 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/project/ui/sharedui/NewProjectPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/project/ui/sharedui/NewProjectPage.java	Wed Dec 02 14:39:17 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/project/ui/sharedui/NewProjectPage.java	Wed Dec 02 14:40:51 2009 -0600
@@ -22,6 +22,7 @@
 import com.nokia.carbide.cpp.internal.project.ui.sharedui.BuilderSelectionComposite;
 import com.nokia.carbide.internal.api.templatewizard.ui.IWizardDataPage;
 import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
 import com.nokia.cpp.internal.api.utils.core.TextUtils;
 
 import org.eclipse.core.resources.IProject;
@@ -45,7 +46,8 @@
 
     private Map<String, Object> data;
 	private Collection<IProject> projectCache;
-	private static boolean WINDOWS = File.separatorChar == '\\';
+	
+	/** composite displayed when SBSv1 and SBSv2 are both available */
 	private BuilderSelectionComposite builderComposite;
 	
 	public NewProjectPage(String title, String description) {
@@ -73,6 +75,10 @@
 		
 		if (builderComposite != null) {
 			data.put(USE_SBSV2_BUILDER, new Boolean(builderComposite.useSBSv2Builder()));
+		} else if (!SBSv2Utils.enableSBSv1Support()) {
+			data.put(USE_SBSV2_BUILDER, Boolean.TRUE);
+		} else if (!SBSv2Utils.enableSBSv2Support()) {
+			data.put(USE_SBSV2_BUILDER, Boolean.FALSE);
 		}
 		
 		return data;
@@ -113,7 +119,7 @@
 					new Object[] { getLocationPath().toString() } ));
 			return false;
 		}
-        if (WINDOWS && !validateDeviceExists()) {
+        if (HostOS.IS_WIN32 && !validateDeviceExists()) {
 			setErrorMessage(Messages.getString("NewProjectPage.InvalidDriveError")); //$NON-NLS-1$
 			return false;
         }
@@ -129,7 +135,7 @@
         }
         setErrorMessage(null);
         boolean valid = super.validatePage();
-        if (WINDOWS) {
+        if (HostOS.IS_WIN32) {
 	        if (locationGettingLong(projectName)) {
 	        	setMessage(Messages.getString("NewProjectPage.ExcessivelyLongPathError"), WARNING); //$NON-NLS-1$
 	        	return valid;
@@ -218,7 +224,8 @@
 	public void createControl(Composite parent) {
 		super.createControl(parent);
 
-		if (SBSv2Utils.enableSBSv2Support()) {
+		// if there is a choice to be made...
+		if (SBSv2Utils.enableSBSv1Support() && SBSv2Utils.enableSBSv2Support()) {
 			Control control = getControl();
 			if (control instanceof Composite) {
 				builderComposite = new BuilderSelectionComposite((Composite)control);