mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-21 16:05:25 +02:00
Code Issues Wiki Activity

2003-08-05 Mikhail Khodjaiants

Browse source 
* src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
	Check if the project saved in the launch configuration equals to the project set 
	in the source lookup tab.
This commit is contained in:
David Inglis 2003-08-05 17:06:19 +00:00
parent 287009d748
commit 02bab456aa
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -1,3 +1,8 @@
2003-08-05 Mikhail Khodjaiants
* src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
Check if the project saved in the launch configuration equals to the project set
in the source lookup tab.
2003-07-28 Tom Tromey <tromey@redhat.com> 2003-07-28 Tom Tromey <tromey@redhat.com>
* src/org/eclipse/cdt/launch/ui/CDebuggerTab.java * src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
(loadDebuggerComboBox): Sort entries by name. from (loadDebuggerComboBox): Sort entries by name. from

16
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
View file

@ -125,15 +125,19 @@ public class DefaultSourceLocator implements IPersistableSourceLocator, IAdaptab
abort( "Unable to restore prompting source locator - invalid format.", null ); abort( "Unable to restore prompting source locator - invalid format.", null );
} }
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName ); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName );
if ( project != null ) if ( project == null )
{
fSourceLocator = new CUISourceLocator( project );
}
else
{ {
abort( MessageFormat.format( "Unable to restore prompting source locator - project {0} not found.", new String[] { projectName } ), null ); abort( MessageFormat.format( "Unable to restore prompting source locator - project {0} not found.", new String[] { projectName } ), null );
} }
ICSourceLocator locator = getCSourceLocator();
if ( locator == null )
{
fSourceLocator = new CUISourceLocator( project );
}
else if ( locator.getProject() != null && !project.equals( locator.getProject() ) )
{
return;
}
IPersistableSourceLocator psl = getPersistableSourceLocator(); IPersistableSourceLocator psl = getPersistableSourceLocator();
if ( psl != null ) if ( psl != null )
{ {