diff options
author | Mikhail Khodjaiants | 2005-05-09 21:41:40 +0000 |
---|---|---|
committer | Mikhail Khodjaiants | 2005-05-09 21:41:40 +0000 |
commit | ff1dee0158246e72e9b82c4e48b0024d57a99673 (patch) | |
tree | 5ca946fc6c50156c5978f6a16df275a5a81a522e /launch | |
parent | 72807c0c5ff197044ac6bbbddeba3b4aee10d756 (diff) | |
download | org.eclipse.cdt-ff1dee0158246e72e9b82c4e48b0024d57a99673.tar.gz org.eclipse.cdt-ff1dee0158246e72e9b82c4e48b0024d57a99673.tar.xz org.eclipse.cdt-ff1dee0158246e72e9b82c4e48b0024d57a99673.zip |
Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform. Removed the old source lookup related classes and interfaces.
Diffstat (limited to 'launch')
6 files changed, 9 insertions, 131 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index b530a67dcb7..9ffedbf3218 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,12 @@ +2005-05-09 Mikhail Khodjaiants + Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform. + Removed the old source lookup related classes and interfaces. + * CoreFileLaunchConfigurationTabGroup.java + * LaunchMessages.properties + * LocalAttachLaunchConfigurationTabGroup.java + * LocalRunLaunchConfigurationTabGroup.java + - CSourceLookupTab.java + 2005-04-21 Mikhail Khodjaiants Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform. * CoreFileLaunchConfigurationTabGroup.java diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileLaunchConfigurationTabGroup.java index 4d2a7b4cee6..fda430ad965 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileLaunchConfigurationTabGroup.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileLaunchConfigurationTabGroup.java @@ -29,7 +29,6 @@ public class CoreFileLaunchConfigurationTabGroup extends AbstractLaunchConfigura ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { new CMainTab(), new CoreFileDebuggerTab(), -// new CSourceLookupTab(), new SourceLookupTab(), new CommonTab() }; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties index 5fe1a7ca8f8..5e6fbfc3d65 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties @@ -69,8 +69,6 @@ AbstractCDebuggerTab.ErrorLoadingDebuggerPage=Error Loading Debugger UI Componen LaunchUIPlugin.Error=Error -CSourceLookupTab.Source=Source - CMainTab.Project_required=Project required CMainTab.Enter_project_before_searching_for_program=Project must first be entered before searching for a program CMainTab.Program_Selection=Program Selection diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalAttachLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalAttachLaunchConfigurationTabGroup.java index 2e2845ddf21..9d4570c4621 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalAttachLaunchConfigurationTabGroup.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalAttachLaunchConfigurationTabGroup.java @@ -27,7 +27,6 @@ public class LocalAttachLaunchConfigurationTabGroup extends AbstractLaunchConfig ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { new CMainTab(), new CDebuggerTab(true), -// new CSourceLookupTab(), new SourceLookupTab(), new CommonTab() }; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalRunLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalRunLaunchConfigurationTabGroup.java index 707718b4972..0a5296a6d00 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalRunLaunchConfigurationTabGroup.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LocalRunLaunchConfigurationTabGroup.java @@ -30,7 +30,6 @@ public class LocalRunLaunchConfigurationTabGroup extends AbstractLaunchConfigura new CArgumentsTab(), new MigratingCEnvironmentTab(), new CDebuggerTab(false), -// new CSourceLookupTab(), new SourceLookupTab(), new CommonTab() }; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java deleted file mode 100644 index 16d903b1eac..00000000000 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java +++ /dev/null @@ -1,126 +0,0 @@ -/********************************************************************** - * Copyright (c) 2002 - 2004 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation -***********************************************************************/ -package org.eclipse.cdt.launch.ui; - -import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; -import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.cdt.debug.ui.sourcelookup.SourceLookupBlock; -import org.eclipse.cdt.launch.internal.ui.LaunchImages; -import org.eclipse.cdt.launch.internal.ui.LaunchMessages; -import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; -import org.eclipse.core.resources.IProject; -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.graphics.Image; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -/** - * Enter type comment. - * - * @since: Feb 13, 2003 - */ -public class CSourceLookupTab extends CLaunchConfigurationTab -{ - private SourceLookupBlock fBlock = null; - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl( Composite parent ) - { - Composite control = new Composite( parent, SWT.NONE ); - control.setLayout( new GridLayout() ); - setControl( control ); - - LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_SOURCELOOKUP_TAB); - - fBlock = new SourceLookupBlock(); - fBlock.createControl( control ); - fBlock.setLaunchConfigurationDialog( getLaunchConfigurationDialog() ); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) - */ - public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) - { - configuration.setAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, CDebugUIPlugin.getDefaultSourceLocatorID() ); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) - */ - public void initializeFrom( ILaunchConfiguration configuration ) - { - fBlock.initialize( configuration ); - } - - /* (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, CDebugUIPlugin.getDefaultSourceLocatorID() ); - IProject project = getProject( configuration ); - if ( project != null ) - fBlock.performApply( configuration ); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() - */ - public String getName() - { - return LaunchMessages.getString("CSourceLookupTab.Source"); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() - */ - public Image getImage() - { - return LaunchImages.get( LaunchImages.IMG_VIEW_SOURCE_TAB ); - } - - private IProject getProject( ILaunchConfiguration configuration ) - { - IProject project = null; - try - { - String projectName = configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "" ); //$NON-NLS-1$ - if ( !isEmpty( projectName ) ) - project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName ); - } - catch( CoreException e ) - { - } - return project; - } - - private boolean isEmpty( String string ) - { - return string == null || string.length() == 0; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() - */ - public void dispose() - { - if ( fBlock != null ) - fBlock.dispose(); - super.dispose(); - } -} |