X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java index 4898a06..b5a63e3 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java @@ -27,7 +27,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePresentation { - private String absoluteWorkingDirectory; + //private String absoluteWorkingDirectory; private Map pathMap = null; private boolean remoteDebug; private IPath remoteSourcePath; @@ -37,9 +37,9 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese } - public String getAbsoluteWorkingDirectory() { - return absoluteWorkingDirectory; - } +// public String getAbsoluteWorkingDirectory() { +// return absoluteWorkingDirectory; +// } /** * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() @@ -58,7 +58,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(ILaunchConfiguration) */ public void initializeDefaults (ILaunchConfiguration configuration) throws CoreException { - this.absoluteWorkingDirectory = configuration.getAttribute (PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, ""); + //this.absoluteWorkingDirectory = configuration.getAttribute (PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, ""); this.remoteDebug = configuration.getAttribute (PHPLaunchConfigurationAttribute.REMOTE_DEBUG,false); this.pathMap = configuration.getAttribute (PHPLaunchConfigurationAttribute.FILE_MAP, (Map)null); this.projectName = configuration.getAttribute (PHPLaunchConfigurationAttribute.PROJECT_NAME, ""); @@ -84,11 +84,11 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese IPath localPath; Iterator iterator; String fileName; - String file; + //String file; String local; fileName = ((PHPStackFrame) stackFrame).getFileName (); // Get the filename as it is submitted by DBG - file = ""; + //file = ""; if (remoteDebug) { // Is it a remote debugging session path = new Path (fileName); // Create a IPath object for the server side filename @@ -96,8 +96,8 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese if (!remoteSourcePath.isEmpty()) { if (remoteSourcePath.isPrefixOf (path)) { // Is the server side filename with the remote source path path = path.removeFirstSegments (remoteSourcePath.matchingFirstSegments (path)); // Remove the remote source path - file = path.toString (); // The filename without the remote source path - projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getFullPath()); // Get the absolute project path + //file = path.toString (); // The filename without the remote source path + projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation()); // Get the absolute project path return (projectPath.append (path)).toOSString (); // Return the filename as absolute client side path } @@ -118,7 +118,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese localPath = new Path (local); // Create new IPath object for the local/client side path path = localPath.append (path); // Prepend the project relative path to filename - projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getFullPath()); // Get the absolute project path + projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation()); // Get the absolute project path return (projectPath.append (path)).toOSString (); // Return the filename as absolute client side path }