From 2b88bfaabb352a0e78210effe275b932fe05e99e Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 27 Apr 2005 20:21:35 +0000 Subject: [PATCH] 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 --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 11 +++++++++++ .../cdt/debug/mi/core/cdi/BreakpointManager.java | 7 ++++--- .../eclipse/cdt/debug/mi/core/cdi/Session.java | 15 --------------- .../cdt/debug/mi/core/cdi/SourceManager.java | 4 ++-- .../cdt/debug/mi/core/cdi/model/Target.java | 6 +++--- .../cdt/debug/mi/core/command/CommandFactory.java | 4 ++-- .../mi/core/command/MIEnvironmentDirectory.java | 5 ++++- .../cdt/debug/mi/core/CygwinCommandFactory.java | 4 ++-- .../mi/core/CygwinMIEnvironmentDirectory.java | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index f2d627aa0d3..3e82ced6a4d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -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 * cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManger.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/CdiResources.properties diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index 17a6ff6ca83..d4424414120 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -622,10 +622,11 @@ public class BreakpointManager extends Manager { bList.add(bkpt); // Fire a created Event. - MISession miSession = target.getMISession(); MIBreakpoint[] miBreakpoints = bkpt.getMIBreakpoints(); - if (miBreakpoints != null && miBreakpoints.length > 0) - miSession.fireEvent(new MIBreakpointCreatedEvent(miSession, miBreakpoints[0].getNumber())); + if (miBreakpoints != null && miBreakpoints.length > 0) { + MISession miSession = target.getMISession(); + miSession.fireEvent(new MIBreakpointCreatedEvent(miSession, miBreakpoints[0].getNumber())); + } return bkpt; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java index 23c62b9fd32..586f71bb701 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java @@ -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.event.ICDIEvent; 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.cdi.event.DestroyedEvent; 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 @@ -209,18 +206,6 @@ public class Session implements ICDISession, ICDISessionObject { 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 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSessionProcess() diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java index 968a5aa666f..0eb595babe4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java @@ -69,10 +69,10 @@ public class SourceManager extends Manager { 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(); CommandFactory factory = mi.getCommandFactory(); - MIEnvironmentDirectory dir = factory.createMIEnvironmentDirectory(dirs); + MIEnvironmentDirectory dir = factory.createMIEnvironmentDirectory(true, dirs); try { mi.postCommand(dir); dir.getMIInfo(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java index a7d589d98d3..7c0c06e548f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java @@ -929,11 +929,11 @@ public class Target extends SessionObject implements ICDITarget { } /* (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(); - srcMgr.addSourcePaths(this, srcPaths); + srcMgr.setSourcePaths(this, srcPaths); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java index 44b80ae2f39..d44738d9f47 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java @@ -102,8 +102,8 @@ public class CommandFactory { return new MIEnvironmentCD(pathdir); } - public MIEnvironmentDirectory createMIEnvironmentDirectory(String[] pathdirs) { - return new MIEnvironmentDirectory(pathdirs); + public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) { + return new MIEnvironmentDirectory(reset, pathdirs); } public MIEnvironmentPath createMIEnvironmentPath(String[] paths) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentDirectory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentDirectory.java index a7eaf2903d0..acc37f0729a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentDirectory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentDirectory.java @@ -20,8 +20,11 @@ package org.eclipse.cdt.debug.mi.core.command; */ public class MIEnvironmentDirectory extends MICommand { - public MIEnvironmentDirectory(String[] paths) { + public MIEnvironmentDirectory(boolean reset, String[] paths) { super("-environment-directory", paths); //$NON-NLS-1$ + if (reset) { + setOptions(new String[] {"-r"}); + } } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinCommandFactory.java index 63993d478b3..ff0b0484219 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinCommandFactory.java @@ -16,8 +16,8 @@ import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentDirectory; */ public class CygwinCommandFactory extends CommandFactory { - public MIEnvironmentDirectory createMIEnvironmentDirectory(String[] pathdirs) { - return new CygwinMIEnvironmentDirectory(pathdirs); + public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) { + return new CygwinMIEnvironmentDirectory(reset, pathdirs); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java index 1af90c5c8c6..6df7109ff2f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIEnvironmentDirectory.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.Path; */ public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory { - CygwinMIEnvironmentDirectory(String[] paths) { - super(paths); + CygwinMIEnvironmentDirectory(boolean reset, String[] paths) { + super(reset, paths); String[] newpaths = new String[paths.length]; for (int i = 0; i < paths.length; i++) {