[Esbox-commits] r844 - in trunk/common/org.maemo.esbox.analysis.launch: META-INF src/org/maemo/esbox/analysis/launch

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2008-10-08 22:16:00 +0300 (Wed, 08 Oct 2008)
New Revision: 844

Modified:
   trunk/common/org.maemo.esbox.analysis.launch/META-INF/MANIFEST.MF
   trunk/common/org.maemo.esbox.analysis.launch/src/org/maemo/esbox/analysis/launch/OProfileRemoteLaunchProxy.java
Log:
Remove SSH dependency (a reference to the pref page -- this is obsolete since the preceding code should handle it).

Modified: trunk/common/org.maemo.esbox.analysis.launch/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/org.maemo.esbox.analysis.launch/META-INF/MANIFEST.MF	2008-10-08 18:30:57 UTC (rev 843)
+++ trunk/common/org.maemo.esbox.analysis.launch/META-INF/MANIFEST.MF	2008-10-08 19:16:00 UTC (rev 844)
@@ -11,8 +11,7 @@
  org.eclipse.debug.ui;bundle-version="3.4.0",
  org.maemo.esbox.launch;bundle-version="1.5.0",
  org.maemo.esbox.analysis;bundle-version="1.5.0",
- org.maemo.esbox.analysis.ui;bundle-version="1.5.0",
- org.maemo.esbox.ssh;bundle-version="1.5.0"
+ org.maemo.esbox.analysis.ui;bundle-version="1.5.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.maemo.esbox.internal.analysis.launch.Activator

Modified: trunk/common/org.maemo.esbox.analysis.launch/src/org/maemo/esbox/analysis/launch/OProfileRemoteLaunchProxy.java
===================================================================
--- trunk/common/org.maemo.esbox.analysis.launch/src/org/maemo/esbox/analysis/launch/OProfileRemoteLaunchProxy.java	2008-10-08 18:30:57 UTC (rev 843)
+++ trunk/common/org.maemo.esbox.analysis.launch/src/org/maemo/esbox/analysis/launch/OProfileRemoteLaunchProxy.java	2008-10-08 19:16:00 UTC (rev 844)
@@ -30,7 +30,6 @@
 import org.maemo.esbox.launch.ESboxLaunchUtils;
 import org.maemo.esbox.launch.ILaunchProtocol;
 import org.maemo.esbox.launch.core.*;
-import org.maemo.esbox.ssh.ui.SSHPreferenceUtils;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -465,7 +464,11 @@
 			}});
 	}
 
-	private void warnOprofileRequiresSuperuser() {
+	private void warnOprofileRequiresSuperuser() throws CoreException {
+		// We used ILaunchProtocol#requireRunAsRoot(), so if it failed, internal error
+		
+		abort("Internal error: did not successfully launch process as root (try manually fixing SSH preferences?)", null, 0);
+		/*
 		Display.getDefault().syncExec(new Runnable() {
 
 			public void run() {
@@ -480,6 +483,7 @@
 					SSHPreferenceUtils.showGlobalSSHPanel(null);
 				}
 			}});
+		*/
 		
 	}