Fixed: Editor open a file in R/O (as external) when debugging a file under linked...

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

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 652a6c7..d395616 100644 (file)
--- 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
@@ -9,11 +9,12 @@ import net.sourceforge.phpeclipse.builder.ExternalEditorInput;
 import net.sourceforge.phpeclipse.builder.FileStorage;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
 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.runtime.Platform;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IPersistableSourceLocator;
 import org.eclipse.debug.core.model.IStackFrame;
@@ -62,14 +63,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
        this.pathMap                  = configuration.getAttribute (PHPLaunchConfigurationAttribute.FILE_MAP, (Map)null);
        this.projectName              = configuration.getAttribute (PHPLaunchConfigurationAttribute.PROJECT_NAME, "");
 
-       if (Platform.getOS().equals(Platform.OS_WIN32)) {
-               this.remoteSourcePath = new Path ((configuration.getAttribute (PHPLaunchConfigurationAttribute.REMOTE_PATH, "")).toLowerCase());
-       }
-       else {
-               this.remoteSourcePath = new Path (configuration.getAttribute (PHPLaunchConfigurationAttribute.REMOTE_PATH, ""));
-       }
-
-//             system.os.name
+       this.remoteSourcePath = new Path (configuration.getAttribute (PHPLaunchConfigurationAttribute.REMOTE_PATH, ""));
   }
 
   /**
@@ -151,7 +145,23 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
                }
 
                return fileName;
-       } else {
+
+    } else {
+
+       IWorkspaceRoot root = PHPLaunchingPlugin.getWorkspace().getRoot();
+       Path filePath = new Path(fileName);
+
+       if (root.getFileForLocation(filePath) == null) {
+                       IProject proj = root.getProject(projectName);
+                       IFile[] files = root.findFilesForLocation(filePath);
+                       for (int i = 0; i < files.length; i++) {
+                               if (files[i].getProject().equals(proj)) {
+                                       fileName = proj.getLocation().append(files[i].getProjectRelativePath()).toOSString();
+                                       break;
+                               }
+                       }
+               }
+
                return fileName;
     }
   }