diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 3842af72616..3fa9db4e8dc 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,10 @@ +2003-02-20 Mikhail Khodjaiants + No need to set the source search path to the debugger. + * ICSourceLocation.java + * CDirectorySourceLocation.java + * CProjectSourceLocation.java + * CDebugTarget.java + 2003-02-20 Mikhail Khodjaiants Changed to 'public' the access modifier of the 'setAssocition' method. * CDirectorySourceLocation.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java index e88d8161a99..9c94ee7c422 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java @@ -7,7 +7,6 @@ package org.eclipse.cdt.debug.core.sourcelookup; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; /** * @@ -37,13 +36,6 @@ public interface ICSourceLocation extends IAdaptable */ Object findSourceElement( String name ) throws CoreException; - /** - * Returns the paths associated with this location. - * - * @return the paths associated with this location - */ - IPath[] getPaths(); - /** * Returns a memento for this source location from which this * source location can be reconstructed. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index aa079d508e7..08b395677f9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager; import org.eclipse.cdt.debug.core.cdi.ICDILocation; import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived; -import org.eclipse.cdt.debug.core.cdi.ICDISourceManager; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger; import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; @@ -71,7 +70,6 @@ import org.eclipse.cdt.debug.core.model.IJumpToLine; import org.eclipse.cdt.debug.core.model.IRunToAddress; import org.eclipse.cdt.debug.core.model.IRunToLine; import org.eclipse.cdt.debug.core.model.IState; -import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; import org.eclipse.cdt.debug.internal.core.CDebugUtils; @@ -297,7 +295,6 @@ public class CDebugTarget extends CDebugElement protected void initialize() { initializeState(); - setSourceSearchPath(); initializeBreakpoints(); initializeRegisters(); initializeMemoryManager(); @@ -2178,33 +2175,6 @@ public class CDebugTarget extends CDebugElement return getLaunch().getSourceLocator(); } - protected void setSourceSearchPath() - { - ICDISourceManager mgr = getCDISession().getSourceManager(); - ISourceLocator locator = getLaunch().getSourceLocator(); - ArrayList list = new ArrayList(); - if ( locator != null && locator instanceof ICSourceLocator ) - { - ICSourceLocation[] locations = ((ICSourceLocator)locator).getSourceLocations(); - for ( int i = 0; i < locations.length; ++i ) - { - IPath[] paths = locations[i].getPaths(); - for ( int j = 0; j < paths.length; ++j ) - { - list.add( paths[j].toOSString() ); - } - } - } - try - { - mgr.addSourcePaths( (String[])list.toArray( new String[list.size()] ) ); - } - catch( CDIException e ) - { - CDebugCorePlugin.log( e ); - } - } - protected void resetRegisters() { Iterator it = fRegisterGroups.iterator(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java index 28082d1d44f..26dbb86a086 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java @@ -202,14 +202,6 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation return new FileStorage( path ); } - /** - * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getPaths() - */ - public IPath[] getPaths() - { - return new IPath[] { fDirectory }; - } - /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getMemento() */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java index 1103cd5fbaa..d05ee9beb45 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java @@ -177,23 +177,6 @@ public class CProjectSourceLocation implements IProjectSourceLocation return result; } - /** - * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getPaths() - */ - public IPath[] getPaths() - { - IPath[] result = new IPath[0]; - if ( getProject() != null ) - { - IPath location = getProject().getLocation(); - if ( location != null ) - { - result = new IPath[] { location }; - } - } - return result; - } - private Object findFile( IContainer container, String fileName ) { try