1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00

2005-04-27 Alain Magloire

Changes in the CDI interface
	* cdi/org/eclipse/cdt/debug/core/cdi/model/BreakpointManager.java
	* cdi/org/eclipse/cdt/debug/core/cdi/model/Session.java
	* cdi/org/eclipse/cdt/debug/core/cdi/model/SourceManager.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
	* mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java
	* mi/org/eclipse/cdt/debug/mi/core/command/MIEnvrionmentDirectory.java
	* src/org/eclipse/cdt/debug/mi/core/CygwinCommandfactory.java
	* src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java
This commit is contained in:
Alain Magloire 2005-04-27 20:21:35 +00:00
parent afe7bf4c25
commit 2b88bfaabb
9 changed files with 30 additions and 30 deletions

View file

@ -1,3 +1,14 @@
2005-04-27 Alain Magloire
Changes in the CDI interface
* cdi/org/eclipse/cdt/debug/core/cdi/model/BreakpointManager.java
* cdi/org/eclipse/cdt/debug/core/cdi/model/Session.java
* cdi/org/eclipse/cdt/debug/core/cdi/model/SourceManager.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
* mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java
* mi/org/eclipse/cdt/debug/mi/core/command/MIEnvrionmentDirectory.java
* src/org/eclipse/cdt/debug/mi/core/CygwinCommandfactory.java
* src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java
2005-04-25 Alain Magloire 2005-04-25 Alain Magloire
* cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManger.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManger.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties * cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties

View file

@ -622,10 +622,11 @@ public class BreakpointManager extends Manager {
bList.add(bkpt); bList.add(bkpt);
// Fire a created Event. // Fire a created Event.
MISession miSession = target.getMISession();
MIBreakpoint[] miBreakpoints = bkpt.getMIBreakpoints(); MIBreakpoint[] miBreakpoints = bkpt.getMIBreakpoints();
if (miBreakpoints != null && miBreakpoints.length > 0) if (miBreakpoints != null && miBreakpoints.length > 0) {
miSession.fireEvent(new MIBreakpointCreatedEvent(miSession, miBreakpoints[0].getNumber())); MISession miSession = target.getMISession();
miSession.fireEvent(new MIBreakpointCreatedEvent(miSession, miBreakpoints[0].getNumber()));
}
return bkpt; return bkpt;
} }

View file

@ -20,12 +20,9 @@ import org.eclipse.cdt.debug.core.cdi.ICDISession;
import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.MISession; import org.eclipse.cdt.debug.mi.core.MISession;
import org.eclipse.cdt.debug.mi.core.cdi.event.DestroyedEvent; import org.eclipse.cdt.debug.mi.core.cdi.event.DestroyedEvent;
import org.eclipse.cdt.debug.mi.core.cdi.model.Target; import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentDirectory;
/** /**
* @see org.eclipse.cdt.debug.core.cdi.ICDISession * @see org.eclipse.cdt.debug.core.cdi.ICDISession
@ -209,18 +206,6 @@ public class Session implements ICDISession, ICDISessionObject {
eMgr.removeEventListeners(); eMgr.removeEventListeners();
} }
public void addSearchPaths(Target target, String[] dirs) throws CDIException {
MISession miSession = target.getMISession();
CommandFactory factory = miSession.getCommandFactory();
MIEnvironmentDirectory dir = factory.createMIEnvironmentDirectory(dirs);
try {
miSession.postCommand(dir);
dir.getMIInfo();
} catch (MIException e) {
throw new MI2CDIException(e);
}
}
/** /**
* @deprecated * @deprecated
* @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSessionProcess() * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSessionProcess()

View file

@ -69,10 +69,10 @@ public class SourceManager extends Manager {
gdbTypeParser = new GDBTypeParser(); gdbTypeParser = new GDBTypeParser();
} }
public void addSourcePaths(Target target, String[] dirs) throws CDIException { public void setSourcePaths(Target target, String[] dirs) throws CDIException {
MISession mi = target.getMISession(); MISession mi = target.getMISession();
CommandFactory factory = mi.getCommandFactory(); CommandFactory factory = mi.getCommandFactory();
MIEnvironmentDirectory dir = factory.createMIEnvironmentDirectory(dirs); MIEnvironmentDirectory dir = factory.createMIEnvironmentDirectory(true, dirs);
try { try {
mi.postCommand(dir); mi.postCommand(dir);
dir.getMIInfo(); dir.getMIInfo();

View file

@ -929,11 +929,11 @@ public class Target extends SessionObject implements ICDITarget {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#addSourcePaths(java.lang.String[]) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#setSourcePaths(java.lang.String[])
*/ */
public void addSourcePaths(String[] srcPaths) throws CDIException { public void setSourcePaths(String[] srcPaths) throws CDIException {
SourceManager srcMgr = ((Session)getSession()).getSourceManager(); SourceManager srcMgr = ((Session)getSession()).getSourceManager();
srcMgr.addSourcePaths(this, srcPaths); srcMgr.setSourcePaths(this, srcPaths);
} }
/* (non-Javadoc) /* (non-Javadoc)

View file

@ -102,8 +102,8 @@ public class CommandFactory {
return new MIEnvironmentCD(pathdir); return new MIEnvironmentCD(pathdir);
} }
public MIEnvironmentDirectory createMIEnvironmentDirectory(String[] pathdirs) { public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) {
return new MIEnvironmentDirectory(pathdirs); return new MIEnvironmentDirectory(reset, pathdirs);
} }
public MIEnvironmentPath createMIEnvironmentPath(String[] paths) { public MIEnvironmentPath createMIEnvironmentPath(String[] paths) {

View file

@ -20,8 +20,11 @@ package org.eclipse.cdt.debug.mi.core.command;
*/ */
public class MIEnvironmentDirectory extends MICommand public class MIEnvironmentDirectory extends MICommand
{ {
public MIEnvironmentDirectory(String[] paths) { public MIEnvironmentDirectory(boolean reset, String[] paths) {
super("-environment-directory", paths); //$NON-NLS-1$ super("-environment-directory", paths); //$NON-NLS-1$
if (reset) {
setOptions(new String[] {"-r"});
}
} }
} }

View file

@ -16,8 +16,8 @@ import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentDirectory;
*/ */
public class CygwinCommandFactory extends CommandFactory { public class CygwinCommandFactory extends CommandFactory {
public MIEnvironmentDirectory createMIEnvironmentDirectory(String[] pathdirs) { public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) {
return new CygwinMIEnvironmentDirectory(pathdirs); return new CygwinMIEnvironmentDirectory(reset, pathdirs);
} }
/* (non-Javadoc) /* (non-Javadoc)

View file

@ -19,8 +19,8 @@ import org.eclipse.core.runtime.Path;
*/ */
public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory { public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory {
CygwinMIEnvironmentDirectory(String[] paths) { CygwinMIEnvironmentDirectory(boolean reset, String[] paths) {
super(paths); super(reset, paths);
String[] newpaths = new String[paths.length]; String[] newpaths = new String[paths.length];
for (int i = 0; i < paths.length; i++) { for (int i = 0; i < paths.length; i++) {