From 6b134ee043021fbec38643bda70171b481d02500 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 21 Apr 2015 10:03:11 -0400 Subject: [PATCH] Bug 464636 - Move CMainTab from o.e.cdt.dsf.gdb to o.e.cdt.launch.CMainTab2 Change-Id: I5f0cf6d03858e78d95da5356dad36930ed4877b2 Signed-off-by: Marc Khouzam --- .../META-INF/MANIFEST.MF | 2 +- debug/org.eclipse.cdt.debug.core/pom.xml | 2 +- .../ICDTLaunchConfigurationConstants.java | 31 ++++- .../META-INF/MANIFEST.MF | 2 +- launch/org.eclipse.cdt.launch/pom.xml | 2 +- .../launch/internal/ui/LaunchMessages.java | 13 +- .../internal/ui/LaunchMessages.properties | 21 +++- .../org/eclipse/cdt/launch/ui/CMainTab2.java | 116 +++++++++--------- 8 files changed, 120 insertions(+), 69 deletions(-) rename dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java => launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab2.java (80%) diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index c1a8700f16e..4bcbc34df4f 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.core/pom.xml b/debug/org.eclipse.cdt.debug.core/pom.xml index 64518765427..73b2e23ba0c 100644 --- a/debug/org.eclipse.cdt.debug.core/pom.xml +++ b/debug/org.eclipse.cdt.debug.core/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 7.6.0-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.cdt.debug.core eclipse-plugin diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java index 7daa69733b6..4b8b4c5ea21 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. + * Copyright (c) 2000, 2015 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ * Ken Ryall (Nokia) - bug 118894 * Ken Ryall (Nokia) - bug 178731 * Alex Collins (Broadcom Corp.) - choose build config automatically + * Marc Khouzam (Ericsson) - Migrate dsf.gdb's CMainTab to cdt.launch CMainTab2 *******************************************************************************/ package org.eclipse.cdt.debug.core; @@ -276,6 +277,12 @@ public interface ICDTLaunchConfigurationConstants { */ public static final String ATTR_DEBUGGER_MEMORY_BLOCKS = CDT_LAUNCH_ID + ".MEMORY_BLOCKS"; //$NON-NLS-1$ + /** + * Launch configuration attribute key. The value is a String specifying the type of post mortem launch. + * @since 7.7 + */ + public static final String ATTR_DEBUGGER_POST_MORTEM_TYPE = CDT_LAUNCH_ID + ".POST_MORTEM_TYPE"; //$NON-NLS-1$ + /** * Launch configuration attribute value. The key is * ATTR_DEBUGGER_STOP_AT_MAIN. @@ -306,6 +313,28 @@ public interface ICDTLaunchConfigurationConstants { */ public static String DEBUGGER_MODE_CORE = "core"; //$NON-NLS-1$ + /** + * Possible attribute value for the key is ATTR_DEBUGGER_POST_MORTEM_TYPE. + * Indicates a core file. + * + * @since 7.7 + */ + public static final String DEBUGGER_POST_MORTEM_CORE_FILE = "CORE_FILE"; //$NON-NLS-1$ + + /** + * Possible attribute value for the key is ATTR_DEBUGGER_POST_MORTEM_TYPE. + * Indicates a trace data file. + * + * @since 7.7 + */ + public static final String DEBUGGER_POST_MORTEM_TRACE_FILE = "TRACE_FILE"; //$NON-NLS-1$ + + /** + * Launch configuration attribute value. The key is ATTR_DEBUGGER_POST_MORTEM_TYPE. + * @since 7.7 + */ + public static final String DEBUGGER_POST_MORTEM_TYPE_DEFAULT = DEBUGGER_POST_MORTEM_CORE_FILE; + /** * Status code indicating that the Eclipse runtime does not support * launching a program with a working directory. This feature is only diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index 66f737441be..44484dc3f7c 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/launch/org.eclipse.cdt.launch/pom.xml b/launch/org.eclipse.cdt.launch/pom.xml index 5837dc3f671..621d11b3951 100644 --- a/launch/org.eclipse.cdt.launch/pom.xml +++ b/launch/org.eclipse.cdt.launch/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 7.2.0-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.cdt.launch eclipse-plugin diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java index 92aec31276d..d9216df2633 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 QNX Software Systems and others. + * Copyright (c) 2004, 2015 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * QNX Software Systems - initial API and implementation * Sergey Prigogin (Google) + * Marc Khouzam (Ericsson) - New strings for CMainTab2 *******************************************************************************/ package org.eclipse.cdt.launch.internal.ui; @@ -195,7 +196,15 @@ public class LaunchMessages extends NLS { public static String BuildErrPrompter_error_in_active_config; public static String BuildErrPrompter_error_in_referenced_project_specific; public static String BuildErrPrompter_error_in_referenced_project_active; - + public static String CMainTab2_File_does_not_exist; + public static String CMainTab2_CoreFile_type; + public static String CMainTab2_TraceFile_type; + public static String CMainTab2_CoreFile_path; + public static String CMainTab2_TraceFile_path; + public static String CMainTab2_Application_Selection; + public static String CMainTab2_Core_Selection; + public static String CMainTab2_Trace_Selection; + public static String CMainTab2_Post_mortem_file_type; private LaunchMessages() { } 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 b70eeb5f237..1a4ef7637aa 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 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2002, 2012 QNX Software Systems and others. +# Copyright (c) 2002, 2015 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,11 +7,12 @@ # # Contributors: # QNX Software Systems - Initial API and implementation -# Monta Vista - Joanne Woo - Bug 87556 +# Monta Vista - Joanne Woo - Bug 87556 # Nokia - Ken Ryall - Bug 118894 # Carlos O'Donnel (CodeSourcery) - Bug 218366 -# IBM Corporation -# Sergey Prigogin (Google) +# IBM Corporation +# Sergey Prigogin (Google) +# Marc Khouzam (Ericsson) - New strings for CMainTab2 ############################################################################### AbstractCLaunchDelegate_Debugger_not_installed=CDT Debugger not installed @@ -104,6 +105,16 @@ CMainTab_Workspace_settings_button_label=Use workspace settings CMainTab_Workspace_settings_button_tooltip=Use workspace settings CMainTab_Workspace_settings_link_label=Configure Workspace Settings... +CMainTab2_File_does_not_exist=File does not exist +CMainTab2_CoreFile_type=Core file +CMainTab2_TraceFile_type=Trace file +CMainTab2_CoreFile_path=Core file (leave blank or select root directory to trigger prompt): +CMainTab2_TraceFile_path=Trace data file (leave blank or select root directory to trigger prompt): +CMainTab2_Application_Selection=Application Selection +CMainTab2_Core_Selection=Core File Selection +CMainTab2_Trace_Selection=Trace File Selection +CMainTab2_Post_mortem_file_type=Post Mortem file type: + CDebuggerTab_Advanced_Options_Dialog_Title=Advanced Options CDebuggerTab_Stop_at_main_on_startup=Stop on startup at: CDebuggerTab_Automatically_track_values_of=Automatically track the values of @@ -208,4 +219,4 @@ ProjectRenameChange_saveFailed=Failed to save updated launch configuration "{0}" BuildErrPrompter_error_in_specific_config=Errors exist in project \"{0}\" having built not-active build configuration \"{1}\". Proceed with launch? BuildErrPrompter_error_in_active_config=Errors exist in the active configuration of project \"{0}\". Proceed with launch? BuildErrPrompter_error_in_referenced_project_specific=One or more projects referenced by project \"{0}\", build configuration \"{1}\" has build errors. See Problems view for details. Keep in mind that the errors may be in build configurations that are not the active ones. Continue anyway? -BuildErrPrompter_error_in_referenced_project_active=One or more projects referenced by the active configuration of project \"{0}\" has build errors. See Problems view for details. Keep in mind that the errors may be in build configurations that are not the active ones. Continue anyway? \ No newline at end of file +BuildErrPrompter_error_in_referenced_project_active=One or more projects referenced by the active configuration of project \"{0}\" has build errors. See Problems view for details. Keep in mind that the errors may be in build configurations that are not the active ones. Continue anyway? diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab2.java similarity index 80% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java rename to launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab2.java index abe5795f86d..95c0c13dee1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab2.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 QNX Software Systems and others. + * Copyright (c) 2008, 2015 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,8 +13,9 @@ * Marc Khouzam (Ericsson) - Support setting the path in which the core file * dialog should start (Bug 362039) * Anton Gorenkov + * Marc Khouzam (Ericsson) - Move from dsf.gdb to cdt.launch *******************************************************************************/ -package org.eclipse.cdt.dsf.gdb.internal.ui.launching; +package org.eclipse.cdt.launch.ui; import java.io.File; @@ -24,10 +25,9 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; -import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; -import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin; -import org.eclipse.cdt.dsf.gdb.launching.LaunchMessages; -import org.eclipse.cdt.launch.ui.CAbstractMainTab; +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.cdt.ui.CElementLabelProvider; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -66,9 +66,10 @@ import org.eclipse.ui.dialogs.TwoPaneElementSelector; *

