mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

see change log

Browse source
This commit is contained in:
David Inglis 2003-07-22 15:43:02 +00:00
parent 4b8ed789cc
commit 4da2df9363
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -1,3 +1,12 @@
2003-07-22 David Inglis
* src/org/eclipse/cdt/launch/ui/CMainTab.java
Use project name for configuration naming when no binary selected
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.

5
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java
View file

@ -59,10 +59,7 @@ public class LaunchImages {
public static Image get(String key) {
return imageRegistry.get(key);
}
private static ImageDescriptor create(String prefix, String name) {
return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
}
private static URL makeIconFileURL(String prefix, String name) {
StringBuffer buffer= new StringBuffer(prefix);

3
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
View file

@ -166,6 +166,9 @@ public class DefaultSourceLocator implements IPersistableSourceLocator, IAdaptab
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)

2
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
View file

@ -384,7 +384,7 @@ public class CMainTab extends CLaunchConfigurationTab {
name = getLaunchConfigurationDialog().generateName(name);
config.rename(name);
} else {
String name = getLaunchConfigurationDialog().generateName(cElement.getElementName());
String name = getLaunchConfigurationDialog().generateName(cElement.getCProject().getElementName());
config.rename(name);
}
}

9
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java
View file

@ -56,17 +56,18 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
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 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
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 )