From 565184adfaeb06017fa4df036e6c7d6b49fa9518 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 5 Dec 2003 20:36:41 +0000 Subject: [PATCH] '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. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 9 +++++++++ .../cdt/debug/internal/ui/editors/CDebugEditor.java | 2 +- .../cdt/debug/ui/sourcelookup/SourceLookupBlock.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 1812b0329a2..6513cbe866d 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,12 @@ +2003-12-05 Mikhail Khodjaiants + 'performApply' of 'SourceLookupBlock' should check if the project in configuration is the same as + project saved in the block. + * SourceLookupBlock.java + +2003-12-04 Mikhail Khodjaiants + Changed the message displayed when the source file is not found. + * CDebugEditor.java + 2003-11-26 Mikhail Khodjaiants Fix for PR 47595: Referenced projects are not checked in the list of generic source locations. * SourceLookupBlock.java 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() );