[Esbox-commits] r2051 - in trunk: org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-28 22:20:09 +0300 (Fri, 28 Aug 2009)
New Revision: 2051

Modified:
   trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
   trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java
   trunk/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxSettingsPreferencePage.java
   trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/CommonVirtualMachineSettingsPreferencePage.java
Log:
Merge revs 2040:2050 from work_Ed branch

Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-08-28 19:18:13 UTC (rev 2050)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-08-28 19:20:09 UTC (rev 2051)
@@ -265,16 +265,28 @@
 	protected void changeSelectedMachine(String name) {
 		IBuildMachine machine = machineMap.get(name);
 		if (machine != null) {
-			IComposablePreferencePage page = machineConfigPages.get(machine.getName());
+			final IComposablePreferencePage page = machineConfigPages.get(machine.getName());
 			if (page.getControl() == null) {
 				page.setContainer(getContainer());
 				page.createControl(machineConfigComposite);
 			}
 			machineConfigStackLayout.topControl = page.getControl();
 			selectedMachine = machine;
+			
+			// wait a step since field editors on other pages 
+			// will clear the message when they lose focus
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					page.revalidate();	
+					updateApplyButton();
+				}
+			});
 		} else {
 			machineConfigStackLayout.topControl = noMachineConfigUI;
 			selectedMachine = null;
+			setErrorMessage(null);
+			setMessage(null, INFORMATION);
+			setValid(true);
 		}
 		machineConfigComposite.layout();
 		getShell().layout(true, true);

Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java	2009-08-28 19:18:13 UTC (rev 2050)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java	2009-08-28 19:20:09 UTC (rev 2051)
@@ -214,6 +214,13 @@
 		treeViewer.expandAll();
 	}
 
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.core.machine.IComposablePreferencePage#revalidate()
+	 */
+	public void revalidate() {
+		validate();
+	}
+	
 	protected void validate() {
 		setErrorMessage(null);
 		setMessage(null, INFORMATION);

Modified: trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/CommonVirtualMachineSettingsPreferencePage.java
===================================================================
--- trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/CommonVirtualMachineSettingsPreferencePage.java	2009-08-28 19:18:13 UTC (rev 2050)
+++ trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/CommonVirtualMachineSettingsPreferencePage.java	2009-08-28 19:20:09 UTC (rev 2051)
@@ -317,7 +317,15 @@
 		config.setUserPassword(feUserPassword.getStringValue());
 		config.setTargetAddr(feSshTargetAddr.getPreferenceValue());
 		config.setHostAddr(feSshHostAddr.getPreferenceValue());
-		config.setTargetPort(feSshTargetPort.getIntValue());
-		config.setHostPort(feSshHostPort.getIntValue());
+		try {
+			config.setTargetPort(feSshTargetPort.getIntValue());
+		} catch (NumberFormatException e) {
+			config.setTargetPort(22);
+		}
+		try {
+			config.setHostPort(feSshHostPort.getIntValue());
+		} catch (NumberFormatException e) {
+			config.setHostPort(22);
+		}
 	}
 }

Modified: trunk/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxSettingsPreferencePage.java
===================================================================
--- trunk/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxSettingsPreferencePage.java	2009-08-28 19:18:13 UTC (rev 2050)
+++ trunk/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxSettingsPreferencePage.java	2009-08-28 19:20:09 UTC (rev 2051)
@@ -168,6 +168,7 @@
 			@Override
 			public void focusLost(FocusEvent e) {
 				refreshMachineNameViewer();
+				validate();
 			}
 		});