Commit RSE changes that were done in the debug projects.

[phpeclipse.git] / net.sourceforge.phpeclipse.debug.core / src / net / sourceforge / phpdt / internal / debug / core / PHPDBGProxy.java

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 77d751e..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
@@ -86,13 +86,13 @@ public class PHPDBGProxy {
                DBGInt.setShouldStop ();                                //  Notify the DBG interface to stop the waiting for response
                }
 
-               if (!remote) {                                              // If it's not a remote proxy session
-               try {
-                       getDebugTarget ().getProcess ().terminate ();       //
-               } catch (DebugException e) {
-                       e.printStackTrace ();
-               }
-               }
+//             if (!remote) {                                              // If it's not a remote proxy session
+//             try {
+//                     getDebugTarget ().getProcess ().terminate ();       //
+//             } catch (DebugException e) {
+//                     e.printStackTrace ();
+//             }
+//             }
 
                phpLoop.notifyWait ();
        }
@@ -176,6 +176,15 @@ public class PHPDBGProxy {
        }
 
        /**
+        * Get the DBG interface which is linked to this proxy
+        *
+        * @paran DBGInt The DGB interface which is linked with this proxy
+        */
+       public PHPDBGInterface getDBGInterface () {
+               return DBGInt;
+       }
+       
+       /**
         * Give back a buffered input stream for the socket which is
         * linked with this proxy
         */
@@ -236,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();
@@ -263,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 ();
@@ -417,7 +426,8 @@ public class PHPDBGProxy {
        }
 
        /**
-        *
+        * Is called by the DebuggerRunner
+        * 
         * @param debugTarget
         */
        public void setDebugTarget (PHPDebugTarget debugTarget) {