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

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-10-08 15:52:20 +0300 (Thu, 08 Oct 2009)
New Revision: 2281

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
Log:
Fix NPEs and garbled error messages in Build Machines page

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-10-07 21:45:34 UTC (rev 2280)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-10-08 12:52:20 UTC (rev 2281)
@@ -339,8 +339,6 @@
 			machineConfigStackLayout.topControl = noMachineConfigUI;
 			selectedMachine = null;
 			selectedMachinePage = null;
-			launchButton.setEnabled(false);
-
 			setErrorMessage(null);
 			setMessage(null, NONE);
 			setValid(true);
@@ -385,12 +383,12 @@
 			IComposablePreferencePage page = machineConfigPages.get(selectedMachine.getName());
 			if (page != null && !page.isValid())
 				return false;
+			
+			if (launchButton != null) {
+				IMachineController machineController = ((IMachineImpl) selectedMachine).getMachineController();
+				launchButton.setEnabled(machineController instanceof ILaunchableMachineController);
+			}
 		}		
-		
-		if (launchButton != null) {
-			IMachineController machineController = ((IMachineImpl) selectedMachine).getMachineController();
-			launchButton.setEnabled(machineController instanceof ILaunchableMachineController);
-		}
 
 		return true;
 	}
@@ -597,12 +595,19 @@
 	 */
 	@Override
 	public String getErrorMessage() {
+		String msg = null;
 		if (selectedMachine != null) {
 			IComposablePreferencePage pref = machineConfigPages.get(selectedMachine.getName());
 			if (pref != null)
-				return pref.getErrorMessage();
+				msg = pref.getErrorMessage();
 		}
-		return super.getErrorMessage();
+		if (msg == null)
+			msg = super.getErrorMessage();
+		
+		if (msg != null) {
+			msg = msg.replaceAll("&(?!&)", "");
+		}
+		return msg;
 	}
 	
 	/* (non-Javadoc)
@@ -610,12 +615,19 @@
 	 */
 	@Override
 	public String getMessage() {
+		String msg = null;
 		if (selectedMachine != null) {
 			IComposablePreferencePage pref = machineConfigPages.get(selectedMachine.getName());
 			if (pref != null)
-				return pref.getMessage();
+				msg = pref.getMessage();
 		}
-		return super.getMessage();
+		if (msg == null)
+			msg = super.getMessage();
+		
+		if (msg != null) {
+			msg = msg.replaceAll("&(?!&)", "");
+		}
+		return msg;
 	}
 	
 	/* (non-Javadoc)