diff options
| author | David Inglis | 2003-08-05 17:06:19 +0000 |
|---|---|---|
| committer | David Inglis | 2003-08-05 17:06:19 +0000 |
| commit | 02bab456aae03156e1a40261f0aa49e9fd349fa6 (patch) | |
| tree | bb6d4cd11872e42bdd7ff201c0803383418b5d22 /launch/org.eclipse.cdt.launch | |
| parent | 287009d7481a1d71a3c827446d4d93039f3aadee (diff) | |
| download | org.eclipse.cdt-02bab456aae03156e1a40261f0aa49e9fd349fa6.tar.gz org.eclipse.cdt-02bab456aae03156e1a40261f0aa49e9fd349fa6.tar.xz org.eclipse.cdt-02bab456aae03156e1a40261f0aa49e9fd349fa6.zip | |
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.
Diffstat (limited to 'launch/org.eclipse.cdt.launch')
| -rw-r--r-- | launch/org.eclipse.cdt.launch/ChangeLog | 5 | ||||
| -rw-r--r-- | launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index b81f2b879eb..ca8ea211e87 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -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> * src/org/eclipse/cdt/launch/ui/CDebuggerTab.java (loadDebuggerComboBox): Sort entries by name. from diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java index 0b3df3a4510..0a2e38dc9cd 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java @@ -125,15 +125,19 @@ public class DefaultSourceLocator implements IPersistableSourceLocator, IAdaptab abort( "Unable to restore prompting source locator - invalid format.", null ); } IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName ); - if ( project != null ) + if ( project == 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 + else if ( locator.getProject() != null && !project.equals( locator.getProject() ) ) { - abort( MessageFormat.format( "Unable to restore prompting source locator - project {0} not found.", new String[] { projectName } ), null ); + return; } - IPersistableSourceLocator psl = getPersistableSourceLocator(); if ( psl != null ) { |