[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Source Lookup fixes
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/ChangeLog,v
retrieving revision 1.35
diff -u -r1.35 ChangeLog
--- ChangeLog 17 Jul 2003 17:46:24 -0000 1.35
+++ ChangeLog 22 Jul 2003 14:35:11 -0000
@@ -1,3 +1,8 @@
+2003-07-22 Mikhail Khodjaiants
+ * src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
+ * src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java
+ Fixed initialization problems.
+
2003-07-17 Thomas Fletcher
* src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
Applied source locator patch to expand the scope of source lookups.
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.5
diff -u -r1.5 DefaultSourceLocator.java
--- src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java 17 Jul 2003 17:46:24 -0000 1.5
+++ src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java 22 Jul 2003 14:35:11 -0000
@@ -166,6 +166,9 @@
public void initializeDefaults( ILaunchConfiguration configuration ) throws CoreException
{
fSourceLocator = new CUISourceLocator( getProject( configuration ) );
+ String memento = configuration.getAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, "" );
+ if ( !isEmpty( memento ) )
+ initializeFromMemento( memento );
}
/* (non-Javadoc)
Index: src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java,v
retrieving revision 1.3
diff -u -r1.3 CSourceLookupTab.java
--- src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java 9 Jul 2003 21:51:48 -0000 1.3
+++ src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java 22 Jul 2003 14:35:11 -0000
@@ -56,17 +56,18 @@
public void initializeFrom( ILaunchConfiguration configuration )
{
IProject project = getProject( configuration );
+ IProject oldProject = fBlock.getProject();
fBlock.setProject( getProject( configuration ) );
if ( project != null )
{
try
{
String id = configuration.getAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, "" );
- if ( isEmpty( id )|| DefaultSourceLocator.ID_DEFAULT_SOURCE_LOCATOR.equals( id ) )
+ if ( isEmpty( id ) || DefaultSourceLocator.ID_DEFAULT_SOURCE_LOCATOR.equals( id ) )
{
DefaultSourceLocator locator = new DefaultSourceLocator();
String memento = configuration.getAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, "" );
- if ( !isEmpty( memento ) )
+ if ( project.equals( oldProject ) && !isEmpty( memento ) )
{
locator.initializeFromMemento( memento );
}
@@ -100,7 +101,11 @@
locator.initializeDefaults( configuration );
ICSourceLocator clocator = (ICSourceLocator)locator.getAdapter( ICSourceLocator.class );
if ( clocator != null )
+ {
+ if ( !project.equals( fBlock.getProject() ) )
+ fBlock.initialize( clocator );
clocator.setSourceLocations( fBlock.getSourceLocations() );
+ }
configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, locator.getMemento() );
}
catch( CoreException e )
