Merge xdebug from 1.3.x.

[phpeclipse.git] / net.sourceforge.phpeclipse.xdebug.core / src / net / sourceforge / phpeclipse / xdebug / php / launching / PHPSourceLookupParticipant.java

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPSourceLookupParticipant.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPSourceLookupParticipant.java
index 5e8b521..aa6bed2 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPSourceLookupParticipant.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPSourceLookupParticipant.java
@@ -68,8 +68,8 @@ public class PHPSourceLookupParticipant extends AbstractSourceLookupParticipant
                        for (int k = 0; k < pathMap.size(); k++) {
                                pmi = new PathMapItem((String) pathMap.get(k));
        
-                               IPath local = new Path(pmi.getLocalPath().toString())/* .removeFirstSegments(1) */;
-                               IPath remote = new Path(pmi.getRemotePath().toString())/* .removeFirstSegments(1) */;
+                               IPath local = new Path(pmi.getLocalPath().toString());
+                               IPath remote = new Path(pmi.getRemotePath().toString());
        
                                if (remote.matchingFirstSegments(sPath) == remote.segmentCount()) {
                                        sLocalPath = local;
@@ -116,7 +116,7 @@ public class PHPSourceLookupParticipant extends AbstractSourceLookupParticipant
                                        multiStatus = new MultiStatus(DebugPlugin
                                                        .getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR,
                                                        new IStatus[] { single.getStatus() },
-                                                       SourceLookupMessages.DefaultSourceContainer_0,
+                                                       SourceLookupMessages.DefaultSourceContainer_0/*CompositeSourceContainer_0*/,
                                                        null);
                                        multiStatus.add(e.getStatus());
                                } else {
@@ -145,7 +145,7 @@ public class PHPSourceLookupParticipant extends AbstractSourceLookupParticipant
                        }
                        IFile file = (IFile) objects[j];
 
-                       IPath path = new Path(file.getFullPath().toString());
+                       IPath path = new Path(file.getLocation().toString());
                        if (localPath.matchingFirstSegments(path) == localPath
                                        .segmentCount()) {
                                results.add(objects[j]);