From e8e773e8680f1e06b1c256296f903e43698bd55d Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 9 Jun 2004 21:36:02 +0000 Subject: [PATCH] Fix for bug 66015: I18N: English "Debug Console" in Debug and Console views. Warning cleanup. --- launch/org.eclipse.cdt.launch/ChangeLog | 8 ++++++++ .../cdt/launch/internal/CApplicationLaunchShortcut.java | 7 ++++--- .../cdt/launch/internal/CoreFileLaunchDelegate.java | 2 +- .../internal/LocalCLaunchConfigurationDelegate.java | 9 ++++----- .../internal/ui/LaunchUIPluginResources.properties | 2 ++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index 7da2af8ce06..468068fb4de 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,11 @@ +2004-05-09 Mikhail Khodjaiants + Fix for bug 66015: I18N: English "Debug Console" in Debug and Console views. + Warning cleanup. + * src/org/eclise/cdt/launch/internal/CoreFileLaunchDelegate.java + * src/org/eclise/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java + * src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties + * src/org/eclise/cdt/launch/internal/CApplicationLaunchShortcut.java + 2004-06-08 Alain Magloire Make sure when something goes wrong before getting out the launch sequence to terminate the session. diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java index 60c5465befa..e91eb7fc3b5 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java @@ -37,6 +37,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.dialogs.ElementListSelectionDialog; @@ -218,7 +219,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut { dialog.setMultipleSelection(false); int result = dialog.open(); provider.dispose(); - if (result == ElementListSelectionDialog.OK) { + if (result == Window.OK) { return (ICDebugConfiguration) dialog.getFirstResult(); } return null; @@ -251,7 +252,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut { dialog.setMultipleSelection(false); int result = dialog.open(); labelProvider.dispose(); - if (result == ElementListSelectionDialog.OK) { + if (result == Window.OK) { return (ILaunchConfiguration) dialog.getFirstResult(); } return null; @@ -308,7 +309,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut { dialog.setUpperListLabel(LaunchUIPlugin.getResourceString("Launch.common.BinariesColon")); //$NON-NLS-1$ dialog.setLowerListLabel(LaunchUIPlugin.getResourceString("Launch.common.QualifierColon")); //$NON-NLS-1$ dialog.setMultipleSelection(false); - if (dialog.open() == ElementListSelectionDialog.OK) { + if (dialog.open() == Window.OK) { return (IBinary) dialog.getFirstResult(); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java index 864e67c47a3..b59ebb4cb1c 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java @@ -67,7 +67,7 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate { abort(LaunchUIPlugin.getResourceString("CoreFileLaunchDelegate.Failed_Launching_CDI_Debugger"), e, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$ } if ( debugger != null ) { - debuggerProcess = DebugPlugin.newProcess(launch, debugger, "Debug Console"); //$NON-NLS-1$ + debuggerProcess = DebugPlugin.newProcess(launch, debugger, LaunchUIPlugin.getResourceString("CoreFileLaunchDelegate.Debugger_Process")); //$NON-NLS-1$ // launch.removeProcess(debuggerProcess); } // set the source locator diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java index c401fa68957..675f99cab2e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.Properties; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IProcessInfo; import org.eclipse.cdt.core.IProcessList; @@ -39,14 +38,15 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.IStatusHandler; +import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; import org.eclipse.debug.core.model.IProcess; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.dialogs.ElementListSelectionDialog; import org.eclipse.ui.dialogs.TwoPaneElementSelector; /** @@ -99,8 +99,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate { IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0])); debugger = dsession.getSessionProcess(); if ( debugger != null ) { - debuggerProcess = DebugPlugin.newProcess(launch, debugger, "Debug Console"); //$NON-NLS-1$ -// launch.removeProcess(debuggerProcess); + debuggerProcess = DebugPlugin.newProcess(launch, debugger, LaunchUIPlugin.getResourceString("LocalCLaunchConfigurationDelegate.Debugger_Process")); //$NON-NLS-1$ } boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); CDebugModel.newDebugTarget( @@ -206,7 +205,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate { return; } dialog.setElements(plist.getProcessList()); - if (dialog.open() == ElementListSelectionDialog.OK) { + if (dialog.open() == Window.OK) { IProcessInfo info = (IProcessInfo) dialog.getFirstResult(); if ( info != null ) { pid[0] = info.getPid(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties index 4110750ee03..08c653bac84 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties @@ -24,12 +24,14 @@ LocalCLaunchConfigurationDelegate.Platform_cannot_list_processes=Current platfor LocalCLaunchConfigurationDelegate.Error_starting_process=Error starting process LocalCLaunchConfigurationDelegate.Does_not_support_working_dir=Eclipse runtime does not support working directory LocalCLaunchConfigurationDelegate.Select_Process_to_attach_debugger_to=Select a Process to attach debugger to: +LocalCLaunchConfigurationDelegate.Debugger_Process=Debugger Process CoreFileLaunchDelegate.Launching_postmortem_debugger=Launching postmortem debugger CoreFileLaunchDelegate.No_Corefile_selected=No Corefile selected CoreFileLaunchDelegate.Failed_Launching_CDI_Debugger=Failed Launching CDI Debugger CoreFileLaunchDelegate.No_Shell_available_in_Launch=No Shell available in Launch CoreFileLaunchDelegate.Select_Corefile=Select Corefile +CoreFileLaunchDelegate.Debugger_Process=Debugger Process CApplicationLaunchShortcut.Application_Launcher=Application Launcher CApplicationLaunchShortcut.Launch_failed_no_binaries=Launch failed no binaries