* This class may be instantiated. This class is not intended to be subclassed. *

+ * @since 7.3 */ -public class CMainTab extends CAbstractMainTab { +public class CMainTab2 extends CAbstractMainTab { /** * Tab identifier used for ordering of tabs added using the @@ -77,10 +78,10 @@ public class CMainTab extends CAbstractMainTab { * * @since 2.0 */ - public static final String TAB_ID = "org.eclipse.cdt.dsf.gdb.launch.mainTab"; //$NON-NLS-1$ + public static final String TAB_ID = "org.eclipse.cdt.launch.mainTab2"; //$NON-NLS-1$ - private static final String CORE_FILE = LaunchMessages.getString("CMainTab.CoreFile_type"); //$NON-NLS-1$ - private static final String TRACE_FILE = LaunchMessages.getString("CMainTab.TraceFile_type"); //$NON-NLS-1$ + private static final String CORE_FILE = LaunchMessages.CMainTab2_CoreFile_type; + private static final String TRACE_FILE = LaunchMessages.CMainTab2_TraceFile_type; /** * Combo box to select which type of post mortem file should be used. @@ -98,11 +99,11 @@ public class CMainTab extends CAbstractMainTab { public static final int SPECIFY_CORE_FILE = 4; public static final int INCLUDE_BUILD_SETTINGS = 8; - public CMainTab() { + public CMainTab2() { this(INCLUDE_BUILD_SETTINGS); } - public CMainTab(int flags) { + public CMainTab2(int flags) { fDontCheckProgram = (flags & DONT_CHECK_PROGRAM) != 0; fSpecifyCoreFile = (flags & SPECIFY_CORE_FILE) != 0; fIncludeBuildSettings = (flags & INCLUDE_BUILD_SETTINGS) != 0; @@ -118,7 +119,7 @@ public class CMainTab extends CAbstractMainTab { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); - GdbUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB); + LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB); GridLayout topLayout = new GridLayout(); comp.setLayout(topLayout); @@ -135,7 +136,7 @@ public class CMainTab extends CAbstractMainTab { createCoreFileGroup(comp, 1); } - GdbUIPlugin.setDialogShell(parent.getShell()); + LaunchUIPlugin.setDialogShell(parent.getShell()); } protected void createExeFileGroup(Composite parent, int colSpan) { @@ -148,7 +149,7 @@ public class CMainTab extends CAbstractMainTab { gd.horizontalSpan = colSpan; mainComp.setLayoutData(gd); fProgLabel = new Label(mainComp, SWT.NONE); - fProgLabel.setText(LaunchMessages.getString("CMainTab.C/C++_Application")); //$NON-NLS-1$ + fProgLabel.setText(LaunchMessages.CMainTab_C_Application); gd = new GridData(); fProgLabel.setLayoutData(gd); fProgText = new Text(mainComp, SWT.SINGLE | SWT.BORDER); @@ -170,8 +171,8 @@ public class CMainTab extends CAbstractMainTab { buttonComp.setLayoutData(gd); buttonComp.setFont(parent.getFont()); - createVariablesButton(buttonComp, LaunchMessages.getString("CMainTab.Variables"), fProgText); //$NON-NLS-1$ - fSearchButton = createPushButton(buttonComp, LaunchMessages.getString("CMainTab.Search..."), null); //$NON-NLS-1$ + createVariablesButton(buttonComp, LaunchMessages.CMainTab_Variables, fProgText); + fSearchButton = createPushButton(buttonComp, LaunchMessages.CMainTab_Search, null); fSearchButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { @@ -181,11 +182,11 @@ public class CMainTab extends CAbstractMainTab { }); Button browseForBinaryButton; - browseForBinaryButton = createPushButton(buttonComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$ + browseForBinaryButton = createPushButton(buttonComp, LaunchMessages.Launch_common_Browse_2, null); browseForBinaryButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { - String text = handleBrowseButtonSelected(LaunchMessages.getString("CMaintab.Application_Selection")); //$NON-NLS-1$ + String text = handleBrowseButtonSelected(LaunchMessages.CMainTab2_Application_Selection); if (text != null) { fProgText.setText(text); } @@ -211,7 +212,7 @@ public class CMainTab extends CAbstractMainTab { coreComp.setLayoutData(gd); Label comboLabel = new Label(coreComp, SWT.NONE); - comboLabel.setText(LaunchMessages.getString("CMainTab.Post_mortem_file_type")); //$NON-NLS-1$ + comboLabel.setText(LaunchMessages.CMainTab2_Post_mortem_file_type); comboLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); fCoreTypeCombo = new Combo(coreComp, SWT.READ_ONLY | SWT.DROP_DOWN); @@ -232,19 +233,19 @@ public class CMainTab extends CAbstractMainTab { }); Button browseForCoreButton; - browseForCoreButton = createPushButton(coreComp, LaunchMessages.getString("Launch.common.Browse_3"), null); //$NON-NLS-1$ + browseForCoreButton = createPushButton(coreComp, LaunchMessages.Launch_common_Browse_3, null); browseForCoreButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { String text; String coreType = getSelectedCoreType(); - if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { - text = handleBrowseButtonSelected(LaunchMessages.getString("CMaintab.Core_Selection")); //$NON-NLS-1$ - } else if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { - text = handleBrowseButtonSelected(LaunchMessages.getString("CMaintab.Trace_Selection")); //$NON-NLS-1$ + if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { + text = handleBrowseButtonSelected(LaunchMessages.CMainTab2_Core_Selection); + } else if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { + text = handleBrowseButtonSelected(LaunchMessages.CMainTab2_Trace_Selection); } else { assert false : "Unknown core file type"; //$NON-NLS-1$ - text = handleBrowseButtonSelected(LaunchMessages.getString("CMaintab.Core_Selection")); //$NON-NLS-1$ + text = handleBrowseButtonSelected(LaunchMessages.CMainTab2_Core_Selection); } if (text != null) { @@ -301,18 +302,18 @@ public class CMainTab extends CAbstractMainTab { protected void updateCoreFromConfig(ILaunchConfiguration config) { if (fCoreText != null) { String coreName = EMPTY_STRING; - String coreType = IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TYPE_DEFAULT; + String coreType = ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TYPE_DEFAULT; try { coreName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, EMPTY_STRING); - coreType = config.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_POST_MORTEM_TYPE, - IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TYPE_DEFAULT); + coreType = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_POST_MORTEM_TYPE, + ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TYPE_DEFAULT); } catch (CoreException ce) { - GdbUIPlugin.log(ce); + LaunchUIPlugin.log(ce); } fCoreText.setText(coreName); - if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { + if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { fCoreTypeCombo.setText(CORE_FILE); - } else if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { + } else if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { fCoreTypeCombo.setText(TRACE_FILE); } else { assert false : "Unknown core file type"; //$NON-NLS-1$ @@ -326,25 +327,25 @@ public class CMainTab extends CAbstractMainTab { protected String getSelectedCoreType() { int selectedIndex = fCoreTypeCombo.getSelectionIndex(); if (fCoreTypeCombo.getItem(selectedIndex).equals(CORE_FILE)) { - return IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE; + return ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE; } else if (fCoreTypeCombo.getItem(selectedIndex).equals(TRACE_FILE)) { - return IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE; + return ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE; } else { assert false : "Unknown post mortem file type"; //$NON-NLS-1$ - return IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE; + return ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE; } } /** @since 2.1 */ protected void updateCoreFileLabel() { String coreType = getSelectedCoreType(); - if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { - fCoreLabel.setText(LaunchMessages.getString("CMainTab.CoreFile_path")); //$NON-NLS-1$ - } else if (coreType.equals(IGDBLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { - fCoreLabel.setText(LaunchMessages.getString("CMainTab.TraceFile_path")); //$NON-NLS-1$ + if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_CORE_FILE)) { + fCoreLabel.setText(LaunchMessages.CMainTab2_CoreFile_path); + } else if (coreType.equals(ICDTLaunchConfigurationConstants.DEBUGGER_POST_MORTEM_TRACE_FILE)) { + fCoreLabel.setText(LaunchMessages.CMainTab2_TraceFile_path); } else { assert false : "Unknown post mortem file type"; //$NON-NLS-1$ - fCoreLabel.setText(LaunchMessages.getString("CMainTab.CoreFile_path")); //$NON-NLS-1$ + fCoreLabel.setText(LaunchMessages.CMainTab2_CoreFile_path); } } @@ -368,7 +369,7 @@ public class CMainTab extends CAbstractMainTab { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText()); if (fCoreText != null) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, fCoreText.getText()); - config.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_POST_MORTEM_TYPE, getSelectedCoreType()); + config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_POST_MORTEM_TYPE, getSelectedCoreType()); } } @@ -378,8 +379,9 @@ public class CMainTab extends CAbstractMainTab { @Override protected void handleSearchButtonSelected() { if (getCProject() == null) { - MessageDialog.openInformation(getShell(), LaunchMessages.getString("CMainTab.Project_required"), //$NON-NLS-1$ - LaunchMessages.getString("CMainTab.Enter_project_before_searching_for_program")); //$NON-NLS-1$ + MessageDialog.openInformation(getShell(), LaunchMessages.CMainTab_Project_required, + LaunchMessages.CMainTab_Enter_project_before_searching_for_program); + return; } @@ -430,10 +432,10 @@ public class CMainTab extends CAbstractMainTab { TwoPaneElementSelector dialog = new TwoPaneElementSelector(getShell(), programLabelProvider, qualifierLabelProvider); dialog.setElements(getBinaryFiles(getCProject())); - dialog.setMessage(LaunchMessages.getString("CMainTab.Choose_program_to_run")); //$NON-NLS-1$ - dialog.setTitle(LaunchMessages.getString("CMainTab.Program_Selection")); //$NON-NLS-1$ - dialog.setUpperListLabel(LaunchMessages.getString("Launch.common.BinariesColon")); //$NON-NLS-1$ - dialog.setLowerListLabel(LaunchMessages.getString("Launch.common.QualifierColon")); //$NON-NLS-1$ + dialog.setMessage(LaunchMessages.CMainTab_Choose_program_to_run); + dialog.setTitle(LaunchMessages.CMainTab_Program_Selection); + dialog.setUpperListLabel(LaunchMessages.Launch_common_BinariesColon); + dialog.setLowerListLabel(LaunchMessages.Launch_common_QualifierColon); dialog.setMultipleSelection(false); // dialog.set if (dialog.open() == Window.OK) { @@ -460,11 +462,11 @@ public class CMainTab extends CAbstractMainTab { // Silently ignore substitution failure (for consistency with "Arguments" and "Work directory" fields) } if (programName.length() == 0) { - setErrorMessage(LaunchMessages.getString("CMainTab.Program_not_specified")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Program_not_specified); return false; } if (programName.equals(".") || programName.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$ - setErrorMessage(LaunchMessages.getString("CMainTab.Program_does_not_exist")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Program_does_not_exist); return false; } IPath exePath = new Path(programName); @@ -473,31 +475,31 @@ public class CMainTab extends CAbstractMainTab { // as long as it exists File executable = exePath.toFile(); if (!executable.exists()) { - setErrorMessage(LaunchMessages.getString("CMainTab.Program_does_not_exist")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Program_does_not_exist); return false; } if (!executable.isFile()) { - setErrorMessage(LaunchMessages.getString("CMainTab.Selection_must_be_file")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Selection_must_be_file); return false; } } else { // For relative paths, we need a proper project String projectName = fProjText.getText().trim(); if (projectName.length() == 0) { - setErrorMessage(LaunchMessages.getString("CMainTab.Project_not_specified")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Project_not_specified); return false; } IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); if (!project.exists()) { - setErrorMessage(LaunchMessages.getString("Launch.common.Project_does_not_exist")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.Launch_common_Project_does_not_exist); return false; } if (!project.isOpen()) { - setErrorMessage(LaunchMessages.getString("CMainTab.Project_must_be_opened")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Project_must_be_opened); return false; } if (!project.getFile(programName).exists()) { - setErrorMessage(LaunchMessages.getString("CMainTab.Program_does_not_exist")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab_Program_does_not_exist); return false; } } @@ -526,7 +528,7 @@ public class CMainTab extends CAbstractMainTab { if (!filePath.isDirectory()) { IPath corePath = new Path(coreName); if (!corePath.toFile().exists()) { - setErrorMessage(LaunchMessages.getString("CMainTab.File_does_not_exist")); //$NON-NLS-1$ + setErrorMessage(LaunchMessages.CMainTab2_File_does_not_exist); return false; } } @@ -636,7 +638,7 @@ public class CMainTab extends CAbstractMainTab { */ @Override public String getName() { - return LaunchMessages.getString("CMainTab.Main"); //$NON-NLS-1$ + return LaunchMessages.CMainTab_Main; } /*