From 5fa88afc45c87b720acfe40c4487efbb005a5480 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Wed, 21 Apr 2010 17:43:55 +0000 Subject: [PATCH] The wizard-generated generic NLS references drive me up the wall :-) Makes it difficult to follow what exactly the GUI code is putting together. I need to add something to this tab, so I'm cleaning this up first. No functional change in this comment. --- .../ui/launching/GdbDebuggerPage.java | 26 ++++++++--------- .../ui/launching/LaunchUIMessages.properties | 29 +++++++++---------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java index af854584b4f..bb4956d399c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java @@ -84,7 +84,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { setMessage(null); } else { - setErrorMessage(LaunchUIMessages.getString("GDBDebuggerPage.0")); //$NON-NLS-1$ + setErrorMessage(LaunchUIMessages.getString("GDBDebuggerPage.gdb_executable_not_specified")); //$NON-NLS-1$ setMessage(null); } return valid; @@ -149,7 +149,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { } public String getName() { - return LaunchUIMessages.getString("GDBDebuggerPage.1"); //$NON-NLS-1$ + return LaunchUIMessages.getString("GDBDebuggerPage.tab_name"); //$NON-NLS-1$ } /** @@ -191,7 +191,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { public void createMainTab(TabFolder tabFolder) { TabItem tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.2")); //$NON-NLS-1$ + tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.main_tab_name")); //$NON-NLS-1$ Composite comp = ControlFactory.createCompositeEx(tabFolder, 1, GridData.FILL_BOTH); ((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false; comp.setFont(tabFolder.getFont()); @@ -199,7 +199,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { Composite subComp = ControlFactory.createCompositeEx(comp, 3, GridData.FILL_HORIZONTAL); ((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false; subComp.setFont(tabFolder.getFont()); - Label label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.3")); //$NON-NLS-1$ + Label label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_debugger")); //$NON-NLS-1$ GridData gd = new GridData(); // gd.horizontalSpan = 2; label.setLayoutData(gd); @@ -211,7 +211,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { updateLaunchConfigurationDialog(); } }); - Button button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.4"), null); //$NON-NLS-1$ + Button button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_browse"), null); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { @Override @@ -222,7 +222,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { private void handleGDBButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText(LaunchUIMessages.getString("GDBDebuggerPage.5")); //$NON-NLS-1$ + dialog.setText(LaunchUIMessages.getString("GDBDebuggerPage.gdb_browse_dlg_title")); //$NON-NLS-1$ String gdbCommand = fGDBCommandText.getText().trim(); int lastSeparatorIndex = gdbCommand.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { @@ -235,7 +235,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { fGDBCommandText.setText(res); } }); - label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.6")); //$NON-NLS-1$ + label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_command_file")); //$NON-NLS-1$ gd = new GridData(); // gd.horizontalSpan = 2; label.setLayoutData(gd); @@ -249,7 +249,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { updateLaunchConfigurationDialog(); } }); - button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.7"), null); //$NON-NLS-1$ + button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_cmdfile_browse"), null); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { @Override @@ -260,7 +260,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { private void handleGDBInitButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText(LaunchUIMessages.getString("GDBDebuggerPage.8")); //$NON-NLS-1$ + dialog.setText(LaunchUIMessages.getString("GDBDebuggerPage.gdb_cmdfile_dlg_title")); //$NON-NLS-1$ String gdbCommand = fGDBInitText.getText().trim(); int lastSeparatorIndex = gdbCommand.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { @@ -274,7 +274,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { } }); - label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.9"), //$NON-NLS-1$ + label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.cmdfile_warning"), //$NON-NLS-1$ 200, SWT.DEFAULT, SWT.WRAP); gd = new GridData(GridData.FILL_HORIZONTAL); @@ -284,7 +284,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { // TODO: Ideally, this field should be disabled if the back-end doesn't support non-stop debugging // TODO: Find a way to determine if non-stop is supported (i.e. find the GDB version) then grey out the check box if necessary - fNonStopCheckBox = ControlFactory.createCheckBox(subComp, LaunchUIMessages.getString("GDBDebuggerPage.13")); //$NON-NLS-1$ + fNonStopCheckBox = ControlFactory.createCheckBox(subComp, LaunchUIMessages.getString("GDBDebuggerPage.nonstop_mode")); //$NON-NLS-1$ fNonStopCheckBox.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -294,7 +294,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { // TODO: Ideally, this field should be disabled if the back-end doesn't support reverse debugging // TODO: Find a way to determine if reverse is supported (i.e. find the GDB version) then grey out the check box if necessary - fReverseCheckBox = ControlFactory.createCheckBox(subComp, LaunchUIMessages.getString("GDBDebuggerPage.14")); //$NON-NLS-1$ + fReverseCheckBox = ControlFactory.createCheckBox(subComp, LaunchUIMessages.getString("GDBDebuggerPage.reverse_Debugging")); //$NON-NLS-1$ fReverseCheckBox.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -314,7 +314,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { public void createSolibTab(TabFolder tabFolder) { TabItem tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.10")); //$NON-NLS-1$ + tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.shared_libraries")); //$NON-NLS-1$ Composite comp = ControlFactory.createCompositeEx(fTabFolder, 1, GridData.FILL_BOTH); comp.setFont(tabFolder.getFont()); tabItem.setControl(comp); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties index 1d928a89d72..07024579a2d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties @@ -10,22 +10,19 @@ # Ericsson - Updated for DSF ############################################################################### -CygwinDebuggerPage.0=Cygwin GDB Debugger Options -GDBDebuggerPage.0=Debugger executable must be specified. -GDBDebuggerPage.1=GDB Debugger Options -GDBDebuggerPage.2=Main -GDBDebuggerPage.3=GDB debugger: -GDBDebuggerPage.4=&Browse... -GDBDebuggerPage.5=GDB Debugger -GDBDebuggerPage.6=GDB command file: -GDBDebuggerPage.7=B&rowse... -GDBDebuggerPage.8=GDB Command File -GDBDebuggerPage.9=(Warning: Some commands in this file may interfere with the startup operation of the debugger, for example "run".) -GDBDebuggerPage.10=Shared Libraries -GDBDebuggerPage.11=Protocol: -GDBDebuggerPage.12=Default -GDBDebuggerPage.13=Non-stop mode (Note: Requires non-stop GDB) -GDBDebuggerPage.14=Enable Reverse Debugging at startup (Note: Requires Reverse GDB) +GDBDebuggerPage.gdb_executable_not_specified=Debugger executable must be specified. +GDBDebuggerPage.tab_name=GDB Debugger Options +GDBDebuggerPage.main_tab_name=Main +GDBDebuggerPage.gdb_debugger=GDB debugger: +GDBDebuggerPage.gdb_browse=&Browse... +GDBDebuggerPage.gdb_browse_dlg_title=GDB Debugger +GDBDebuggerPage.gdb_command_file=GDB command file: +GDBDebuggerPage.gdb_cmdfile_browse=B&rowse... +GDBDebuggerPage.gdb_cmdfile_dlg_title=GDB Command File +GDBDebuggerPage.cmdfile_warning=(Warning: Some commands in this file may interfere with the startup operation of the debugger, for example "run".) +GDBDebuggerPage.shared_libraries=Shared Libraries +GDBDebuggerPage.nonstop_mode=Non-stop mode (Note: Requires non-stop GDB) +GDBDebuggerPage.reverse_Debugging=Enable Reverse Debugging at startup (Note: Requires Reverse GDB) StandardGDBDebuggerPage.0=Debugger executable must be specified. StandardGDBDebuggerPage.1=GDB Debugger Options StandardGDBDebuggerPage.2=Main