[Esbox-commits] r1044 - branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2008-12-04 22:35:15 +0200 (Thu, 04 Dec 2008)
New Revision: 1044

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/BuildMachinePreferencePage.java
Log:
Fix bug 3141 -- don't validate (or restore defaults) for unselected machine page

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2008-12-04 20:26:53 UTC (rev 1043)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2008-12-04 20:35:15 UTC (rev 1044)
@@ -243,9 +243,9 @@
 	 */
 	@Override
 	protected void performDefaults() {
-		for (IComposablePreferencePage page : machineConfigPages.values()) {
-			if (page != null)
-				page.performDefaults();
+		IComposablePreferencePage page = machineConfigPages.get(selectedMachine.getName());
+		if (page != null) {
+			page.performDefaults();
 		}
 		super.performDefaults();
 	}
@@ -258,10 +258,9 @@
 		if (!super.isValid())
 			return false;
 		
-		for (IComposablePreferencePage page : machineConfigPages.values()) {
-			if (page != null && !page.isValid())
-				return false;
-		}
+		IComposablePreferencePage page = machineConfigPages.get(selectedMachine.getName());
+		if (page != null && !page.isValid())
+			return false;
 		
 		return true;
 	}