diff options
Diffstat (limited to 'launch/org.eclipse.cdt.launch')
5 files changed, 18 insertions, 6 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index 468068fb4de..87e8a4337ce 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,4 +1,11 @@ 2004-05-09 Mikhail Khodjaiants + Added the rendering method for debugger processes. + * src/org/eclise/cdt/launch/AbstractCLaunchDelegate.java + * 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 + +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 diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index f29d39748ba..e01824e1a80 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -390,6 +390,13 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat return MessageFormat.format(format, new String[]{commandLine, timestamp}); } + // temporary fix for #66015 + protected String renderDebuggerProcessLabel() { + String format = "{0} ({1})"; //$NON-NLS-1$ + String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis())); + return MessageFormat.format(format, new String[]{LaunchUIPlugin.getResourceString("AbstractCLaunchDelegate.Debugger_Process"), timestamp}); //$NON-NLS-1$ + } + protected ICProject verifyCProject(ILaunchConfiguration config) throws CoreException { String name = getProjectName(config); if (name == null) { 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 b59ebb4cb1c..8fd077c4727 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,8 +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, LaunchUIPlugin.getResourceString("CoreFileLaunchDelegate.Debugger_Process")); //$NON-NLS-1$ -// launch.removeProcess(debuggerProcess); + debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel()); } // set the source locator setSourceLocator(launch, config); 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 675f99cab2e..20be372f413 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 @@ -99,7 +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, LaunchUIPlugin.getResourceString("LocalCLaunchConfigurationDelegate.Debugger_Process")); //$NON-NLS-1$ + debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel()); } boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); CDebugModel.newDebugTarget( @@ -121,7 +121,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate { dsession = debugConfig.getDebugger().createAttachSession(config, exeFile, pid); debugger = dsession.getSessionProcess(); if ( debugger != null ) { - debuggerProcess = DebugPlugin.newProcess(launch, debugger, "Debug Console"); //$NON-NLS-1$ + debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel()); launch.removeProcess(debuggerProcess); } CDebugModel.newAttachDebugTarget( 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 08c653bac84..43ae4b5db35 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 @@ -9,6 +9,7 @@ AbstractCLaunchDelegate.Project_NAME_does_not_exist=Project {0} does not exist AbstractCLaunchDelegate.Project_NAME_is_closed=Project {0} is closed AbstractCLaunchDelegate.PROGRAM_PATH_not_found={0} not found AbstractCLaunchDelegate.PROGRAM_PATH_does_not_exist={0} Does not exist. +AbstractCLaunchDelegate.Debugger_Process=Debugger Process AbstractCLaunchConfigurationDelegate.building_projects=Building prerequisite project list AbstractCLaunchConfigurationDelegate.building=Building AbstractCLaunchConfigurationDelegate.searching_for_errors=Searching for compile errors @@ -24,14 +25,12 @@ 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 |