1) Fixed issue #714: PHP Parser bug with $this->oR.

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

diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java
index ffb100b..13c01d4 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java
@@ -26,12 +26,14 @@ public class DebuggerRunner extends InterpreterRunner {
 
        public IProcess run(InterpreterRunnerConfiguration configuration,
                        ILaunch launch) {
-               String[] env;
-               String name, value;
-               PHPDBGProxy newPHPDBGProxy = new PHPDBGProxy(configuration
-                               .useRemoteDebugger(), configuration.getRemoteSourcePath(),
-                               configuration.usePathTranslation(), configuration.getPathMap());
-               int pos;
+               //String[] env;
+               //String name, value;
+               PHPDBGProxy newPHPDBGProxy = new PHPDBGProxy (configuration.useRemoteDebugger(),
+                                                                     configuration.getRemoteSourcePath(),
+                                                                     configuration.usePathTranslation(),
+                                                                     configuration.getPathMap(),
+                                                                     configuration.useRelaunchOnScriptTermination());
+               //int pos;
 
                IProcess process = null;
                PHPDebugTarget debugTarget = new PHPDebugTarget(launch, process);
@@ -68,8 +70,13 @@ public class DebuggerRunner extends InterpreterRunner {
                                JavaProject jproject = configuration.getProject();
                                IProject project = jproject.getProject();
                                IFile file = project.getFile(fileName);
-                               BrowserUtil.showPreview(file, true, "?DBGSESSID=1@clienthost:"
-                                               + port);
+                               if (configuration.useDBGSessionInExternalBrowser()) {
+                                       BrowserUtil.showBrowserAsExternal(file,
+                                                       "?DBGSESSID=1@clienthost:" + port);
+                               } else {
+                                       BrowserUtil.showPreview(file, true,
+                                                       "?DBGSESSID=1@clienthost:" + port);
+                               }
                        }
                });
        }
@@ -77,7 +84,7 @@ public class DebuggerRunner extends InterpreterRunner {
        protected void setEnvironmentVariables(
                        InterpreterRunnerConfiguration configuration, int listenPort) {
                String DBGSessID;
-               String env[] = new String[18];
+               //String env[] = new String[18];
                long id = Math.round(Math.random() * 100000);
 
                DBGSessID = "DBGSESSID=" + id + "@clienthost:" + listenPort;