[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Applied [Re: [cdt-patch] Source locator fix.]
|
Mikhail Khodjaiants wrote:
------------------------------------------------------------------------
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/ChangeLog,v
retrieving revision 1.38
diff -u -r1.38 ChangeLog
--- ChangeLog 28 Jul 2003 20:22:44 -0000 1.38
+++ ChangeLog 5 Aug 2003 14:36:29 -0000
@@ -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@xxxxxxxxxx>
* src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
(loadDebuggerComboBox): Sort entries by name. from
Index: src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java,v
retrieving revision 1.7
diff -u -r1.7 DefaultSourceLocator.java
--- src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java 28 Jul 2003 20:22:44 -0000 1.7
+++ src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java 5 Aug 2003 14:36:30 -0000
@@ -125,15 +125,19 @@
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 )
{
