diff options
| author | Mikhail Khodjaiants | 2003-12-05 20:36:41 +0000 |
|---|---|---|
| committer | Mikhail Khodjaiants | 2003-12-05 20:36:41 +0000 |
| commit | 565184adfaeb06017fa4df036e6c7d6b49fa9518 (patch) | |
| tree | a4f0197d6d56d51cb59cba8c4a3e03cab449f022 /debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug | |
| parent | 1a4a0704fc13200c8670efb0b52d98514551455c (diff) | |
| download | org.eclipse.cdt-565184adfaeb06017fa4df036e6c7d6b49fa9518.tar.gz org.eclipse.cdt-565184adfaeb06017fa4df036e6c7d6b49fa9518.tar.xz org.eclipse.cdt-565184adfaeb06017fa4df036e6c7d6b49fa9518.zip | |
'performApply' of 'SourceLookupBlock' should check if the project in configuration is the same as project saved in the block.
Changed the message displayed when the source file is not found.
Diffstat (limited to 'debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug')
2 files changed, 2 insertions, 2 deletions
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java index 43ff059020f..e2fc7e812c2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java @@ -287,7 +287,7 @@ public class CDebugEditor extends CEditor { FileNotFoundElement element = (FileNotFoundElement)input.getAdapter( FileNotFoundElement.class ); if ( element != null ) - fInputLabel.setText( MessageFormat.format( "The debugger can not find the file ''{0}''.", new String[] { element.getFullPath().toOSString() } ) ); + fInputLabel.setText( MessageFormat.format( "Can not find the file ''{0}'' in the specified source locations.", new String[] { element.getFullPath().toOSString() } ) ); } protected ScrolledComposite getScrolledComposite() diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java index 490ff27fbc2..0970486a82b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java @@ -251,7 +251,7 @@ public class SourceLookupBlock implements Observer if ( locator instanceof IAdaptable ) { ICSourceLocator clocator = (ICSourceLocator)((IAdaptable)locator).getAdapter( ICSourceLocator.class ); - if ( clocator != null ) + if ( clocator != null && getProject() != null && getProject().equals( getProjectFromLaunchConfiguration( configuration ) ) ) { clocator.setSourceLocations( getSourceLocations() ); clocator.setSearchForDuplicateFiles( searchForDuplicateFiles() ); |