mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 07:25:23 +02:00
Code Issues Wiki Activity

Fix for bug 66015: I18N: English "Debug Console" in Debug and Console views.

Browse source 
Warning cleanup.
This commit is contained in:
Mikhail Khodjaiants 2004-06-09 21:36:02 +00:00
parent 8d55216fb7
commit e8e773e868
5 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -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 2004-06-08 Alain Magloire
Make sure when something goes wrong before Make sure when something goes wrong before
getting out the launch sequence to terminate the session. getting out the launch sequence to terminate the session.

7
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java
View file

@ -37,6 +37,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.dialogs.ElementListSelectionDialog; import org.eclipse.ui.dialogs.ElementListSelectionDialog;
@ -218,7 +219,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut {
dialog.setMultipleSelection(false); dialog.setMultipleSelection(false);
int result = dialog.open(); int result = dialog.open();
provider.dispose(); provider.dispose();
if (result == ElementListSelectionDialog.OK) { if (result == Window.OK) {
return (ICDebugConfiguration) dialog.getFirstResult(); return (ICDebugConfiguration) dialog.getFirstResult();
} }
return null; return null;
@ -251,7 +252,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut {
dialog.setMultipleSelection(false); dialog.setMultipleSelection(false);
int result = dialog.open(); int result = dialog.open();
labelProvider.dispose(); labelProvider.dispose();
if (result == ElementListSelectionDialog.OK) { if (result == Window.OK) {
return (ILaunchConfiguration) dialog.getFirstResult(); return (ILaunchConfiguration) dialog.getFirstResult();
} }
return null; return null;
@ -308,7 +309,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut {
dialog.setUpperListLabel(LaunchUIPlugin.getResourceString("Launch.common.BinariesColon")); //$NON-NLS-1$ dialog.setUpperListLabel(LaunchUIPlugin.getResourceString("Launch.common.BinariesColon")); //$NON-NLS-1$
dialog.setLowerListLabel(LaunchUIPlugin.getResourceString("Launch.common.QualifierColon")); //$NON-NLS-1$ dialog.setLowerListLabel(LaunchUIPlugin.getResourceString("Launch.common.QualifierColon")); //$NON-NLS-1$
dialog.setMultipleSelection(false); dialog.setMultipleSelection(false);
if (dialog.open() == ElementListSelectionDialog.OK) { if (dialog.open() == Window.OK) {
return (IBinary) dialog.getFirstResult(); return (IBinary) dialog.getFirstResult();
} }

2
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
View file

@ -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$ abort(LaunchUIPlugin.getResourceString("CoreFileLaunchDelegate.Failed_Launching_CDI_Debugger"), e, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
} }
if ( debugger != null ) { 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); // launch.removeProcess(debuggerProcess);
} }
// set the source locator // set the source locator

9
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
View file

@ -11,7 +11,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Properties; import java.util.Properties;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IProcessInfo; import org.eclipse.cdt.core.IProcessInfo;
import org.eclipse.cdt.core.IProcessList; 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.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.IStatusHandler; import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.IProcess;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.dialogs.TwoPaneElementSelector; import org.eclipse.ui.dialogs.TwoPaneElementSelector;
/** /**
@ -99,8 +99,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0])); IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
debugger = dsession.getSessionProcess(); debugger = dsession.getSessionProcess();
if ( debugger != null ) { if ( debugger != null ) {
debuggerProcess = DebugPlugin.newProcess(launch, debugger, "Debug Console"); //$NON-NLS-1$ debuggerProcess = DebugPlugin.newProcess(launch, debugger, LaunchUIPlugin.getResourceString("LocalCLaunchConfigurationDelegate.Debugger_Process")); //$NON-NLS-1$
// launch.removeProcess(debuggerProcess);
} }
boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
CDebugModel.newDebugTarget( CDebugModel.newDebugTarget(
@ -206,7 +205,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
return; return;
} }
dialog.setElements(plist.getProcessList()); dialog.setElements(plist.getProcessList());
if (dialog.open() == ElementListSelectionDialog.OK) { if (dialog.open() == Window.OK) {
IProcessInfo info = (IProcessInfo) dialog.getFirstResult(); IProcessInfo info = (IProcessInfo) dialog.getFirstResult();
if ( info != null ) { if ( info != null ) {
pid[0] = info.getPid(); pid[0] = info.getPid();

2
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties
View file

@ -24,12 +24,14 @@ LocalCLaunchConfigurationDelegate.Platform_cannot_list_processes=Current platfor
LocalCLaunchConfigurationDelegate.Error_starting_process=Error starting process LocalCLaunchConfigurationDelegate.Error_starting_process=Error starting process
LocalCLaunchConfigurationDelegate.Does_not_support_working_dir=Eclipse runtime does not support working directory 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.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.Launching_postmortem_debugger=Launching postmortem debugger
CoreFileLaunchDelegate.No_Corefile_selected=No Corefile selected CoreFileLaunchDelegate.No_Corefile_selected=No Corefile selected
CoreFileLaunchDelegate.Failed_Launching_CDI_Debugger=Failed Launching CDI Debugger CoreFileLaunchDelegate.Failed_Launching_CDI_Debugger=Failed Launching CDI Debugger
CoreFileLaunchDelegate.No_Shell_available_in_Launch=No Shell available in Launch CoreFileLaunchDelegate.No_Shell_available_in_Launch=No Shell available in Launch
CoreFileLaunchDelegate.Select_Corefile=Select Corefile CoreFileLaunchDelegate.Select_Corefile=Select Corefile
CoreFileLaunchDelegate.Debugger_Process=Debugger Process
CApplicationLaunchShortcut.Application_Launcher=Application Launcher CApplicationLaunchShortcut.Application_Launcher=Application Launcher
CApplicationLaunchShortcut.Launch_failed_no_binaries=Launch failed no binaries CApplicationLaunchShortcut.Launch_failed_no_binaries=Launch failed no binaries