--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchSettingsDialog.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchSettingsDialog.java Tue Feb 16 13:44:54 2010 -0600
@@ -38,7 +38,7 @@
*/
public abstract class AbstractLaunchSettingsDialog extends TitleAreaDialog {
- protected final static String UID = ".uid";
+ protected final static String UID = ".uid"; //$NON-NLS-1$
protected final LaunchWizardData data;
protected int INDENT;
@@ -61,7 +61,7 @@
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("New Launch Configuration Wizard");
+ newShell.setText(Messages.getString("AbstractLaunchSettingsDialog.Title")); //$NON-NLS-1$
}
protected Composite initDialogArea(Composite parent, String title, String helpId) {
@@ -115,7 +115,7 @@
setTitle(title);
if (status.isOK()) {
- setMessage("", IMessageProvider.NONE);
+ setMessage("", IMessageProvider.NONE); //$NON-NLS-1$
} else {
setMessage(status.getMessage(), severityToMsgType(status.getSeverity()));
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java Tue Feb 16 13:44:54 2010 -0600
@@ -47,7 +47,7 @@
*/
public abstract class AbstractLaunchWizardSection implements IWizardSection {
- private static final String CHANGE_LABEL = "Change...";
+ private static final String CHANGE_LABEL = Messages.getString("AbstractLaunchWizardSection.ChangeLabel"); //$NON-NLS-1$
protected final LaunchWizardData data;
private String sectionName;
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceDialog.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceDialog.java Tue Feb 16 13:44:54 2010 -0600
@@ -87,11 +87,11 @@
protected Control createDialogArea(Composite parent) {
initializeDialogUnits(parent);
final Composite composite = initDialogArea(parent,
- "Change connection",
+ Messages.getString("ConnectToDeviceDialog.Title"), //$NON-NLS-1$
LaunchWizardHelpIds.WIZARD_DIALOG_CHANGE_CONNECTION);
Group viewerGroup = new Group(composite, SWT.NONE);
- viewerGroup.setText("Current connection");
+ viewerGroup.setText(Messages.getString("ConnectToDeviceDialog.GroupLabel")); //$NON-NLS-1$
GridDataFactory.fillDefaults().applyTo(viewerGroup);
GridLayoutFactory.swtDefaults().applyTo(viewerGroup);
@@ -102,7 +102,7 @@
if (element instanceof IConnection)
return ((IConnection) element).getDisplayName();
- return "No Current connection";
+ return Messages.getString("ConnectToDeviceDialog.NoCurrentItem"); //$NON-NLS-1$
}
});
viewer.setContentProvider(new ArrayContentProvider());
@@ -128,7 +128,7 @@
buttonGroup.setFont(parent.getFont());
newButton = new Button(buttonGroup, SWT.PUSH);
- newButton.setText("New...");
+ newButton.setText(Messages.getString("ConnectToDeviceDialog.NewLabel")); //$NON-NLS-1$
newButton.setFont(JFaceResources.getDialogFont());
int widthHint = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.BUTTON_WIDTH);
Point minSize = newButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
@@ -149,7 +149,7 @@
});
editButton = new Button(buttonGroup, SWT.PUSH);
- editButton.setText("Edit...");
+ editButton.setText(Messages.getString("ConnectToDeviceDialog.EditLabel")); //$NON-NLS-1$
editButton.setFont(JFaceResources.getDialogFont());
widthHint = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.BUTTON_WIDTH);
minSize = editButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
@@ -206,7 +206,7 @@
if (connectedService == null) {
status = error(MessageFormat.format(
- "The selected connection does not support {0}",
+ Messages.getString("ConnectToDeviceDialog.ServiceNotSupportedError"), //$NON-NLS-1$
data.getService().getDisplayName()));
}
else {
@@ -214,7 +214,7 @@
connectedService.getStatus();
if (!serviceStatus.getEStatus().equals(
com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus.UP)) {
- status = warning("The selected connection may not be usable for debugging:\n {0}",
+ status = warning(Messages.getString("ConnectToDeviceDialog.ServiceNotAvailWarning"), //$NON-NLS-1$
serviceStatus.getLongDescription());
}
}
@@ -233,7 +233,7 @@
if (connection != null) {
descriptionLabel.setText(standardPNPMessage);
} else {
- descriptionLabel.setText("No connections are detected or defined. " + standardPNPMessage);
+ descriptionLabel.setText(Messages.getString("ConnectToDeviceDialog.NoConnectionsText") + standardPNPMessage); //$NON-NLS-1$
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java Tue Feb 16 13:44:54 2010 -0600
@@ -35,7 +35,7 @@
*/
public class ConnectToDeviceSection extends AbstractLaunchWizardSection implements IConnectionListener {
- private static final String NO_CURRENT_CONNECTION_MSG = "No current connection is defined or detected.";
+ private static final String NO_CURRENT_CONNECTION_MSG = Messages.getString("ConnectToDeviceSection.NoConnectionMsg"); //$NON-NLS-1$
private final IConnectionsManager manager;
/**
@@ -43,7 +43,7 @@
*
*/
public ConnectToDeviceSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) {
- super(data, "Connect to device", launchOptionsPage);
+ super(data, Messages.getString("ConnectToDeviceSection.Title"), launchOptionsPage); //$NON-NLS-1$
manager = RemoteConnectionsActivator.getConnectionsManager();
}
@@ -78,7 +78,7 @@
}
static String getStandardPNPMessage() {
- return "You may plug in a device over USB or activate it over WLAN, or create a new connection now for your device.";
+ return Messages.getString("ConnectToDeviceSection.StdPNPMsg"); //$NON-NLS-1$
}
@Override
@@ -88,9 +88,9 @@
String msg;
if (data.getConnection() != null)
- msg = MessageFormat.format("The current connection is now ''{0}''.", data.getConnectionName());
+ msg = MessageFormat.format(Messages.getString("ConnectToDeviceSection.CurrentConnectionLabel"), data.getConnectionName()); //$NON-NLS-1$
else
- msg = MessageFormat.format("{0} {1}", NO_CURRENT_CONNECTION_MSG, getStandardPNPMessage());
+ msg = MessageFormat.format("{0} {1}", NO_CURRENT_CONNECTION_MSG, getStandardPNPMessage()); //$NON-NLS-1$
descriptionLabel.setText(msg);
launchOptionsPage.changed();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessDialog.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessDialog.java Tue Feb 16 13:44:54 2010 -0600
@@ -96,7 +96,7 @@
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = initDialogArea(parent,
- MessageFormat.format("Change {0} Process", data.getModeLabel()),
+ MessageFormat.format(Messages.getString("DebugRunProcessDialog.ChangeProcessMsg"), data.getModeLabel()), //$NON-NLS-1$
data.isDebug() ? LaunchWizardHelpIds.WIZARD_DIALOG_CHANGE_DEBUG_PROCESS :
LaunchWizardHelpIds.WIZARD_DIALOG_CHANGE_RUN_PROCESS);
@@ -120,7 +120,7 @@
Label label;
label = new Label(composite, SWT.WRAP);
- label.setText(MessageFormat.format("{0} method:", data.getModeLabel()));
+ label.setText(MessageFormat.format(Messages.getString("DebugRunProcessDialog.ModeLabel"), data.getModeLabel())); //$NON-NLS-1$
label.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
GridDataFactory.fillDefaults().grab(true, false).applyTo(composite);
@@ -139,9 +139,9 @@
String msg;
if (data.isDebug())
- msg = "Configure how to debug the program. The initial settings reflect the debug capabilities of the selected device and the SIS builder settings.";
+ msg = Messages.getString("DebugRunProcessDialog.DebugConfigureMsg"); //$NON-NLS-1$
else
- msg = "Configure how to run the program.";
+ msg = Messages.getString("DebugRunProcessDialog.RunConfigureMsg"); //$NON-NLS-1$
setMessage(msg);
switch (data.getExeSelection()) {
@@ -161,7 +161,7 @@
Label label;
label = new Label(composite, SWT.WRAP);
- label.setText(MessageFormat.format("Deploy method:", data.getModeLabel()));
+ label.setText(MessageFormat.format(Messages.getString("DebugRunProcessDialog.DeployLabel"), data.getModeLabel())); //$NON-NLS-1$
label.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
@@ -178,7 +178,7 @@
installPackageCheckbox = new Button(composite, SWT.CHECK);
GridDataFactory.fillDefaults().applyTo(installPackageCheckbox);
- installPackageCheckbox.setText("Install package before launch");
+ installPackageCheckbox.setText(Messages.getString("DebugRunProcessDialog.InstallBeforeLaunchLabel")); //$NON-NLS-1$
installPackageUI = new Composite(composite, SWT.NONE);
GridDataFactory.fillDefaults().indent(INDENT, 0).applyTo(installPackageUI);
@@ -210,16 +210,16 @@
ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
if (cpi != null) {
final Label sisLabel = new Label(composite, SWT.NONE);
- sisLabel.setText("SIS File to Install:");
+ sisLabel.setText(Messages.getString("DebugRunProcessDialog.SISFileLabel")); //$NON-NLS-1$
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).span(1, 1).applyTo(sisLabel);
- sisLabel.setToolTipText("Specify which SIS file to install on the phone prior to launching");
- sisLabel.setData(UID, "DebugRunProcessDialog.sisLabel");
+ sisLabel.setToolTipText(Messages.getString("DebugRunProcessDialog.SISQueryTip")); //$NON-NLS-1$
+ sisLabel.setData(UID, "DebugRunProcessDialog.sisLabel"); //$NON-NLS-1$
sisFile = new Combo(composite, SWT.READ_ONLY);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(sisLabel);
- sisFile.setToolTipText("Specify which SIS file to install on the phone prior to launching");
+ sisFile.setToolTipText(Messages.getString("DebugRunProcessDialog.SISQueryTip")); //$NON-NLS-1$
sisFile.add("None"); //$NON-NLS-1$
- sisFile.setData(UID, "DebugRunProcessDialog.sisFile");
+ sisFile.setData(UID, "DebugRunProcessDialog.sisFile"); //$NON-NLS-1$
sisFile.addSelectionListener(new SelectionAdapter() {
@Override
@@ -252,44 +252,44 @@
});
Link link = new Link(composite, SWT.NONE);
- link.setText("<a>" + "Modify SIS builder settings for build configuration" + "...</a>");
+ link.setText("<a>" + Messages.getString("DebugRunProcessDialog.SISConfigLinkText") + "...</a>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).span(2, 1).grab(true, false).applyTo(link);
link.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- PreferencesUtil.createPropertyDialogOn(getShell(), project, "com.nokia.carbide.cdt.internal.builder.ui.CarbideBuildConfigurationsPage", null, null).open();
+ PreferencesUtil.createPropertyDialogOn(getShell(), project, "com.nokia.carbide.cdt.internal.builder.ui.CarbideBuildConfigurationsPage", null, null).open(); //$NON-NLS-1$
}
});
- link.setData(UID, "DebugRunProcessDialog.link");
+ link.setData(UID, "DebugRunProcessDialog.link"); //$NON-NLS-1$
} else {
// not a Carbide project, just an executable. show a browse/edit combo
// to let them select a sis file if they want to.
final Label sisLabel = new Label(composite, SWT.NONE);
sisLabel.setText("SIS File to Install:"); //$NON-NLS-1$
GridDataFactory.swtDefaults().span(2, 1).applyTo(sisLabel);
- sisLabel.setToolTipText("Specify which SIS file to install on the phone prior to launching");
- sisLabel.setData(UID, "DebugRunProcessDialog.sisLabel");
+ sisLabel.setToolTipText(Messages.getString("DebugRunProcessDialog.SISQueryTip")); //$NON-NLS-1$
+ sisLabel.setData(UID, "DebugRunProcessDialog.sisLabel"); //$NON-NLS-1$
sisEdit = new Text(composite, SWT.BORDER);
GridDataFactory.fillDefaults().span(1, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sisEdit);
- sisEdit.setToolTipText("Specify which SIS file to install on the phone prior to launching");
+ sisEdit.setToolTipText(Messages.getString("DebugRunProcessDialog.SISQueryTip")); //$NON-NLS-1$
sisEdit.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updateSisFile();
validate();
}
});
- sisEdit.setData(UID, "DebugRunProcessDialog.sisEdit");
+ sisEdit.setData(UID, "DebugRunProcessDialog.sisEdit"); //$NON-NLS-1$
sisBrowse = new Button(composite, SWT.NONE);
- sisBrowse.setText("Browse...");
+ sisBrowse.setText(Messages.getString("DebugRunProcessDialog.BrowseLabel")); //$NON-NLS-1$
sisBrowse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
sisBrowse.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
- dialog.setText("Select installation file");
- dialog.setFilterExtensions(new String[] {"*.sis*", "*.*"});
- dialog.setFilterNames(new String[] {"Installation Files", "All Files"});
+ dialog.setText(Messages.getString("DebugRunProcessDialog.Title")); //$NON-NLS-1$
+ dialog.setFilterExtensions(new String[] {"*.sis*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
+ dialog.setFilterNames(new String[] {Messages.getString("DebugRunProcessDialog.InstallFilterName"), Messages.getString("DebugRunProcessDialog.AllFilterName")}); //$NON-NLS-1$ //$NON-NLS-2$
BrowseDialogUtils.initializeFrom(dialog, sisEdit);
@@ -301,7 +301,7 @@
}
}
});
- sisBrowse.setData(UID, "DebugRunProcessDialog.sisBrowse");
+ sisBrowse.setData(UID, "DebugRunProcessDialog.sisBrowse"); //$NON-NLS-1$
}
}
@@ -345,7 +345,7 @@
if (cpi != null) {
sisFile.removeAll();
- sisFile.add("None");
+ sisFile.add(Messages.getString("DebugRunProcessDialog.NoneItem")); //$NON-NLS-1$
ICarbideBuildConfiguration config = cpi.getDefaultConfiguration();
for (ISISBuilderInfo info : config.getSISBuilderInfoList()) {
@@ -393,7 +393,7 @@
private IPath createSuggestedRemotePath(IPath exeSelectionPath) {
String filename = exeSelectionPath.lastSegment();
- return PathUtils.createPath("C:/sys/bin").append(filename);
+ return PathUtils.createPath("C:/sys/bin").append(filename); //$NON-NLS-1$
}
/**
@@ -403,12 +403,12 @@
private void createProjectExecutableRadioButton(Composite radioGroup) {
projectExecutableRadioButton = new Button(radioGroup, SWT.RADIO);
GridDataFactory.fillDefaults().grab(false, false).applyTo(projectExecutableRadioButton);
- projectExecutableRadioButton.setText("Launch project &executable:");
- projectExecutableRadioButton.setData(UID, "radio_project_executable");
+ projectExecutableRadioButton.setText(Messages.getString("DebugRunProcessDialog.LaunchProjectExeLabel")); //$NON-NLS-1$
+ projectExecutableRadioButton.setData(UID, "radio_project_executable"); //$NON-NLS-1$
projectExecutableViewer = new ComboViewer(radioGroup, SWT.READ_ONLY);
GridDataFactory.fillDefaults().grab(true, false).applyTo(projectExecutableViewer.getControl());
- projectExecutableViewer.getControl().setData(UID, "combo_project_executable");
+ projectExecutableViewer.getControl().setData(UID, "combo_project_executable"); //$NON-NLS-1$
projectExecutableViewer.setContentProvider(new ArrayContentProvider());
projectExecutableViewer.setLabelProvider(new LabelProvider() {
@@ -470,14 +470,14 @@
private void createRemoteExecutableRadioButton(Composite radioGroup) {
remoteExecutableRadioButton = new Button(radioGroup, SWT.RADIO);
GridDataFactory.fillDefaults().grab(false, false).applyTo(remoteExecutableRadioButton);
- remoteExecutableRadioButton.setText("Launch &remote program:");
+ remoteExecutableRadioButton.setText(Messages.getString("DebugRunProcessDialog.LaunchRemoteProgLabel")); //$NON-NLS-1$
- remoteExecutableRadioButton.setData(UID, "radio_remote_program");
+ remoteExecutableRadioButton.setData(UID, "radio_remote_program"); //$NON-NLS-1$
remoteProgramEntry = new Text(radioGroup, SWT.BORDER);
GridDataFactory.fillDefaults().grab(true, false).applyTo(remoteProgramEntry);
- remoteProgramEntry.setData(UID, "text_remote_program");
+ remoteProgramEntry.setData(UID, "text_remote_program"); //$NON-NLS-1$
remoteExecutableRadioButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -515,14 +515,14 @@
private void createAttachToProcessRadioButton(Composite radioGroup) {
attachToProcessRadioButton = new Button(radioGroup, SWT.RADIO);
GridDataFactory.fillDefaults().grab(false, false).applyTo(attachToProcessRadioButton);
- attachToProcessRadioButton.setText("&Attach to process:");
+ attachToProcessRadioButton.setText(Messages.getString("DebugRunProcessDialog.AttachLabel")); //$NON-NLS-1$
- attachToProcessRadioButton.setData(UID, "radio_attach_to_process");
+ attachToProcessRadioButton.setData(UID, "radio_attach_to_process"); //$NON-NLS-1$
Label label = new Label(radioGroup, SWT.WRAP);
GridDataFactory.fillDefaults().grab(false, false).align(SWT.LEFT, SWT.CENTER).applyTo(label);
- label.setText("(selected at launch time)");
+ label.setText(Messages.getString("DebugRunProcessDialog.AttachAddlMsg")); //$NON-NLS-1$
attachToProcessRadioButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -553,12 +553,12 @@
switch (data.getExeSelection()) {
case USE_PROJECT_EXECUTABLE:
if (exePath.isEmpty()) {
- status = error("The project builds no executables.");
+ status = error(Messages.getString("DebugRunProcessDialog.NoExesError")); //$NON-NLS-1$
}
break;
case USE_REMOTE_EXECUTABLE:
if (exePath.isEmpty()) {
- status = error("Enter a non-empty executable path.");
+ status = error(Messages.getString("DebugRunProcessDialog.EnterPathError")); //$NON-NLS-1$
} else {
String exePathString = exePath.toString();
char drive = exePathString.charAt(0);
@@ -567,9 +567,9 @@
char lastChar = exePathString.charAt(exePathString.length() - 1);
if (!Character.isLetter(drive) || colon != ':' || (root != '\\' && root != '/') ||
lastChar == '\\' || lastChar == '/' || lastChar == ':') {
- status = error("The executable path must be absolute.");
+ status = error(Messages.getString("DebugRunProcessDialog.AbsolutePathError")); //$NON-NLS-1$
} else if (exePath.getFileExtension() == null) {
- status = warning("The executable path should end in a filename.");
+ status = warning(Messages.getString("DebugRunProcessDialog.FilePathError")); //$NON-NLS-1$
}
}
break;
@@ -586,7 +586,7 @@
// it exists
File file = new File(text);
if (!file.exists()) {
- status = error("The SIS file ''{0}'' does not exist.", text);
+ status = error(Messages.getString("DebugRunProcessDialog.SISFileExistError"), text); //$NON-NLS-1$
}
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Tue Feb 16 13:44:54 2010 -0600
@@ -37,7 +37,7 @@
public class DebugRunProcessSection extends AbstractLaunchWizardSection {
public DebugRunProcessSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) {
- super(data, MessageFormat.format("{0} process", data.getModeLabel()), launchOptionsPage);
+ super(data, MessageFormat.format(Messages.getString("DebugRunProcessSection.Title"), data.getModeLabel()), launchOptionsPage); //$NON-NLS-1$
}
@Override
@@ -87,12 +87,12 @@
switch (data.getExeSelection()) {
case USE_PROJECT_EXECUTABLE:
if (data.getExeSelectionPath() == null)
- status = error("This project does not build any executables.",
+ status = error(Messages.getString("DebugRunProcessSection.NoExesError"), //$NON-NLS-1$
data.getModeLabel().toLowerCase());
break;
case USE_REMOTE_EXECUTABLE:
if (data.getExeSelectionPath() == null)
- status = error("No remote executable is selected.",
+ status = error(Messages.getString("DebugRunProcessSection.NoRemoteExeError"), //$NON-NLS-1$
data.getModeLabel().toLowerCase());
break;
case ATTACH_TO_PROCESS:
@@ -100,7 +100,7 @@
}
if (data.isInstallPackage() && (data.getSisPath() == null || data.getSisPath().length() == 0))
- status = error("Carbide must install a package to debug this project.");
+ status = error(Messages.getString("DebugRunProcessSection.MustInstallError")); //$NON-NLS-1$
}
@Override
@@ -109,19 +109,19 @@
validate();
if (status.isOK()) {
- String mainFormat = "Carbide will {0} and {1}.";
- String copyOrInstallMsg = "";
- String runOrLaunchMsg = "";
+ String mainFormat = Messages.getString("DebugRunProcessSection.MainFormat"); //$NON-NLS-1$
+ String copyOrInstallMsg = ""; //$NON-NLS-1$
+ String runOrLaunchMsg = ""; //$NON-NLS-1$
switch (data.getExeSelection()) {
case USE_PROJECT_EXECUTABLE:
- runOrLaunchMsg = "launch '" + data.getExeSelectionPath().lastSegment() + "'";
+ runOrLaunchMsg = MessageFormat.format(Messages.getString("DebugRunProcessSection.LaunchFormat"), data.getExeSelectionPath().lastSegment()); //$NON-NLS-1$
break;
case USE_REMOTE_EXECUTABLE:
- runOrLaunchMsg = "launch '" + PathUtils.convertPathToWindows(data.getExeSelectionPath()) + "'";
+ runOrLaunchMsg = MessageFormat.format(Messages.getString("DebugRunProcessSection.LaunchFormat"), PathUtils.convertPathToWindows(data.getExeSelectionPath())); //$NON-NLS-1$
break;
case ATTACH_TO_PROCESS:
- runOrLaunchMsg = "attach to a process selected at launch time";
+ runOrLaunchMsg = Messages.getString("DebugRunProcessSection.AttachMsg"); //$NON-NLS-1$
break;
}
@@ -130,17 +130,17 @@
String runOrDebugProcessMessage = MessageFormat.format(mainFormat, copyOrInstallMsg, runOrLaunchMsg);
descriptionLabel.setText(runOrDebugProcessMessage);
} else {
- descriptionLabel.setText(status.getMessage() + "\n\n" +
- MessageFormat.format("Click the 'Change...' button to select another {0} method.",
+ descriptionLabel.setText(status.getMessage() + "\n\n" + //$NON-NLS-1$
+ MessageFormat.format(Messages.getString("DebugRunProcessSection.ChangeMsg"), //$NON-NLS-1$
data.getModeLabel().toLowerCase()));
}
}
private String getCopyOrInstallMsg() {
if (data.isSysTRKConnection() || !data.isInstallPackage())
- return "copy files to the device";
+ return Messages.getString("DebugRunProcessSection.CopyMsg"); //$NON-NLS-1$
else
- return MessageFormat.format("install \"{0}\"", data.getSisPath());
+ return MessageFormat.format(Messages.getString("DebugRunProcessSection.InstallMsg"), data.getSisPath()); //$NON-NLS-1$
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizard.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizard.java Tue Feb 16 13:44:54 2010 -0600
@@ -61,7 +61,7 @@
launchData = new LaunchWizardData(launchOptions, trkService);
mainPage = new UnifiedLaunchOptionsPage(launchData);
mainPage.initializeSettings();
- setWindowTitle("New Launch Configuration Wizard");
+ setWindowTitle(Messages.getString("LaunchWizard.Title")); //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -102,9 +102,9 @@
((GridLayout) parent.getLayout()).numColumns++;
advancedButton.moveBelow(parent.getChildren()[0]);
- advancedButton.setText("Edit advanced settings before launch");
+ advancedButton.setText(Messages.getString("LaunchWizard.AdvancedLabel")); //$NON-NLS-1$
advancedButton.setToolTipText(MessageFormat.format(
- "Before finishing the wizard, edit settings in the ''{0} Configurations'' dialog.",
+ Messages.getString("LaunchWizard.AdvancedTip"), //$NON-NLS-1$
launchData.getModeLabel()));
advancedButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -131,12 +131,12 @@
if (finishButton != null) {
advancedEdit = advancedButton.getSelection();
if (advancedEdit) {
- finishButton.setText("Edit");
- finishButton.setToolTipText("Click to accept settings and edit advanced settings.");
+ finishButton.setText(Messages.getString("LaunchWizard.EditLabel")); //$NON-NLS-1$
+ finishButton.setToolTipText(Messages.getString("LaunchWizard.EditTip")); //$NON-NLS-1$
getContainer().updateButtons();
} else {
finishButton.setText(launchData.getModeLabel());
- finishButton.setToolTipText("Click to accept settings and launch the program.");
+ finishButton.setToolTipText(Messages.getString("LaunchWizard.FinishTip")); //$NON-NLS-1$
getContainer().updateButtons();
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java Tue Feb 16 13:44:54 2010 -0600
@@ -136,9 +136,9 @@
public String getModeLabel() {
if (mode.equals(ILaunchManager.RUN_MODE))
- return "Run";
+ return Messages.getString("LaunchWizardData.RunModeLabel"); //$NON-NLS-1$
else if (mode.equals(ILaunchManager.DEBUG_MODE))
- return "Debug";
+ return Messages.getString("LaunchWizardData.DebugModeLabel"); //$NON-NLS-1$
else
return TextUtils.titleCase(mode);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java Tue Feb 16 13:44:54 2010 -0600
@@ -59,12 +59,12 @@
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = initDialogArea(parent,
- "Other Settings",
+ Messages.getString("OtherSettingsDialog.Title"), //$NON-NLS-1$
LaunchWizardHelpIds.WIZARD_DIALOG_OTHER_SETTINGS);
- String description = "Build the project before launch? " +
- "This can take a very long time in some projects and build systems. " +
- "On the other hand, you must remember to build the project yourself if you make changes.";
+ String description = Messages.getString("OtherSettingsDialog.Desc1") + //$NON-NLS-1$
+ Messages.getString("OtherSettingsDialog.Desc2") + //$NON-NLS-1$
+ Messages.getString("OtherSettingsDialog.Desc3"); //$NON-NLS-1$
final Label label = new Label(composite, SWT.WRAP);
label.setText(description);
@@ -89,7 +89,7 @@
fDisableBuildButton = new Button(radio, SWT.RADIO);
fDisableBuildButton.setText(Messages.getString("OtherSettingsDialog.DisableButtonLabel")); //$NON-NLS-1$
fDisableBuildButton.setToolTipText(Messages.getString("OtherSettingsDialog.DisableButtonToolTip")); //$NON-NLS-1$
- fDisableBuildButton.setData(UID, "OtherSettingsDialog.disableBuildButton");
+ fDisableBuildButton.setData(UID, "OtherSettingsDialog.disableBuildButton"); //$NON-NLS-1$
GridDataFactory.fillDefaults().span(2, 1).applyTo(fDisableBuildButton);
@@ -104,7 +104,7 @@
fEnableBuildButton = new Button(radio, SWT.RADIO);
fEnableBuildButton.setText(Messages.getString("OtherSettingsDialog.EnableButtonLabel")); //$NON-NLS-1$
fEnableBuildButton.setToolTipText(Messages.getString("OtherSettingsDialog.EnableButtonToolTip")); //$NON-NLS-1$
- fEnableBuildButton.setData(UID, "OtherSettingsDialog.enableBuildButon");
+ fEnableBuildButton.setData(UID, "OtherSettingsDialog.enableBuildButon"); //$NON-NLS-1$
GridDataFactory.fillDefaults().span(2, 1).applyTo(fEnableBuildButton);
@@ -119,7 +119,7 @@
fWorkspaceSettingsButton = new Button(radio, SWT.RADIO);
fWorkspaceSettingsButton.setText(Messages.getString("OtherSettingsDialog.WorkspaceSettingsButtonLabel")); //$NON-NLS-1$
fWorkspaceSettingsButton.setToolTipText(Messages.getString("OtherSettingsDialog.WorkspaceSettingsButtonToolTip")); //$NON-NLS-1$
- fWorkspaceSettingsButton.setData(UID, "OtherSettingsDialog.workspaceSettingsButton");
+ fWorkspaceSettingsButton.setData(UID, "OtherSettingsDialog.workspaceSettingsButton"); //$NON-NLS-1$
GridDataFactory.swtDefaults().span(1, 1).applyTo(fWorkspaceSettingsButton);
@@ -133,7 +133,7 @@
fWorkspaceSettingsLink = new Link(radio, SWT.NONE);
fWorkspaceSettingsLink.setText(Messages.getString("OtherSettingsDialog.WorkspaceSettingsLinkLabel")); //$NON-NLS-1$
- fWorkspaceSettingsLink.setData(UID, "OtherSettingsDialog.workspaceSettingsLink");
+ fWorkspaceSettingsLink.setData(UID, "OtherSettingsDialog.workspaceSettingsLink"); //$NON-NLS-1$
GridDataFactory.swtDefaults().align(SWT.RIGHT, SWT.CENTER).grab(true, false).span(1, 1).applyTo(fWorkspaceSettingsLink);
@@ -173,11 +173,11 @@
IStatus status = Status.OK_STATUS;
updateStatus(status);
- String wsState = "";
+ String wsState = ""; //$NON-NLS-1$
if (data.isWorkspaceBuildBeforeLaunch())
- wsState = " (enabled)";
+ wsState = Messages.getString("OtherSettingsDialog.EnabledLabel"); //$NON-NLS-1$
else
- wsState = " (disabled)";
+ wsState = Messages.getString("OtherSettingsDialog.DisabledLabel"); //$NON-NLS-1$
fWorkspaceSettingsButton.setText(
Messages.getString("OtherSettingsDialog.WorkspaceSettingsButtonLabel") + //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsSection.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsSection.java Tue Feb 16 13:44:54 2010 -0600
@@ -32,7 +32,7 @@
*
*/
public OtherSettingsSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) {
- super(data, "Other settings", launchOptionsPage);
+ super(data, Messages.getString("OtherSettingsSection.Title"), launchOptionsPage); //$NON-NLS-1$
}
@@ -69,16 +69,16 @@
protected void updateUI() {
String msg;
- String ifWorkspace = "";
+ String ifWorkspace = ""; //$NON-NLS-1$
if (data.getBuildBeforeLaunch() == EBuildBeforeLaunchOption.USE_WORKSPACE_SETTING)
- ifWorkspace = " (workspace setting)";
+ ifWorkspace = Messages.getString("OtherSettingsSection.WorkspaceLabel"); //$NON-NLS-1$
if (data.isCurrentBuildBeforeLaunch())
- msg = "Carbide will build the project before launch";
+ msg = Messages.getString("OtherSettingsSection.BuildBeforeLabel"); //$NON-NLS-1$
else
- msg = "Carbide will not build the project before launch";
+ msg = Messages.getString("OtherSettingsSection.NoBuildBeforeLabel"); //$NON-NLS-1$
- descriptionLabel.setText(msg + ifWorkspace + ".");
+ descriptionLabel.setText(msg + ifWorkspace + "."); //$NON-NLS-1$
}
/* (non-Javadoc)
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java Tue Feb 16 13:44:54 2010 -0600
@@ -58,9 +58,9 @@
* @param configurationName
*/
public UnifiedLaunchOptionsPage(LaunchWizardData data) {
- super("Configure Launch Settings");
+ super(Messages.getString("UnifiedLaunchOptionsPage.Title")); //$NON-NLS-1$
- setDescription("Configure the connection and process to launch.");
+ setDescription(Messages.getString("UnifiedLaunchOptionsPage.Desc")); //$NON-NLS-1$
this.data = data;
this.sections = new ArrayList<IWizardSection>();
@@ -116,9 +116,9 @@
if (status.isOK())
continue;
if (builder.length() > 0)
- builder.append("\n");
+ builder.append("\n"); //$NON-NLS-1$
- builder.append(MessageFormat.format("{0}: {1}",
+ builder.append(MessageFormat.format("{0}: {1}", //$NON-NLS-1$
section.getSectionName(),
status.getMessage()));
severity = Math.max(severity, status.getSeverity());
@@ -131,7 +131,7 @@
pageStatus = data.validate();
}
- setTitle("Configure launch configuration");
+ setTitle(Messages.getString("UnifiedLaunchOptionsPage.TitleText")); //$NON-NLS-1$
if (pageStatus != null && !pageStatus.isOK()) {
setMessage(pageStatus.getMessage(), severityToMsgType(pageStatus.getSeverity()));
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/messages.properties Tue Feb 16 09:47:14 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/messages.properties Tue Feb 16 13:44:54 2010 -0600
@@ -1,11 +1,79 @@
+AbstractLaunchSettingsDialog.Title=New Launch Configuration Wizard
+AbstractLaunchWizardSection.ChangeLabel=Change...
+ConnectToDeviceDialog.EditLabel=Edit...
+ConnectToDeviceDialog.GroupLabel=Current connection
+ConnectToDeviceDialog.NewLabel=New...
+ConnectToDeviceDialog.NoConnectionsText=No connections are detected or defined.
+ConnectToDeviceDialog.NoCurrentItem=No Current connection
+ConnectToDeviceDialog.ServiceNotAvailWarning=The selected connection may not be usable for debugging:\n {0}
+ConnectToDeviceDialog.ServiceNotSupportedError=The selected connection does not support {0}
+ConnectToDeviceDialog.Title=Change connection
+ConnectToDeviceSection.CurrentConnectionLabel=The current connection is now ''{0}''.
+ConnectToDeviceSection.NoConnectionMsg=No current connection is defined or detected.
+ConnectToDeviceSection.StdPNPMsg=You may plug in a device over USB or activate it over WLAN, or create a new connection now for your device.
+ConnectToDeviceSection.Title=Connect to device
+DebugRunProcessDialog.AbsolutePathError=The executable path must be absolute.
+DebugRunProcessDialog.AllFilterName=All Files
+DebugRunProcessDialog.AttachAddlMsg=(selected at launch time)
+DebugRunProcessDialog.AttachLabel=&Attach to process:
+DebugRunProcessDialog.BrowseLabel=Browse...
+DebugRunProcessDialog.ChangeProcessMsg=Change {0} Process
+DebugRunProcessDialog.DebugConfigureMsg=Configure how to debug the program. The initial settings reflect the debug capabilities of the selected device and the SIS builder settings.
+DebugRunProcessDialog.DeployLabel=Deploy method:
+DebugRunProcessDialog.EnterPathError=Enter a non-empty executable path.
+DebugRunProcessDialog.FilePathError=The executable path should end in a filename.
+DebugRunProcessDialog.InstallBeforeLaunchLabel=Install package before launch
+DebugRunProcessDialog.InstallFilterName=Installation Files
+DebugRunProcessDialog.LaunchProjectExeLabel=Launch project &executable:
+DebugRunProcessDialog.LaunchRemoteProgLabel=Launch &remote program:
+DebugRunProcessDialog.ModeLabel={0} method:
+DebugRunProcessDialog.NoExesError=The project builds no executables.
+DebugRunProcessDialog.NoneItem=None
+DebugRunProcessDialog.RunConfigureMsg=Configure how to run the program.
+DebugRunProcessDialog.SISConfigLinkText=Modify SIS builder settings for build configuration
+DebugRunProcessDialog.SISFileExistError=The SIS file ''{0}'' does not exist.
+DebugRunProcessDialog.SISFileLabel=SIS File to Install:
+DebugRunProcessDialog.SISQueryTip=Specify which SIS file to install on the phone prior to launching
+DebugRunProcessDialog.Title=Select installation file
+DebugRunProcessSection.AttachMsg=attach to a process selected at launch time
+DebugRunProcessSection.ChangeMsg=Click the 'Change...' button to select another {0} method.
+DebugRunProcessSection.CopyMsg=copy files to the device
+DebugRunProcessSection.InstallMsg=install "{0}"
+DebugRunProcessSection.LaunchFormat=launch ''{0}''
+DebugRunProcessSection.MainFormat=Carbide will {0} and {1}.
+DebugRunProcessSection.MustInstallError=Carbide must install a package to debug this project.
+DebugRunProcessSection.NoExesError=This project does not build any executables.
+DebugRunProcessSection.NoRemoteExeError=No remote executable is selected.
+DebugRunProcessSection.Title={0} process
+LaunchWizard.AdvancedLabel=Edit advanced settings before launch
+LaunchWizard.AdvancedTip=Before finishing the wizard, edit settings in the ''{0} Configurations'' dialog.
+LaunchWizard.EditLabel=Edit
+LaunchWizard.EditTip=Click to accept settings and edit advanced settings.
+LaunchWizard.FinishTip=Click to accept settings and launch the program.
+LaunchWizard.Title=New Launch Configuration Wizard
+LaunchWizardData.DebugModeLabel=Debug
+LaunchWizardData.RunModeLabel=Run
OtherSettingsDialog.Title=Build Options Selection
+OtherSettingsDialog.Desc1=Build the project before launch?
+OtherSettingsDialog.Desc2=This can take a very long time in some projects and build systems.
+OtherSettingsDialog.Desc3=On the other hand, you must remember to build the project yourself if you make changes.
+OtherSettingsDialog.Title=Other Settings
OtherSettingsDialog.Description=Select build options before launching
OtherSettingsDialog.OptionsGroupLabel=Build (if required) before launching
OtherSettingsDialog.DisableButtonLabel=Disable build before launch
OtherSettingsDialog.DisableButtonToolTip=Requires manually building project before launching (this may improve launch performance)
+OtherSettingsDialog.DisabledLabel=\ (disabled)
OtherSettingsDialog.EnableButtonLabel=Enable build before launch
OtherSettingsDialog.EnableButtonToolTip=Always build project before launching (this may impact launch performance)
+OtherSettingsDialog.EnabledLabel=\ (enabled)
OtherSettingsDialog.WorkspaceSettingsButtonLabel=Use workspace settings
OtherSettingsDialog.WorkspaceSettingsButtonToolTip=Use workspace setting for "Build (if required) before Launch"
OtherSettingsDialog.WorkspaceSettingsLinkLabel=<a>Configure Workspace Settings...</a>
OtherSettingsDialog.WorkspaceSettingsPageID=org.eclipse.debug.ui.LaunchingPreferencePage
+OtherSettingsSection.BuildBeforeLabel=Carbide will build the project before launch
+OtherSettingsSection.NoBuildBeforeLabel=Carbide will not build the project before launch
+OtherSettingsSection.Title=Other settings
+OtherSettingsSection.WorkspaceLabel=\ (workspace setting)
+UnifiedLaunchOptionsPage.Desc=Configure the connection and process to launch.
+UnifiedLaunchOptionsPage.Title=Configure Launch Settings
+UnifiedLaunchOptionsPage.TitleText=Configure launch configuration