Patch from Stefan Sigurdsson

[phpeclipse.git] / net.sourceforge.phpeclipse.launching / src / net / sourceforge / phpdt / internal / launching / PHPLaunchConfigurationDelegate.java

diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
index 58ccc37..e9db3d1 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
@@ -11,36 +11,46 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.launching;
 
-import java.io.OutputStream;
+//import java.io.OutputStream;
 
+
+import net.sourceforge.phpdt.internal.core.JavaProject;
+import net.sourceforge.phpeclipse.ui.editor.BrowserUtil;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
+//import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 
 
-public class PHPLaunchConfigurationDelegate implements ILaunchConfigurationDelegate {
+public class PHPLaunchConfigurationDelegate extends LaunchConfigurationDelegate {
        protected static final InterpreterRunner interpreterRunner = new InterpreterRunner();
        protected static final DebuggerRunner debuggerRunner = new DebuggerRunner();
 
-       public PHPLaunchConfigurationDelegate() {
+/*     public PHPLaunchConfigurationDelegate() {
                super();
        }
-
+*/
        /**
         * @see ILaunchConfigurationDelegate#launch(ILaunchConfiguration, String, ILaunch, IProgressMonitor)
         */
        public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
                if (PHPRuntime.getDefault().getSelectedInterpreter() == null)
                        throw new CoreException(new Status(IStatus.ERROR, PHPLaunchingPlugin.PLUGIN_ID, IStatus.OK, "You must define an interpreter before running PHP.", null));
-
+               
+               InterpreterRunnerConfiguration conf=new InterpreterRunnerConfiguration(configuration);
+               conf.setEnvironment(DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration));
                if (mode.equals("debug")) {
-                       debuggerRunner.run(new InterpreterRunnerConfiguration(configuration), launch);
+                       debuggerRunner.run(conf, launch);
                } else {
-                       interpreterRunner.run(new InterpreterRunnerConfiguration(configuration), launch, null);
+                       interpreterRunner.run(conf, launch);
                }               
        }
 }