Commit RSE changes that were done in the debug projects.

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java
index 96919b2..111d95c 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java
@@ -245,7 +245,7 @@ public class PHPDBGProxy {
                        filename = phpLBP.getMarker().getResource().getProjectRelativePath();
                        filename = remoteSourcePath.append (filename);
                } else {
-                       filename = phpLBP.getMarker().getResource().getLocation();
+                       filename = phpLBP.getMarker().getResource().getFullPath();
                }
 
                String path = filename.toOSString();
@@ -272,7 +272,7 @@ public class PHPDBGProxy {
                                        localPath  = new Path (local);                          // Get the remote/server side path of the mapping
 
                                        if (localPath.isPrefixOf (filename)) {                  // Starts the remote/server side file path with the remote/server side mapping path
-                                                                                                                                                       // dann prefix abhängen und den remote path davorhägen
+                                                                                                                                                       // dann prefix abh�ngen und den remote path davorh�gen
                                                newpath = filename.removeFirstSegments (localPath.matchingFirstSegments (filename));
                                                newpath = remotePath.append (newpath);
                                                path    = newpath.toString ();

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java
index 7831922..d46d8b2 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java
@@ -28,7 +28,7 @@ public class LoadPathEntryLabelProvider implements ILabelProvider {
         */
        public String getText(Object element) {
                if (element != null && element.getClass() == LoadPathEntry.class)
-                       return ((LoadPathEntry) element).getProject().getLocation()
+                       return ((LoadPathEntry) element).getProject().getFullPath()
                                        .toOSString();
 
                PHPDebugUiPlugin

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
index cd7ae8f..55b5718 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
@@ -574,7 +574,7 @@ public class PHPEnvironmentTab extends AbstractLaunchConfigurationTab {
                                IProject project = ResourcesPlugin.getWorkspace().getRoot()
                                                .getProject(projectName);
                                if (project != null) {
-                                       IPath remotePath = project.getLocation();
+                                       IPath remotePath = project.getFullPath();
                                        String fileName = configuration.getAttribute(
                                                        PHPLaunchConfigurationAttribute.FILE_NAME, "");
                                        if (fileName != "") {

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPLaunchConfigurationDelegate.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPLaunchConfigurationDelegate.java
index 9ddb63d..23f538e 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPLaunchConfigurationDelegate.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/launching/PHPLaunchConfigurationDelegate.java
@@ -79,7 +79,7 @@ public class PHPLaunchConfigurationDelegate extends LaunchConfigurationDelegate
                        abort(MessageFormat.format("PHP-Script {0} does not exist.", new String[] {file.getFullPath().toString()}), null);
                }
                
-               commandList.add(file.getLocation().toOSString());
+               commandList.add(file.getFullPath().toOSString());
 
                // Get the Debugport  from the preferences
                int debugPort=XDebugCorePlugin.getDefault().getPreferenceStore().getInt(IXDebugPreferenceConstants.DEBUGPORT_PREFERENCE);

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 3e7a34d..ad1235d 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
@@ -145,7 +145,7 @@ public class PHPSourceLookupParticipant extends AbstractSourceLookupParticipant
                        }
                        IFile file = (IFile) objects[j];
 
-                       IPath path = new Path(file.getLocation().toString());
+                       IPath path = new Path(file.getFullPath().toString());
                        if (localPath.matchingFirstSegments(path) == localPath
                                        .segmentCount()) {
                                results.add(objects[j]);

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
index d032172..339cf1b 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
@@ -248,7 +248,7 @@ public class XDebugTarget extends XDebugElement implements IDebugTarget, ILaunch
         */
        public void breakpointAdded(IBreakpoint breakpoint) {
                IMarker marker = breakpoint.getMarker();
-               IPath path = marker.getResource().getLocation();
+               IPath path = marker.getResource().getFullPath();
                IPath cp = path.removeLastSegments(1);
                List pathMap = null;
                try {
@@ -743,9 +743,9 @@ public class XDebugTarget extends XDebugElement implements IDebugTarget, ILaunch
                                                                        String endfilename;
                                                                        
                                                                        if (getProcess() == null) {
-                                                                               endfilename = marker.getResource().getLocation().lastSegment(); 
+                                                                               endfilename = marker.getResource().getFullPath().lastSegment(); 
                                                                        } else {
-                                                                               endfilename = marker.getResource().getLocation().toOSString();
+                                                                               endfilename = marker.getResource().getFullPath().toOSString();
                                                                        }
 
                                                                        if(PHPDebugUtils.unescapeString(filename).endsWith(endfilename) && (lineBreakpoint.getLineNumber() == lineNumber) ) {