Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] No need to set the source search path to the debugger

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.136
diff -u -r1.136 ChangeLog
--- ChangeLog 20 Feb 2003 20:26:54 -0000 1.136
+++ ChangeLog 20 Feb 2003 20:35:45 -0000
@@ -1,4 +1,11 @@
 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
 
Index: src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java,v
retrieving revision 1.3
diff -u -r1.3 ICSourceLocation.java
--- src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java 18 Feb 2003 19:24:08 -0000 1.3
+++ src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java 20 Feb 2003 20:35:45 -0000
@@ -7,7 +7,6 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
 
 /**
  *
@@ -37,13 +36,6 @@
   */
  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.
Index: src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java,v
retrieving revision 1.85
diff -u -r1.85 CDebugTarget.java
--- src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 12 Feb 2003 19:22:00 -0000 1.85
+++ src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 20 Feb 2003 20:35:47 -0000
@@ -34,7 +34,6 @@
 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.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 @@
  protected void initialize()
  {
   initializeState();
-  setSourceSearchPath();
   initializeBreakpoints();
   initializeRegisters();
   initializeMemoryManager();
@@ -2178,33 +2175,6 @@
   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();
Index: src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java,v
retrieving revision 1.6
diff -u -r1.6 CDirectorySourceLocation.java
--- src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java 20 Feb 2003 20:26:54 -0000 1.6
+++ src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java 20 Feb 2003 20:35:45 -0000
@@ -202,14 +202,6 @@
   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()
   */
Index: src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java,v
retrieving revision 1.7
diff -u -r1.7 CProjectSourceLocation.java
--- src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java 18 Feb 2003 19:24:08 -0000 1.7
+++ src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java 20 Feb 2003 20:35:46 -0000
@@ -177,23 +177,6 @@
   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

Back to the top