mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

Applied patch from Tanya Wolff.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-03-12 17:00:31 +00:00
parent 0e48c01b6a
commit ea9c355889
12 changed files with 273 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
View file

@ -1,3 +1,16 @@
2004-03-11 Tanya Wolff
Externalized strings and marked non translatable as such.
* CygwinDebuggerPage.java
* GDBDebuggerPage.java
* GDBServerDebuggerPage.java
* GDBSolibBlock.java
* MIUIPlugin.java
* SolibSearchPathBlock.java
* TCPSettingsBlock.java
* MIUIPluginResources.properties
* SetAutoSolibActionDelegate.java
* MIPreferencePage.java
2003-12-17 Mikhail Khodjaiants 2003-12-17 Mikhail Khodjaiants
Fix for bug 49061: Different values are used as default for the "Load shared library symbols automatically" option. Fix for bug 49061: Different values are used as default for the "Load shared library symbols automatically" option.
* GDBSolibBlock.java * GDBSolibBlock.java

3
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java
View file

@ -5,13 +5,14 @@
package org.eclipse.cdt.debug.mi.internal.ui; package org.eclipse.cdt.debug.mi.internal.ui;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
public class CygwinDebuggerPage extends GDBDebuggerPage public class CygwinDebuggerPage extends GDBDebuggerPage
{ {
public String getName() public String getName()
{ {
return "Cygwin GDB Debugger Options"; return MIUIPlugin.getResourceString("internal.ui.CygwinDebuggerPage.Cygwin_GDB_Debugger_Options"); //$NON-NLS-1$
} }
/* (non-Javadoc) /* (non-Javadoc)

35
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java
View file

@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements Observer public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements Observer
{ {
@ -54,8 +55,8 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) public void setDefaults( ILaunchConfigurationWorkingCopy configuration )
{ {
configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb" ); configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb" ); //$NON-NLS-1$
configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, "" ); configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, "" ); //$NON-NLS-1$
if ( fSolibBlock != null ) if ( fSolibBlock != null )
fSolibBlock.setDefaults( configuration ); fSolibBlock.setDefaults( configuration );
} }
@ -73,7 +74,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
} }
else else
{ {
setErrorMessage( "Debugger executable must be specified" ); setErrorMessage( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Debugger_exec_must_be_specified") ); //$NON-NLS-1$
setMessage( null ); setMessage( null );
} }
return valid; return valid;
@ -81,12 +82,12 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
public void initializeFrom( ILaunchConfiguration configuration ) public void initializeFrom( ILaunchConfiguration configuration )
{ {
String gdbCommand = "gdb"; String gdbCommand = "gdb"; //$NON-NLS-1$
String gdbInit = ""; String gdbInit = ""; //$NON-NLS-1$
try try
{ {
gdbCommand = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb" ); gdbCommand = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb" ); //$NON-NLS-1$
gdbInit = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, "" ); gdbInit = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, "" ); //$NON-NLS-1$
} }
catch( CoreException e ) catch( CoreException e )
{ {
@ -111,7 +112,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
public String getName() public String getName()
{ {
return "GDB Debugger Options"; return MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_Debugger_Options"); //$NON-NLS-1$
} }
/** /**
@ -154,7 +155,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
public void createMainTab( TabFolder tabFolder ) public void createMainTab( TabFolder tabFolder )
{ {
TabItem tabItem = new TabItem( tabFolder, SWT.NONE ); TabItem tabItem = new TabItem( tabFolder, SWT.NONE );
tabItem.setText( "Main" ); tabItem.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Main") ); //$NON-NLS-1$
Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH ); Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH );
((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false;
@ -163,7 +164,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
Composite subComp = ControlFactory.createCompositeEx( comp, 3, GridData.FILL_HORIZONTAL ); Composite subComp = ControlFactory.createCompositeEx( comp, 3, GridData.FILL_HORIZONTAL );
((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false;
Label label = ControlFactory.createLabel( subComp, "GDB debugger:" ); Label label = ControlFactory.createLabel( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_debugger")+':' ); //$NON-NLS-1$
GridData gd = new GridData(); GridData gd = new GridData();
// gd.horizontalSpan = 2; // gd.horizontalSpan = 2;
label.setLayoutData( gd ); label.setLayoutData( gd );
@ -178,7 +179,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
} }
} ); } );
Button button = createPushButton( subComp, "&Browse...", null ); Button button = createPushButton( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Browse"), null ); //$NON-NLS-1$
button.addSelectionListener( button.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -191,7 +192,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
private void handleGDBButtonSelected() private void handleGDBButtonSelected()
{ {
FileDialog dialog = new FileDialog( getShell(), SWT.NONE ); FileDialog dialog = new FileDialog( getShell(), SWT.NONE );
dialog.setText( "GDB Command File" ); dialog.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_Debugger") ); //$NON-NLS-1$
String gdbCommand = fGDBCommandText.getText().trim(); String gdbCommand = fGDBCommandText.getText().trim();
int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator ); int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator );
if ( lastSeparatorIndex != -1 ) if ( lastSeparatorIndex != -1 )
@ -207,7 +208,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
} }
} ); } );
label = ControlFactory.createLabel( subComp, "GDB command file:" ); label = ControlFactory.createLabel( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_command_file")+':' ); //$NON-NLS-1$
gd = new GridData(); gd = new GridData();
// gd.horizontalSpan = 2; // gd.horizontalSpan = 2;
label.setLayoutData( gd ); label.setLayoutData( gd );
@ -222,7 +223,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
} ); } );
button = createPushButton( subComp, "&Browse...", null ); button = createPushButton( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Browse"), null ); //$NON-NLS-1$
button.addSelectionListener( button.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -235,7 +236,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
private void handleGDBInitButtonSelected() private void handleGDBInitButtonSelected()
{ {
FileDialog dialog = new FileDialog( getShell(), SWT.NONE ); FileDialog dialog = new FileDialog( getShell(), SWT.NONE );
dialog.setText( "GDB command file" ); dialog.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_Command_File") ); //$NON-NLS-1$
String gdbCommand = fGDBInitText.getText().trim(); String gdbCommand = fGDBInitText.getText().trim();
int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator ); int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator );
if ( lastSeparatorIndex != -1 ) if ( lastSeparatorIndex != -1 )
@ -252,7 +253,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
} ); } );
label = ControlFactory.createLabel( comp, label = ControlFactory.createLabel( comp,
"(Warning: Some commands in this file may interfere with the startup operation of the debugger, for example \"run\".)", MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Warning_startup_operation_interference"), //$NON-NLS-1$
200, 200,
SWT.DEFAULT, SWT.DEFAULT,
SWT.WRAP ); SWT.WRAP );
@ -265,7 +266,7 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab implements O
public void createSolibTab( TabFolder tabFolder ) public void createSolibTab( TabFolder tabFolder )
{ {
TabItem tabItem = new TabItem( tabFolder, SWT.NONE ); TabItem tabItem = new TabItem( tabFolder, SWT.NONE );
tabItem.setText( "Shared Libraries" ); tabItem.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Shared_libraries") ); //$NON-NLS-1$
Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH ); Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH );
tabItem.setControl( comp ); tabItem.setControl( comp );

21
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java
View file

@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.TabItem;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -39,8 +40,8 @@ import org.eclipse.swt.widgets.TabItem;
*/ */
public class GDBServerDebuggerPage extends GDBDebuggerPage public class GDBServerDebuggerPage extends GDBDebuggerPage
{ {
private final static String CONNECTION_TCP = "TCP"; private final static String CONNECTION_TCP = MIUIPlugin.getResourceString("internal.ui.GDBServerDebuggerPage.TCP"); //$NON-NLS-1$
private final static String CONNECTION_SERIAL = "Serial"; private final static String CONNECTION_SERIAL = MIUIPlugin.getResourceString("internal.ui.GDBServerDebuggerPage.Serial"); //$NON-NLS-1$
private ComboDialogField fConnectionField; private ComboDialogField fConnectionField;
@ -62,7 +63,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
public void createMainTab( TabFolder tabFolder ) public void createMainTab( TabFolder tabFolder )
{ {
TabItem tabItem = new TabItem( tabFolder, SWT.NONE ); TabItem tabItem = new TabItem( tabFolder, SWT.NONE );
tabItem.setText( "Main" ); tabItem.setText( MIUIPlugin.getResourceString("internal.ui.GDBServerDebuggerPage.Main") ); //$NON-NLS-1$
Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH ); Composite comp = ControlFactory.createCompositeEx( fTabFolder, 1, GridData.FILL_BOTH );
((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false;
@ -71,7 +72,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
Composite subComp = ControlFactory.createCompositeEx( comp, 3, GridData.FILL_HORIZONTAL ); Composite subComp = ControlFactory.createCompositeEx( comp, 3, GridData.FILL_HORIZONTAL );
((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false;
Label label = ControlFactory.createLabel( subComp, "GDB debugger:" ); Label label = ControlFactory.createLabel( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_debugger") ); //$NON-NLS-1$
GridData gd = new GridData(); GridData gd = new GridData();
// gd.horizontalSpan = 2; // gd.horizontalSpan = 2;
label.setLayoutData( gd ); label.setLayoutData( gd );
@ -86,7 +87,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
} }
} ); } );
Button button = createPushButton( subComp, "&Browse...", null ); Button button = createPushButton( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Browse"), null ); //$NON-NLS-1$
button.addSelectionListener( button.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -99,7 +100,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
private void handleGDBButtonSelected() private void handleGDBButtonSelected()
{ {
FileDialog dialog = new FileDialog( getShell(), SWT.NONE ); FileDialog dialog = new FileDialog( getShell(), SWT.NONE );
dialog.setText( "GDB Command File" ); dialog.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_Debugger") ); //$NON-NLS-1$
String gdbCommand = fGDBCommandText.getText().trim(); String gdbCommand = fGDBCommandText.getText().trim();
int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator ); int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator );
if ( lastSeparatorIndex != -1 ) if ( lastSeparatorIndex != -1 )
@ -115,7 +116,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
} }
} ); } );
label = ControlFactory.createLabel( subComp, "GDB command file:" ); label = ControlFactory.createLabel( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_command_file")+':' ); //$NON-NLS-1$
gd = new GridData(); gd = new GridData();
// gd.horizontalSpan = 2; // gd.horizontalSpan = 2;
label.setLayoutData( gd ); label.setLayoutData( gd );
@ -130,7 +131,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
} ); } );
button = createPushButton( subComp, "&Browse...", null ); button = createPushButton( subComp, MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.Browse"), null ); //$NON-NLS-1$
button.addSelectionListener( button.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -143,7 +144,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
private void handleGDBInitButtonSelected() private void handleGDBInitButtonSelected()
{ {
FileDialog dialog = new FileDialog( getShell(), SWT.NONE ); FileDialog dialog = new FileDialog( getShell(), SWT.NONE );
dialog.setText( "GDB command file" ); dialog.setText( MIUIPlugin.getResourceString("internal.ui.GDBDebuggerPage.GDB_Command_File") ); //$NON-NLS-1$
String gdbCommand = fGDBInitText.getText().trim(); String gdbCommand = fGDBInitText.getText().trim();
int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator ); int lastSeparatorIndex = gdbCommand.lastIndexOf( File.separator );
if ( lastSeparatorIndex != -1 ) if ( lastSeparatorIndex != -1 )
@ -187,7 +188,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
private ComboDialogField createConnectionField() private ComboDialogField createConnectionField()
{ {
ComboDialogField field = new ComboDialogField( SWT.DROP_DOWN | SWT.READ_ONLY ); ComboDialogField field = new ComboDialogField( SWT.DROP_DOWN | SWT.READ_ONLY );
field.setLabelText( "Connection: " ); field.setLabelText( MIUIPlugin.getResourceString("internal.ui.GDBServerDebuggerPage.Connection"));//$NON-NLS-1$
field.setItems( fConnections ); field.setItems( fConnections );
field.setDialogFieldListener( field.setDialogFieldListener(
new IDialogFieldListener() new IDialogFieldListener()

7
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
View file

@ -21,6 +21,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -55,7 +56,7 @@ public class GDBSolibBlock extends Observable implements Observer
if ( autoSolib ) if ( autoSolib )
{ {
fAutoSoLibButton = ControlFactory.createCheckBox( subComp, "Load shared library symbols automatically" ); fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically") );
fAutoSoLibButton.addSelectionListener( fAutoSoLibButton.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -69,7 +70,7 @@ public class GDBSolibBlock extends Observable implements Observer
if ( stopOnSolibEvents ) if ( stopOnSolibEvents )
{ {
fStopOnSolibEventsButton = ControlFactory.createCheckBox( subComp, "Stop on shared library events" ); fStopOnSolibEventsButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Stop_on_shared_lib_events") ); //$NON-NLS-1$
fStopOnSolibEventsButton.addSelectionListener( fStopOnSolibEventsButton.addSelectionListener(
new SelectionAdapter() new SelectionAdapter()
{ {
@ -180,7 +181,7 @@ public class GDBSolibBlock extends Observable implements Observer
{ {
try try
{ {
boolean enable = !ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals( configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, "" ) ); boolean enable = !ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals( configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, "" ) ); //$NON-NLS-1$
if ( fAutoSoLibButton != null ) if ( fAutoSoLibButton != null )
fAutoSoLibButton.setEnabled( enable ); fAutoSoLibButton.setEnabled( enable );
if ( fStopOnSolibEventsButton != null ) if ( fStopOnSolibEventsButton != null )

22
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
View file

@ -12,19 +12,20 @@ public class MIUIPlugin extends AbstractUIPlugin {
//The shared instance. //The shared instance.
private static MIUIPlugin plugin; private static MIUIPlugin plugin;
//Resource bundle. //Resource bundle.
private ResourceBundle resourceBundle; private static ResourceBundle resourceBundle;
static {
try {
resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.debug.mi.internal.ui.MIUIPluginResources"); //$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
}
/** /**
* The constructor. * The constructor.
*/ */
public MIUIPlugin(IPluginDescriptor descriptor) { public MIUIPlugin(IPluginDescriptor descriptor) {
super(descriptor); super(descriptor);
plugin = this; plugin = this;
try {
resourceBundle= ResourceBundle.getBundle("org.eclipse.cdt.debug.mi.ui.UiPluginResources");
} catch (MissingResourceException x) {
resourceBundle = null;
}
} }
/** /**
@ -46,11 +47,12 @@ public class MIUIPlugin extends AbstractUIPlugin {
* or 'key' if not found. * or 'key' if not found.
*/ */
public static String getResourceString(String key) { public static String getResourceString(String key) {
ResourceBundle bundle= MIUIPlugin.getDefault().getResourceBundle();
try { try {
return bundle.getString(key); return resourceBundle.getString(key);
} catch (MissingResourceException e) { } catch (MissingResourceException e) {
return key; return '!' + key + '!';
} catch (NullPointerException e) {
return '#' + key + '#';
} }
} }

41
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPluginResources.properties Normal file
View file

@ -0,0 +1,41 @@
mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically=Load shared library symbols automatically
mi.internal.ui.GDBSolibBlock.Stop_on_shared_lib_events=Stop on shared library events
mi.internal.ui.SerialPortSettingsBlock.Device=Device:
mi.internal.ui.SerialPortSettingsBlock.Speed=Speed:
mi.internal.ui.SerialPortSettingsBlock.Device_must_be_specified=Device must be specified.
mi.internal.ui.SerialPortSettingsBlock.Invalid_device=Invalid device.
mi.internal.ui.SerialPortSettingsBlock.Speed_must_be_specified=Speed must be specified.
TCPSettingsBlock.Host_or_IP=Host name or IP address:
TCPSettingsBlock.Port=Port number:
TCPSettingsBlock.Host_or_IP_must_be_specified=Host name or IP address must be specified.
TCPSettingsBlock.Invalid_host_or_IP=Invalid host name or IP address.
TCPSettingsBlock.Port_must_be_specified=Port number must be specified.
TCPSettingsBlock.Invalid_port=Invalid port number.
internal.ui.GDBDebuggerPage.Debugger_exec_must_be_specified=Debugger executable must be specified
internal.ui.GDBDebuggerPage.GDB_Debugger_Options=GDB Debugger Options
internal.ui.GDBDebuggerPage.Main=Main
internal.ui.GDBDebuggerPage.GDB_debugger=GDB debugger
internal.ui.GDBDebuggerPage.GDB_Debugger=GDB Debugger
internal.ui.GDBDebuggerPage.Browse=&Browse...
internal.ui.GDBDebuggerPage.GDB_Command_File=GDB Command File
internal.ui.GDBDebuggerPage.GDB_command_file=GDB command file
internal.ui.GDBDebuggerPage.Warning_startup_operation_interference=(Warning: Some commands in this file may interfere with the startup operation of the debugger, for example "run".)
internal.ui.GDBDebuggerPage.Shared_libraries=Shared Libraries
internal.ui.SolibSearchPathBlock.Add=Add...
internal.ui.SolibSearchPathBlock.Up=Up
internal.ui.SolibSearchPathBlock.Down=Down
internal.ui.SolibSearchPathBlock.Remove=Remove
internal.ui.SolibSearchPathBlock.Directories=Directories:
internal.ui.SolibSearchPathBlock.Select_directory_with_shared_lib=Select directory that contains shared library.
internal.ui.GDBServerDebuggerPage.TCP=TCP
internal.ui.GDBServerDebuggerPage.Serial=Serial
internal.ui.GDBServerDebuggerPage.Main=Main
internal.ui.GDBServerDebuggerPage.Connection=Connection:
internal.ui.CygwinDebuggerPage.Cygwin_GDB_Debugger_Options=Cygwin GDB Debugger Options
internal.ui.actions.SetAutoSolibActionDelegate.Exception_set_automatically_load_symbols=Exceptions occurred attempting to set 'Automatically Load Symbols' mode.
internal.ui.actions.SetAutoSolibActionDelegate.Set_automatically_load_symbols_failed=Set 'Automatically Load Symbols' mode failed.
internal.ui.preferences.MIPreferencePage.General_GDBMI_settings=General settings for GDB MI.
internal.ui.preferences.MIPreferencePage.Communication=Communication
internal.ui.preferences.MIPreferencePage.Debugger_timeout=&Debugger timeout (ms):
internal.ui.preferences.MIPreferencePage.Launch_timeout=&Launch &timeout (ms):
internal.ui.preferences.MIPreferencePage.Error_Request_timeout_range=The valid value range is [{0},{1}].

17
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java
View file

@ -25,6 +25,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -33,15 +34,15 @@ import org.eclipse.swt.widgets.Shell;
*/ */
public class SerialPortSettingsBlock extends Observable public class SerialPortSettingsBlock extends Observable
{ {
private final static String DEFAULT_ASYNC_DEVICE = "/dev/ttyS0"; private final static String DEFAULT_ASYNC_DEVICE = "/dev/ttyS0"; //$NON-NLS-1$
private final static String DEFAULT_ASYNC_DEVICE_SPEED = "115200"; private final static String DEFAULT_ASYNC_DEVICE_SPEED = "115200"; //$NON-NLS-1$
private Shell fShell; private Shell fShell;
private StringDialogField fDeviceField; private StringDialogField fDeviceField;
private ComboDialogField fSpeedField; private ComboDialogField fSpeedField;
private String fSpeedChoices[] = { "9600", "19200", "38400", "57600", "115200" }; private String fSpeedChoices[] = { "9600", "19200", "38400", "57600", "115200" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
private Control fControl; private Control fControl;
@ -109,7 +110,7 @@ public class SerialPortSettingsBlock extends Observable
private StringDialogField createDeviceField() private StringDialogField createDeviceField()
{ {
StringDialogField field = new StringDialogField(); StringDialogField field = new StringDialogField();
field.setLabelText( "Device: " ); field.setLabelText( MIUIPlugin.getResourceString("mi.internal.ui.SerialPortSettingsBlock.Device") ); //$NON-NLS-1$
field.setDialogFieldListener( field.setDialogFieldListener(
new IDialogFieldListener() new IDialogFieldListener()
{ {
@ -124,7 +125,7 @@ public class SerialPortSettingsBlock extends Observable
private ComboDialogField createSpeedField() private ComboDialogField createSpeedField()
{ {
ComboDialogField field = new ComboDialogField( SWT.DROP_DOWN | SWT.READ_ONLY ); ComboDialogField field = new ComboDialogField( SWT.DROP_DOWN | SWT.READ_ONLY );
field.setLabelText( "Speed: " ); field.setLabelText( MIUIPlugin.getResourceString("mi.internal.ui.SerialPortSettingsBlock.Speed") ); //$NON-NLS-1$
field.setItems( fSpeedChoices ); field.setItems( fSpeedChoices );
field.setDialogFieldListener( field.setDialogFieldListener(
new IDialogFieldListener() new IDialogFieldListener()
@ -216,11 +217,11 @@ public class SerialPortSettingsBlock extends Observable
if ( fDeviceField != null && fSpeedField != null ) if ( fDeviceField != null && fSpeedField != null )
{ {
if ( fDeviceField.getText().trim().length() == 0 ) if ( fDeviceField.getText().trim().length() == 0 )
setErrorMessage( "Device must be specified." ); setErrorMessage( MIUIPlugin.getResourceString("mi.internal.ui.SerialPortSettingsBlock.Device_must_be_specified") ); //$NON-NLS-1$
else if ( !deviceIsValid( fDeviceField.getText().trim() ) ) else if ( !deviceIsValid( fDeviceField.getText().trim() ) )
setErrorMessage( "Invalid device." ); setErrorMessage( MIUIPlugin.getResourceString("mi.internal.ui.SerialPortSettingsBlock.Invalid_device") ); //$NON-NLS-1$
else if ( fSpeedField.getSelectionIndex() < 0 ) else if ( fSpeedField.getSelectionIndex() < 0 )
setErrorMessage( "Speed must be specified." ); setErrorMessage( MIUIPlugin.getResourceString("mi.internal.ui.SerialPortSettingsBlock.Speed_must_be_specified") ); //$NON-NLS-1$
} }
} }

13
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java
View file

@ -26,6 +26,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -63,12 +64,12 @@ public class SolibSearchPathBlock extends Observable
String[] buttonLabels = new String[] String[] buttonLabels = new String[]
{ {
/* 0 */ "Add...", /* 0 */ MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Add"), //$NON-NLS-1$
/* 1 */ null, /* 1 */ null,
/* 2 */ "Up", /* 2 */ MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Up"), //$NON-NLS-1$
/* 3 */ "Down", /* 3 */ MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Down"), //$NON-NLS-1$
/* 4 */ null, /* 4 */ null,
/* 5 */ "Remove", /* 5 */ MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Remove"), //$NON-NLS-1$
}; };
IListAdapter listAdapter = new IListAdapter() IListAdapter listAdapter = new IListAdapter()
@ -84,7 +85,7 @@ public class SolibSearchPathBlock extends Observable
}; };
fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, new LabelProvider() ); fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, new LabelProvider() );
fDirList.setLabelText( "Directories:" ); fDirList.setLabelText( MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Directories") ); //$NON-NLS-1$
fDirList.setUpButtonIndex( 2 ); fDirList.setUpButtonIndex( 2 );
fDirList.setDownButtonIndex( 3 ); fDirList.setDownButtonIndex( 3 );
fDirList.setRemoveButtonIndex( 5 ); fDirList.setRemoveButtonIndex( 5 );
@ -150,7 +151,7 @@ public class SolibSearchPathBlock extends Observable
private void addDirectory() private void addDirectory()
{ {
DirectoryDialog dialog = new DirectoryDialog( getShell() ); DirectoryDialog dialog = new DirectoryDialog( getShell() );
dialog.setMessage( "Select directory that contains shared library." ); dialog.setMessage( MIUIPlugin.getResourceString("internal.ui.SolibSearchPathBlock.Select_directory_with_shared_lib") ); //$NON-NLS-1$
String res = dialog.open(); String res = dialog.open();
if ( res != null ) if ( res != null )
fDirList.addElement( res ); fDirList.addElement( res );

17
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java
View file

@ -23,6 +23,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -31,8 +32,8 @@ import org.eclipse.swt.widgets.Shell;
*/ */
public class TCPSettingsBlock extends Observable public class TCPSettingsBlock extends Observable
{ {
private final static String DEFAULT_HOST_NAME = "localhost"; private final static String DEFAULT_HOST_NAME = "localhost"; //$NON-NLS-1$
private final static String DEFAULT_PORT_NUMBER = "10000"; private final static String DEFAULT_PORT_NUMBER = "10000"; //$NON-NLS-1$
private Shell fShell; private Shell fShell;
@ -103,7 +104,7 @@ public class TCPSettingsBlock extends Observable
private StringDialogField createHostNameField() private StringDialogField createHostNameField()
{ {
StringDialogField field = new StringDialogField(); StringDialogField field = new StringDialogField();
field.setLabelText( "Host name or IP address: " ); field.setLabelText( MIUIPlugin.getResourceString("TCPSettingsBlock.Host_or_IP") ); //$NON-NLS-1$
field.setDialogFieldListener( field.setDialogFieldListener(
new IDialogFieldListener() new IDialogFieldListener()
{ {
@ -118,7 +119,7 @@ public class TCPSettingsBlock extends Observable
private StringDialogField createPortNumberField() private StringDialogField createPortNumberField()
{ {
StringDialogField field = new StringDialogField(); StringDialogField field = new StringDialogField();
field.setLabelText( "Port number: " ); field.setLabelText( MIUIPlugin.getResourceString("TCPSettingsBlock.Port") ); //$NON-NLS-1$
field.setDialogFieldListener( field.setDialogFieldListener(
new IDialogFieldListener() new IDialogFieldListener()
{ {
@ -194,13 +195,13 @@ public class TCPSettingsBlock extends Observable
if ( fHostNameField != null && fPortNumberField != null ) if ( fHostNameField != null && fPortNumberField != null )
{ {
if ( fHostNameField.getText().trim().length() == 0 ) if ( fHostNameField.getText().trim().length() == 0 )
setErrorMessage( "Host name or IP address must be specified." ); setErrorMessage( MIUIPlugin.getResourceString("TCPSettingsBlock.Host_or_IP_must_be_specified") ); //$NON-NLS-1$
else if ( !hostNameIsValid( fHostNameField.getText().trim() ) ) else if ( !hostNameIsValid( fHostNameField.getText().trim() ) )
setErrorMessage( "Invalid host name or IP address." ); setErrorMessage( MIUIPlugin.getResourceString("TCPSettingsBlock.Invalid_host_or_IP") ); //$NON-NLS-1$
else if ( fPortNumberField.getText().trim().length() == 0 ) else if ( fPortNumberField.getText().trim().length() == 0 )
setErrorMessage( "Port number must be specified." ); setErrorMessage( MIUIPlugin.getResourceString("TCPSettingsBlock.Port_must_be_specified") ); //$NON-NLS-1$
else if ( !portNumberIsValid( fPortNumberField.getText().trim() ) ) else if ( !portNumberIsValid( fPortNumberField.getText().trim() ) )
setErrorMessage( "Invalid port number." ); setErrorMessage( MIUIPlugin.getResourceString("TCPSettingsBlock.Invalid_port") ); //$NON-NLS-1$
} }
} }

5
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/SetAutoSolibActionDelegate.java
View file

@ -28,6 +28,7 @@ import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin;
/** /**
* Enter type comment. * Enter type comment.
@ -222,7 +223,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate,
protected String getStatusMessage() protected String getStatusMessage()
{ {
return "Exceptions occurred attempting to set 'Automaticaly Load Symbols' mode."; return MIUIPlugin.getResourceString("internal.ui.actions.SetAutoSolibActionDelegate.Exception_set_automatically_load_symbols"); //$NON-NLS-1$
} }
/** /**
@ -230,7 +231,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate,
*/ */
protected String getErrorDialogMessage() protected String getErrorDialogMessage()
{ {
return "Set 'Automatically Load Symbols' mode failed."; return MIUIPlugin.getResourceString("internal.ui.actions.SetAutoSolibActionDelegate.Set_automatically_load_symbols_failed"); //$NON-NLS-1$
} }
protected void setStatus( IStatus status ) protected void setStatus( IStatus status )

10
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java
View file

@ -49,7 +49,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
{ {
super(); super();
setPreferenceStore( MIUIPlugin.getDefault().getPreferenceStore() ); setPreferenceStore( MIUIPlugin.getDefault().getPreferenceStore() );
setDescription( "General settings for GDB MI." ); setDescription( MIUIPlugin.getResourceString("internal.ui.preferences.MIPreferencePage.General_GDBMI_settings") ); //$NON-NLS-1$
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -146,7 +146,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
private void createCommunicationPreferences( Composite composite ) private void createCommunicationPreferences( Composite composite )
{ {
Composite comp = createGroupComposite( composite, 1, "Communication" ); Composite comp = createGroupComposite( composite, 1, MIUIPlugin.getResourceString("internal.ui.preferences.MIPreferencePage.Communication") ); //$NON-NLS-1$
//Add in an intermediate composite to allow for spacing //Add in an intermediate composite to allow for spacing
Composite spacingComposite = new Composite( comp, SWT.NONE ); Composite spacingComposite = new Composite( comp, SWT.NONE );
GridLayout layout = new GridLayout(); GridLayout layout = new GridLayout();
@ -155,7 +155,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
data.horizontalSpan = 2; data.horizontalSpan = 2;
spacingComposite.setLayoutData( data ); spacingComposite.setLayoutData( data );
fDebugTimeoutText = createTimeoutField( IMIConstants.PREF_REQUEST_TIMEOUT, "&Debugger timeout (ms):", spacingComposite ); fDebugTimeoutText = createTimeoutField( IMIConstants.PREF_REQUEST_TIMEOUT, MIUIPlugin.getResourceString("internal.ui.preferences.MIPreferencePage.Debugger_timeout"), spacingComposite ); //$NON-NLS-1$
fDebugTimeoutText.setPropertyChangeListener( fDebugTimeoutText.setPropertyChangeListener(
new IPropertyChangeListener() new IPropertyChangeListener()
{ {
@ -166,7 +166,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
} }
} ); } );
fLaunchTimeoutText = createTimeoutField( IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, "&Launch &timeout (ms):", spacingComposite ); fLaunchTimeoutText = createTimeoutField( IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, MIUIPlugin.getResourceString("internal.ui.preferences.MIPreferencePage.Launch_timeout"), spacingComposite ); //$NON-NLS-1$
fLaunchTimeoutText.setPropertyChangeListener( fLaunchTimeoutText.setPropertyChangeListener(
new IPropertyChangeListener() new IPropertyChangeListener()
{ {
@ -200,7 +200,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
toText.setValidRange( IMIConstants.MIN_REQUEST_TIMEOUT, IMIConstants.MAX_REQUEST_TIMEOUT ); toText.setValidRange( IMIConstants.MIN_REQUEST_TIMEOUT, IMIConstants.MAX_REQUEST_TIMEOUT );
String minValue = Integer.toString( IMIConstants.MIN_REQUEST_TIMEOUT ); String minValue = Integer.toString( IMIConstants.MIN_REQUEST_TIMEOUT );
String maxValue = Integer.toString( IMIConstants.MAX_REQUEST_TIMEOUT ); String maxValue = Integer.toString( IMIConstants.MAX_REQUEST_TIMEOUT );
toText.setErrorMessage( MessageFormat.format( "The valid value range is [{0},{1}].", new String[]{ minValue, maxValue } ) ); toText.setErrorMessage( MessageFormat.format( MIUIPlugin.getResourceString("internal.ui.preferences.MIPreferencePage.Error_Request_timeout_range"), new String[]{ minValue, maxValue } ) ); //$NON-NLS-1$
toText.load(); toText.load();
return toText; return toText;
} }