X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
index c61f815..8dfbfdd 100644
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
@@ -1,5 +1,6 @@
 package net.sourceforge.phpdt.internal.debug.ui;
 
+import java.util.Iterator;
 import java.util.Map;
 
 import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
@@ -13,14 +14,12 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.boot.BootLoader;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IPersistableSourceLocator;
 import org.eclipse.debug.core.model.IStackFrame;
 import org.eclipse.debug.ui.ISourcePresentation;
-//import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorInput;
-//import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -29,9 +28,9 @@ import org.eclipse.ui.part.FileEditorInput;
 
 public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePresentation {
   private String absoluteWorkingDirectory;
-  private Map fileMap = null;
+  private Map pathMap = null;
 	private boolean remoteDebug;
-	private IPath remotePath;
+	private IPath remoteSourcePath;
 	private String projectName;
 
   public PHPSourceLocator() {
@@ -60,13 +59,13 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
   public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
     this.absoluteWorkingDirectory = configuration.getAttribute(PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
 		this.remoteDebug=configuration.getAttribute(PHPLaunchConfigurationAttribute.REMOTE_DEBUG,false);
-		this.fileMap = configuration.getAttribute(PHPLaunchConfigurationAttribute.FILE_MAP, (Map)null);
+		this.pathMap = configuration.getAttribute(PHPLaunchConfigurationAttribute.FILE_MAP, (Map)null);
 		this.projectName =configuration.getAttribute(PHPLaunchConfigurationAttribute.PROJECT_NAME, "");
 		
-		if (BootLoader.getOS().equals(BootLoader.OS_WIN32))
-			this.remotePath= new Path((configuration.getAttribute(PHPLaunchConfigurationAttribute.REMOTE_PATH, "")).toLowerCase());
+		if (Platform.getOS().equals(Platform.OS_WIN32))
+			this.remoteSourcePath= new Path((configuration.getAttribute(PHPLaunchConfigurationAttribute.REMOTE_PATH, "")).toLowerCase());
 		else
-			this.remotePath= new Path(configuration.getAttribute(PHPLaunchConfigurationAttribute.REMOTE_PATH, ""));
+			this.remoteSourcePath= new Path(configuration.getAttribute(PHPLaunchConfigurationAttribute.REMOTE_PATH, ""));
 		
 //		system.os.name
 
@@ -77,29 +76,38 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
    */
   public Object getSourceElement(IStackFrame stackFrame) {
   
-		String key=((PHPStackFrame) stackFrame).getFileName();
-
-		
+		String fileName=((PHPStackFrame) stackFrame).getFileName();
 		String file="";
 		    
     if (remoteDebug)
     {
-			IPath path = new Path(key);
-			if (remotePath.isPrefixOf(path))
+			IPath path = new Path(fileName);
+			if (remoteSourcePath.isPrefixOf(path))
 			{
 				IPath projectPath;
-				path=path.removeFirstSegments(remotePath.matchingFirstSegments(path));
+				path=path.removeFirstSegments(remoteSourcePath.matchingFirstSegments(path));
 				file=path.toString();
 				projectPath=(PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation());
-				file=(projectPath.append(path)).toString();			
+				return (projectPath.append(path)).toOSString();
 			}
-//    	file=(String)(fileMap.get(key));
-    } else
-    {
-    	file=key;
+   
+			if (pathMap == null) {
+				return fileName;
+			}
+			Iterator iterator = pathMap.keySet().iterator();
+			while (iterator.hasNext()) {
+				String local = (String) iterator.next();
+				IPath remotePath = new Path((String) pathMap.get(local));
+				if (remotePath.isPrefixOf(path)) {
+					path=path.removeFirstSegments(remotePath.matchingFirstSegments(path));
+					IPath localPath= new Path(local);
+					return localPath.append(path).toOSString();
+				}
+			}
+			return fileName;
+		} else {		
+			return fileName;
     }
-    
-    return file;
   }
 
   /**