1) Reintroduced some out commented methods. (Did break some preference settings)

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

diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
index b7cfe1f..12e7d2e 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
@@ -33,7 +33,7 @@ public class InterpreterRunnerConfiguration {
 
                //return project.getLocation().toOSString() + "/" + getFileName();
                IResource file = project.findMember(path);
-               return file.getLocation().toOSString();
+               return file.getProjectRelativePath().toOSString();
        }
 
        public String getFileName() {
@@ -194,7 +194,7 @@ public class InterpreterRunnerConfiguration {
 
                IProject project = getProject().getProject();
                if (!useRemoteDebugger())
-                       return project.getLocation().toOSString();
+                       return project.getFullPath().toOSString();
                else {
                        try {
                                return configuration.getAttribute(
@@ -219,4 +219,15 @@ public class InterpreterRunnerConfiguration {
                return false;
        }
 
+       public boolean useRelaunchOnScriptTermination() {
+               try {
+                       return configuration
+                                       .getAttribute(
+                                                       PHPLaunchConfigurationAttribute.RELAUNCH_ON_SCRIPT_TERMINATION,
+                                                       false);
+               } catch (CoreException e) {
+                       PHPLaunchingPlugin.log(e);
+               }
+               return false;
+       }
 }