1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Fall back to the previous version.

This commit is contained in:
Mikhail Khodjaiants 2003-10-23 17:39:28 +00:00
parent e726ac9355
commit 28ca11c7da

View file

@ -23,7 +23,6 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.xerces.dom.DocumentImpl; import org.apache.xerces.dom.DocumentImpl;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDebugConstants;
import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.model.IStackFrameInfo;
import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
@ -317,13 +316,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
*/ */
public void initializeDefaults( ILaunchConfiguration configuration ) throws CoreException public void initializeDefaults( ILaunchConfiguration configuration ) throws CoreException
{ {
ICSourceLocation[] defaultLocations = getDefaultSourceLocations(); setSourceLocations( getDefaultSourceLocations() );
ICSourceLocation[] commonLocations = CDebugCorePlugin.getDefault().getCommonSourceLocations();
List list = new ArrayList( defaultLocations.length + commonLocations.length );
list.addAll( Arrays.asList( defaultLocations ) );
list.addAll( Arrays.asList( commonLocations ) );
setSourceLocations( (ICSourceLocation[])list.toArray( new ICSourceLocation[list.size()] ) );
fDuplicateFiles = CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_SEARCH_DUPLICATE_FILES );
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -669,7 +662,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
IProject project = (IProject)it.next(); IProject project = (IProject)it.next();
if ( project != null && project.exists() && project.isOpen() ) if ( project != null && project.exists() && project.isOpen() )
list.add( SourceLocationFactory.createProjectSourceLocation( project ) ); list.add( SourceLocationFactory.createProjectSourceLocation( project ) );
} }
return (ICSourceLocation[])list.toArray( new ICSourceLocation[list.size()] ); return (ICSourceLocation[])list.toArray( new ICSourceLocation[list.size()] );
} }