[Esbox-commits] r1575 - branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard

[fabricioepa at garage.maemo.org]

Author: fabricioepa
Date: 2009-05-11 19:24:37 +0300 (Mon, 11 May 2009)
New Revision: 1575

Modified:
   branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java
   branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
Log:
Fixing BUG #4054

Modified: branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java
===================================================================
--- branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java	2009-05-11 15:00:47 UTC (rev 1574)
+++ branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java	2009-05-11 16:24:37 UTC (rev 1575)
@@ -254,6 +254,15 @@
 	}
 
 	/**
+	 * Tell if the installation is not the default.
+	 * <p>
+	 * This is currently the case if you use a location other than /scratchbox to install.
+	 * @return flag
+	 */
+	public boolean isNonDefaultInstallation() {
+		return !getScratchboxLocation().equals("/scratchbox");
+	}
+	/**
 	 * Get the name of the X86 target, given the default basename
 	 */
 	public String getX86TargetName() {

Modified: branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
===================================================================
--- branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-11 15:00:47 UTC (rev 1574)
+++ branches/work_Fabricio/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-11 16:24:37 UTC (rev 1575)
@@ -535,9 +535,11 @@
 				}
 			}
 			
-			if (errors.length() != 0) {
-				setMessage("This Scratchbox 1 installation is not suitable, it will require to install support to: " + errors + " ", WARNING);
-				return true;
+			if (errors.length() != 0 ) {
+				boolean isError = targetInstallerData.isNonDefaultInstallation();
+				int messageType = isError?  ERROR : WARNING;
+				setMessage("This Scratchbox 1 installation is not suitable, it will require to install support to: " + errors + " ", messageType);
+				return !isError;
 			}
 			
 			// check existing targets