[Esbox-commits] r1837 - in trunk: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-07-01 22:18:02 +0300 (Wed, 01 Jul 2009)
New Revision: 1837

Modified:
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
   trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTableViewer.java
   trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
Log:
Merge revs 1828:1836 from work_Ed branch

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-07-01 18:15:06 UTC (rev 1836)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-07-01 19:18:02 UTC (rev 1837)
@@ -207,17 +207,7 @@
 
 			// And watch for errors and termination
 			IStreamMonitor errorMonitor = new StreamLineMonitorAdapter() {
-				private Process theProcess;
-				
 				/* (non-Javadoc)
-				 * @see org.maemo.mica.common.core.process.StreamMonitorAdapter#processCreated(java.lang.Process)
-				 */
-				@Override
-				public void processCreated(Process process) {
-					super.processCreated(process);
-					theProcess = process;
-				}
-				/* (non-Javadoc)
 				 * @see org.maemo.mica.common.core.process.IStreamLineMonitor#handleLine(java.lang.String, boolean)
 				 */
 				public void handleLine(String text, boolean errorStream)
@@ -239,7 +229,7 @@
 									Thread.sleep(30000);
 								} catch (InterruptedException e) {
 								}
-								theProcess.destroy();
+								procMonitor.terminate();
 								return Status.OK_STATUS;
 							}
 							

Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTableViewer.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTableViewer.java	2009-07-01 18:15:06 UTC (rev 1836)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTableViewer.java	2009-07-01 19:18:02 UTC (rev 1837)
@@ -37,6 +37,7 @@
 import org.maemo.mica.common.core.filesystem.EShareType;
 import org.maemo.mica.common.core.filesystem.ISharedFolder;
 import org.maemo.mica.common.ui.TextAndDialogCellEditor;
+import org.maemo.mica.common.ui.dialogs.DirectoryDialogHelper;
 import org.maemo.mica.internal.api.common.ui.ViewerTooltipSupport;
 
 /**
@@ -100,7 +101,8 @@
 		protected Object openDialogBox(Control cellEditorWindow) {
 			DirectoryDialog dialog = new DirectoryDialog(cellEditorWindow.getShell());
 			Object current = getValue();
-			dialog.setFilterPath(current instanceof String 
+			DirectoryDialogHelper.setFilterPathToExistingDirectory(dialog, 
+					current instanceof String 
 					? new Path((String)current).toOSString() : Path.ROOT.toOSString());
 			return dialog.open();
 		}

Modified: trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java	2009-07-01 18:15:06 UTC (rev 1836)
+++ trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java	2009-07-01 19:18:02 UTC (rev 1837)
@@ -84,7 +84,7 @@
 			assertTrue(root.toPortableString().equals("/"));
 			
 			((Scratchbox2SDK)sdk).realize();
-			assertTrue(sdk.getVersion(), sdk.getVersion().matches("1\\.99\\..*|2\\.0\\.*"));
+			assertTrue(sdk.getVersion(), sdk.getVersion().matches("1\\.99\\..*|2\\.0.*"));
 		}
 	}