* Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made
* available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
- *
+ *
* Contributors: IBM Corporation - Initial implementation Vicente Fernando - www.alfersoft.com.ar Christian Perkonig - remote debug
**********************************************************************************************************************************/
package net.sourceforge.phpdt.internal.debug.core;
import java.util.Map;
import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
-import net.sourceforge.phpdt.internal.debug.core.logview.LogView;
-import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget;
+import net.sourceforge.phpdt.internal.debug.core.model.PHPDebugTarget;
import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
import net.sourceforge.phpdt.internal.debug.core.model.PHPThread;
import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
public class PHPDBGProxy {
private PHPDBGInterface DBGInt = null;
- private IPHPDebugTarget debugTarget = null;
+ private PHPDebugTarget debugTarget = null;
private PHPLoop phpLoop;
private boolean remote;
private boolean pathtranslation;
-
+
private Map pathmap;
-
+
private IPath remoteSourcePath;
public PHPDBGProxy() {
}
protected void setBreakPoints() throws IOException, CoreException {
- IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints();
- for (int i = 0; i < breakpoints.length; i++) {
- addBreakpoint(breakpoints[i]);
- }
- }
+ IBreakpoint[] breakpoints = DebugPlugin.getDefault()
+ .getBreakpointManager().getBreakpoints();
+ for (int i = 0; i < breakpoints.length; i++) {
+ if (breakpoints[i].isEnabled()) {
+ addBreakpoint(breakpoints[i]);
+ }
+ }
+ }
private String MapPath(PHPLineBreakpoint phpLBP) {
IPath filename;
}
}
if (pathtranslation && remote) {
- if (path.substring(0, 1).equals("/"))
+ if (remoteSourcePath.toString().substring(0, 1).equals("/"))
path = path.replace('\\', '/');
else
path = path.replace('/', '\\');
}
return path;
}
-
+
public void addBreakpoint(IBreakpoint breakpoint) {
if (DBGInt == null)
return;
DBGInt.continueExecution();
phpLoop.notifyWait();
} catch (IOException e) {
- PHPDebugCorePlugin.log(e);
+ PHPeclipsePlugin.log("Debugging session ended.", e);
stop();
}
}
if (null != DBGInt)
DBGInt.pauseExecution();
else {
- // TODO Make sure the Suspend action is grayed out
+ // TODO Make sure the Suspend action is grayed out
// when DBGInt is null
}
} catch (IOException e) {
}
}
- protected IPHPDebugTarget getDebugTarget() {
+ protected PHPDebugTarget getDebugTarget() {
return debugTarget;
}
- public void setDebugTarget(IPHPDebugTarget debugTarget) {
+ public void setDebugTarget(PHPDebugTarget debugTarget) {
this.debugTarget = debugTarget;
debugTarget.setPHPDBGProxy(this);
}
public synchronized void setShouldStop() {
shouldStop = true;
try {
- // If the loop thread is blocked on the server socket,
- // forcibly unblock it to avoid leaking the thread,
+ // If the loop thread is blocked on the server socket,
+ // forcibly unblock it to avoid leaking the thread,
// the socket and the port
closeServerSocket();
} catch (IOException x) {