fix source locator

launch/org.eclipse.cdt.launch/ChangeLog

@@ -1,3 +1,8 @@
+2003-02-20 Mikhail Khodjaiants
+	The generation of launch configuration shouldn't fail if project is not set or project name is empty.
+	* DefaultSourceLocator.java
+	* CSourceLookupTab.java
+
 2003-02-18 Mikhail Khodjaiants
 	New 'Source Lookup' tab.
 	* plugin.xml

launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java

@@ -178,7 +178,7 @@ public class DefaultSourceLocator implements IPersistableSourceLocator, IAdaptab
 	private IProject getProject( ILaunchConfiguration configuration ) throws CoreException
 	{
 		String projectName = configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null );
-		if ( projectName != null )
+		if ( !isEmpty( projectName ) )
 		{
 			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName );
 			if ( project.exists() )

launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java

@@ -106,10 +106,9 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		String configPlatform = getPlatform(config);
 		String programCPU = "native";
 		ICElement ce = getContext(config, configPlatform);
-		try {
+		if (ce instanceof IBinary) {
 			IBinary bin = (IBinary) ce;
 			programCPU = bin.getCPU();
-		} catch (Exception e) {
 		}
 		fDCombo.removeAll();
 		debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
@@ -246,10 +245,9 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		String projectPlatform = getPlatform(config);
 		String projectCPU = "native";
 		if (ce != null) {
-			try {
+			if (ce instanceof IBinary) {
 				IBinary bin = (IBinary) ce;
 				projectCPU = bin.getCPU();
-			} catch (Exception e) {
 			}
 		}
 		ICDebugConfiguration debugConfig = getDebugConfig();

launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java

@@ -7,7 +7,6 @@ package org.eclipse.cdt.launch.ui;
 
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
-import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.cdt.debug.ui.sourcelookup.SourceLookupBlock;
 import org.eclipse.cdt.launch.sourcelookup.DefaultSourceLocator;
 import org.eclipse.core.resources.IProject;
@@ -15,6 +14,8 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -31,10 +32,12 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
 	 */
 	public void createControl( Composite parent )
 	{
+		Composite control = new Composite( parent, SWT.NONE );
+		control.setLayout( new GridLayout() );
 		fBlock = new SourceLookupBlock();
-		fBlock.createControl( parent );
+		fBlock.createControl( control );
 		fBlock.setLaunchConfigurationDialog( getLaunchConfigurationDialog() );
-		setControl( fBlock.getControl() );
+		setControl( control );
 	}
 
 	/* (non-Javadoc)
@@ -43,22 +46,16 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
 	public void setDefaults( ILaunchConfigurationWorkingCopy configuration )
 	{
 		configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, DefaultSourceLocator.ID_DEFAULT_SOURCE_LOCATOR );
-		DefaultSourceLocator locator = new DefaultSourceLocator();
-		try
-		{
-			locator.initializeDefaults( configuration );
-			configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, locator.getMemento() );
-		}
-		catch( CoreException e )
-		{
-			CDebugUIPlugin.log( e.getStatus() );
-		}
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
 	public void initializeFrom( ILaunchConfiguration configuration )
+	{
+		IProject project = getProject( configuration );
+		fBlock.setProject( getProject( configuration ) );
+		if ( project != null )
 		{
 			try
 			{
@@ -77,18 +74,23 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
 					}
 					ICSourceLocator clocator = (ICSourceLocator)locator.getAdapter( ICSourceLocator.class );
 					if ( clocator != null )
-					fBlock.initialize( clocator.getSourceLocations() );
+						fBlock.initialize( clocator );
 				}
 			}
 			catch( CoreException e )
 			{
 			}
 		}
+	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
 	public void performApply( ILaunchConfigurationWorkingCopy configuration )
+	{
+		configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, DefaultSourceLocator.ID_DEFAULT_SOURCE_LOCATOR );
+		IProject project = getProject( configuration );
+		if ( project != null )
 		{
 			DefaultSourceLocator locator = new DefaultSourceLocator();
 			try
@@ -97,20 +99,20 @@ public class CSourceLookupTab extends CLaunchConfigurationTab
 				ICSourceLocator clocator = (ICSourceLocator)locator.getAdapter( ICSourceLocator.class );
 				if ( clocator != null )
 					clocator.setSourceLocations( fBlock.getSourceLocations() );
-			configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, DefaultSourceLocator.ID_DEFAULT_SOURCE_LOCATOR );
 				configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, locator.getMemento() );
 			}
 			catch( CoreException e )
 			{
 			}
 		}
+	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
 	public String getName()
 	{
-		return "Source Lookup";
+		return "Source";
 	}
 
 	private IProject getProject( ILaunchConfiguration configuration )