|
From: <caw...@us...> - 2007-01-22 21:00:45
|
Revision: 1849
http://svn.sourceforge.net/rubyeclipse/?rev=1849&view=rev
Author: cawilliams
Date: 2007-01-22 13:00:44 -0800 (Mon, 22 Jan 2007)
Log Message:
-----------
try to move us towards using only subclasses of NLS for translations - so we get accurate information on what strings are missing and what are unused.
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.properties
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiPlugin.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubyExecutionArgumentsPage.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ModifyCatchpointAction.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEntryPointTab.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditEvaluationExpressionDialog.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EvaluationExpressionsPreferencePage.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/RubyVMMessages.java
trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyArgumentsTab.java
trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEntryPointTab.java
trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEnvironmentTab.java
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -4,13 +4,83 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
+
public class RdtDebugUiMessages {
private static final String BUNDLE_NAME = RdtDebugUiMessages.class.getName();
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
private RdtDebugUiMessages() {}
+ public static String LaunchConfigurationTab_RubyArguments_working_dir_error_message;
+ public static String LaunchConfigurationTab_RubyEntryPoint_invalidProjectSelectionMessage;
+ public static String LaunchConfigurationTab_RubyEntryPoint_invalidFileSelectionMessage;
+ public static String LaunchConfigurationTab_RubyEnvironment_interpreter_not_selected_error_message;
+ public static String RdtDebugUiPlugin_internalErrorOccurred;
+ public static String LaunchConfigurationTab_RubyArguments_interpreter_args_box_title;
+ public static String LaunchConfigurationTab_RubyArguments_program_args_box_title;
+ public static String ModifyCatchpointDialog_title;
+ public static String ModifyCatchpointDialog_message;
+ public static String Dialog_launchErrorTitle;
+ public static String Dialog_launchErrorMessage;
+ public static String LaunchConfigurationShortcut_Ruby_multipleConfigurationsError;
+ public static String Dialog_launchWithoutSelectedInterpreter_title;
+ public static String Dialog_launchWithoutSelectedInterpreter;
+ public static String LaunchConfigurationTab_RubyArguments_working_dir;
+ public static String LaunchConfigurationTab_RubyArguments_working_dir_browser_message;
+ public static String LaunchConfigurationTab_RubyArguments_working_dir_use_default_message;
+ public static String LaunchConfigurationTab_RubyArguments_name;
+ public static String LaunchConfigurationTab_RubyEntryPoint_projectLabel;
+ public static String LaunchConfigurationTab_RubyEntryPoint_projectSelectorMessage;
+ public static String LaunchConfigurationTab_RubyEntryPoint_fileLabel;
+ public static String LaunchConfigurationTab_RubyEntryPoint_fileSelectorMessage;
+ public static String LaunchConfigurationTab_RubyEntryPoint_name;
+ public static String LaunchConfigurationTab_RubyEnvironment_loadPathTab_label;
+ public static String LaunchConfigurationTab_RubyEnvironment_loadPathDefaultButton_label;
+ public static String LaunchConfigurationTab_RubyEnvironment_interpreterAddButton_label;
+ public static String LaunchConfigurationTab_RubyEnvironment_interpreterTab_label;
+ public static String LaunchConfigurationTab_RubyEnvironment_name;
+ public static String EditEvaluationExpression_name_label;
+ public static String EditEvaluationExpression_description_label;
+ public static String EditEvaluationExpression_expression_label;
+ public static String EvaluationExpressionsPreferencePage_description;
+ public static String EvaluationExpressionsPreferencePage_column_name;
+ public static String EvaluationExpressionsPreferencePage_column_description;
+ public static String EvaluationExpressionsPreferencePage_new;
+ public static String EvaluationExpressionsPreferencePage_edit;
+ public static String EvaluationExpressionsPreferencePage_remove;
+ public static String EvaluationExpressionsPreferencePage_import;
+ public static String EvaluationExpressionsPreferencePage_export;
+ public static String EditEvaluationExpressionDialog_add;
+ public static String EditEvaluationExpressionDialog_edit;
+ public static String EvaluationExpressionsPreferencePage_import_title;
+ public static String EvaluationExpressionsPreferencePage_importexport_extension;
+ public static String EvaluationExpressionsPreferencePage_export_title;
+ public static String EvaluationExpressionsPreferencePage_export_filename;
+ public static String EvaluationExpressionsPreferencePage_export_error_title;
+ public static String EvaluationExpressionsPreferencePage_export_error_hidden;
+ public static String EvaluationExpressionsPreferencePage_export_error_canNotWrite;
+ public static String EvaluationExpressionsPreferencePage_export_exists_title;
+ public static String EvaluationExpressionsPreferencePage_export_exists_message;
+ public static String EvaluationExpressionsPreferencePage_title;
+ public static String RubyInterpreterPreferencePage_addButton_label;
+ public static String RubyInterpreterPreferencePage_editButton_label;
+ public static String RubyInterpreterPreferencePage_removeButton_label;
+ public static String RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterName;
+ public static String RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterPath;
+ public static String RdtDebugUiPlugin_couldNotOpenFile;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, RdtDebugUiMessages.class);
+ }
+
+ public static String getFormattedString(String key, Object arg) {
+ return MessageFormat.format(key, new Object[] { arg });
+ }
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
public static String getString(String key) {
try {
return RESOURCE_BUNDLE.getString(key);
@@ -18,12 +88,4 @@
return '!' + key + '!';
}
}
-
- public static String getFormattedString(String key, Object arg) {
- return MessageFormat.format(getString(key), new Object[] { arg });
- }
-
- public static String getFormattedString(String key, Object[] args) {
- return MessageFormat.format(getString(key), args);
- }
}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.properties
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.properties 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.properties 2007-01-22 21:00:44 UTC (rev 1849)
@@ -1,118 +1,115 @@
#########################################
-# (c) Copyright RubyPeople, Inc. 2002.
+# (c) Copyright RubyPeople, Inc. 2002, 2007.
# All Rights Reserved.
#########################################
#########################################
# RdtDebugUiPlugin
#########################################
+RdtDebugUiPlugin_internalErrorOccurred=Internal error occurred
+RdtDebugUiPlugin_couldNotOpenFile=Could not find file: {0}.
-RdtDebugUiPlugin.internalErrorOccurred=Internal error occurred
-RdtDebugUiPlugin.couldNotOpenFile=Could not find file: {0}.
-
#########################################
# RubyApplicationWizardPage
#########################################
-RubyApplicationWizardPage.name=RubyApplicationWizardPage.name
-RubyApplicationWizardPage.description=Configure and Launch a Ruby application
-RubyApplicationWizardPage.title=Ruby Application Launch Wizard
+RubyApplicationWizardPage_name=Ruby Application Wizard
+RubyApplicationWizardPage_description=Configure and Launch a Ruby application
+RubyApplicationWizardPage_title=Ruby Application Launch Wizard
#########################################
# LaunchConfigurationTab
#########################################
-LaunchConfigurationTab.RubyArguments.name=Arguments
-LaunchConfigurationTab.RubyArguments.working_dir=Working Directory:
-LaunchConfigurationTab.RubyArguments.working_dir_browser_message=Select a working directory for the launch configuration
-LaunchConfigurationTab.RubyArguments.working_dir_use_default_message=Use default working directory
-LaunchConfigurationTab.RubyArguments.working_dir_error_message=Invalid working directory
-LaunchConfigurationTab.RubyArguments.interpreter_args_box_title=Interpreter Arguments:
-LaunchConfigurationTab.RubyArguments.program_args_box_title=Program Arguments:
+LaunchConfigurationTab_RubyArguments_name=Arguments
+LaunchConfigurationTab_RubyArguments_working_dir=Working Directory:
+LaunchConfigurationTab_RubyArguments_working_dir_browser_message=Select a working directory for the launch configuration
+LaunchConfigurationTab_RubyArguments_working_dir_use_default_message=Use default working directory
+LaunchConfigurationTab_RubyArguments_working_dir_error_message=Invalid working directory
+LaunchConfigurationTab_RubyArguments_interpreter_args_box_title=Interpreter Arguments:
+LaunchConfigurationTab_RubyArguments_program_args_box_title=Program Arguments:
-LaunchConfigurationTab.RubyEntryPoint.name=File
-LaunchConfigurationTab.RubyEntryPoint.projectLabel=Project:
-LaunchConfigurationTab.RubyEntryPoint.projectSelectorMessage=Choose the project containing the application entry point:
-LaunchConfigurationTab.RubyEntryPoint.invalidProjectSelectionMessage=Invalid project selection.
-LaunchConfigurationTab.RubyEntryPoint.fileLabel=File:
-LaunchConfigurationTab.RubyEntryPoint.fileSelectorMessage=Choose the Ruby file that represents the application entry point:
-LaunchConfigurationTab.RubyEntryPoint.invalidFileSelectionMessage=Invalid Ruby file.
+LaunchConfigurationTab_RubyEntryPoint_name=File
+LaunchConfigurationTab_RubyEntryPoint_projectLabel=Project:
+LaunchConfigurationTab_RubyEntryPoint_projectSelectorMessage=Choose the project containing the application entry point:
+LaunchConfigurationTab_RubyEntryPoint_invalidProjectSelectionMessage=Invalid project selection.
+LaunchConfigurationTab_RubyEntryPoint_fileLabel=File:
+LaunchConfigurationTab_RubyEntryPoint_fileSelectorMessage=Choose the Ruby file that represents the application entry point:
+LaunchConfigurationTab_RubyEntryPoint_invalidFileSelectionMessage=Invalid Ruby file.
-LaunchConfigurationTab.RubyEnvironment.name=Environment
-LaunchConfigurationTab.RubyEnvironment.loadPathTab.label=Load&path
-LaunchConfigurationTab.RubyEnvironment.loadPathDefaultButton.label=&Use default loadpath
-LaunchConfigurationTab.RubyEnvironment.interpreterAddButton.label=N&ew...
-LaunchConfigurationTab.RubyEnvironment.interpreterTab.label=&Interpreter
-LaunchConfigurationTab.RubyEnvironment.editInterpreterDialog.title=Add Interpreter
-LaunchConfigurationTab.RubyEnvironment.interpreter_not_selected_error_message=No interpreter has been selected
+LaunchConfigurationTab_RubyEnvironment_name=Environment
+LaunchConfigurationTab_RubyEnvironment_loadPathTab_label=Load&path
+LaunchConfigurationTab_RubyEnvironment_loadPathDefaultButton_label=&Use default loadpath
+LaunchConfigurationTab_RubyEnvironment_interpreterAddButton_label=N&ew...
+LaunchConfigurationTab_RubyEnvironment_interpreterTab_label=&Interpreter
+LaunchConfigurationTab_RubyEnvironment_editInterpreterDialog_title=Add Interpreter
+LaunchConfigurationTab_RubyEnvironment_interpreter_not_selected_error_message=No interpreter has been selected
-LaunchConfigurationShortcut.Ruby.multipleConfigurationsError=The file you are trying to launch has multiple configurations associated with it.\nPlease launch using 'Run...' and choose a configuration.
+LaunchConfigurationShortcut_Ruby_multipleConfigurationsError=The file you are trying to launch has multiple configurations associated with it.\nPlease launch using 'Run...' and choose a configuration.
#########################################
# Ruby Interpreter configuration
#########################################
-EditInterpreterDialog.rubyInterpreter.path.label=Location:
-EditInterpreterDialog.rubyInterpreter.path.browse.button.label=Browse...
-EditInterpreterDialog.rubyInterpreter.path.error=Please select a ruby interpreter
-EditInterpreterDialog.rubyInterpreter.name=Interpreter Name:
-EditInterpreterDialog.rubyInterpreter.name.error=Name cannot be empty
-EditInterpreterDialog.rubyInterpreter.path.browse.message=Choose location
+EditInterpreterDialog_rubyInterpreter_path_label=Location:
+EditInterpreterDialog_rubyInterpreter_path_browse_button_label=Browse...
+EditInterpreterDialog_rubyInterpreter_path_error=Please select a ruby interpreter
+EditInterpreterDialog_rubyInterpreter_name=Interpreter Name:
+EditInterpreterDialog_rubyInterpreter_name_error=Name cannot be empty
+EditInterpreterDialog_rubyInterpreter_path_browse_message=Choose location
-RubyInterpreterPreferencePage.addButton.label=Add
-RubyInterpreterPreferencePage.editButton.label=Edit
-RubyInterpreterPreferencePage.removeButton.label=Remove
-RubyInterpreterPreferencePage.rubyInterpreterTable.interpreterName=Name
-RubyInterpreterPreferencePage.rubyInterpreterTable.interpreterPath=Location
+RubyInterpreterPreferencePage_addButton_label=Add
+RubyInterpreterPreferencePage_editButton_label=Edit
+RubyInterpreterPreferencePage_removeButton_label=Remove
+RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterName=Name
+RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterPath=Location
-RubyInterpreterPreferencePage.EditInterpreterDialog.addInterpreter.title=Add Interpreter
-RubyInterpreterPreferencePage.EditInterpreterDialog.editInterpreter.title=Edit Interpreter
+RubyInterpreterPreferencePage_EditInterpreterDialog_addInterpreter_title=Add Interpreter
+RubyInterpreterPreferencePage_EditInterpreterDialog_editInterpreter_title=Edit Interpreter
#########################################
# Information Dialog
#########################################
-Dialog.launchWithoutSelectedInterpreter=Before launching a ruby application, please specifiy an interpreter using the ruby interpreter preferences page.
-Dialog.launchWithoutSelectedInterpreter.title=No interpreter found
-Dialog.launchErrorTitle=Launch Error
-Dialog.launchErrorMessage=An error occurred while trying to launch a ruby application.
+Dialog_launchWithoutSelectedInterpreter=Before launching a ruby application, please specifiy an interpreter using the ruby interpreter preferences page.
+Dialog_launchWithoutSelectedInterpreter_title=No interpreter found
+Dialog_launchErrorTitle=Launch Error
+Dialog_launchErrorMessage=An error occurred while trying to launch a ruby application.
#########################################
# Evaluation Expressions Preference Page
#########################################
-EvaluationExpressionsPreferencePage.title=Expressions for quick inspect
-EvaluationExpressionsPreferencePage.description=Create, Edit and Remove Ruby expressions for quick inspect:
-EvaluationExpressionsPreferencePage.column.name=Name
-EvaluationExpressionsPreferencePage.column.description=Description
-EvaluationExpressionsPreferencePage.new=New
-EvaluationExpressionsPreferencePage.edit=Edit
-EvaluationExpressionsPreferencePage.remove=Remove
-EvaluationExpressionsPreferencePage.import=Import
-EvaluationExpressionsPreferencePage.export=Export
-EditEvaluationExpressionDialog.add=Add Evaluation Expression
-EditEvaluationExpressionDialog.edit=Edit Evaluation Expression
-EditEvaluationExpression.name.label=Name
-EditEvaluationExpression.description.label=Description
-EditEvaluationExpression.expression.label=Expression
+EvaluationExpressionsPreferencePage_title=Expressions for quick inspect
+EvaluationExpressionsPreferencePage_description=Create, Edit and Remove Ruby expressions for quick inspect:
+EvaluationExpressionsPreferencePage_column_name=Name
+EvaluationExpressionsPreferencePage_column_description=Description
+EvaluationExpressionsPreferencePage_new=New
+EvaluationExpressionsPreferencePage_edit=Edit
+EvaluationExpressionsPreferencePage_remove=Remove
+EvaluationExpressionsPreferencePage_import=Import
+EvaluationExpressionsPreferencePage_export=Export
+EditEvaluationExpressionDialog_add=Add Evaluation Expression
+EditEvaluationExpressionDialog_edit=Edit Evaluation Expression
+EditEvaluationExpression_name_label=Name
+EditEvaluationExpression_description_label=Description
+EditEvaluationExpression_expression_label=Expression
-EvaluationExpressionsPreferencePage.importexport.extension=*.xml
+EvaluationExpressionsPreferencePage_importexport_extension=*.xml
-EvaluationExpressionsPreferencePage.import.title=Importing Expressions
+EvaluationExpressionsPreferencePage_import_title=Importing Expressions
+EvaluationExpressionsPreferencePage_export_title=Exporting {0} Expressions
+EvaluationExpressionsPreferencePage_export_filename=expressions.xml
-EvaluationExpressionsPreferencePage.export.title=Exporting {0} Expressions
-EvaluationExpressionsPreferencePage.export.filename=expressions.xml
+EvaluationExpressionsPreferencePage_export_exists_title= Exporting Expressions
+EvaluationExpressionsPreferencePage_export_exists_message= {0} already exists.\nDo you want to replace it?
+EvaluationExpressionsPreferencePage_export_error_title= Exporting Expressions
+EvaluationExpressionsPreferencePage_export_error_hidden= Export failed.\n{0} is a hidden file.
+EvaluationExpressionsPreferencePage_export_error_canNotWrite= Export failed.\n{0} cannot be modified.
+EvaluationExpressionsPreferencePage_export_error_fileNotFound= Export failed:\n{0}
-EvaluationExpressionsPreferencePage.export.exists.title= Exporting Expressions
-EvaluationExpressionsPreferencePage.export.exists.message= {0} already exists.\nDo you want to replace it?
-
-EvaluationExpressionsPreferencePage.export.error.title= Exporting Expressions
-EvaluationExpressionsPreferencePage.export.error.hidden= Export failed.\n{0} is a hidden file.
-EvaluationExpressionsPreferencePage.export.error.canNotWrite= Export failed.\n{0} cannot be modified.
-EvaluationExpressionsPreferencePage.export.error.fileNotFound= Export failed:\n{0}
-
-ModifyCatchpointDialog.title=Define Catchpoint
-ModifyCatchpointDialog.message=Enter the name of a ruby exception. The debugger halts when an exception of this type or a subclass is raised.
+ModifyCatchpointDialog_title=Define Catchpoint
+ModifyCatchpointDialog_message=Enter the name of a ruby exception. The debugger halts when an exception of this type or a subclass is raised.
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiPlugin.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiPlugin.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -51,7 +51,7 @@
}
public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, RdtDebugUiMessages.getString("RdtDebugUiPlugin.internalErrorOccurred"), e)); //$NON-NLS-1$
+ log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, RdtDebugUiMessages.RdtDebugUiPlugin_internalErrorOccurred, e));
}
public void start(BundleContext context) throws Exception {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubyExecutionArgumentsPage.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubyExecutionArgumentsPage.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubyExecutionArgumentsPage.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -27,7 +27,7 @@
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.interpreter_args_box_title"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_interpreter_args_box_title);
new Label(composite, SWT.NONE).setText(" ");
interpreterArgumentsText = new Text(composite, SWT.BORDER);
GridData interpreterArgumentsData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
@@ -35,7 +35,7 @@
interpreterArgumentsText.setLayoutData(interpreterArgumentsData);
interpreterArgumentsText.setText(getArgument("interpreter"));
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.program_args_box_title"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_program_args_box_title);
programArgumentsText = new Text(composite, SWT.BORDER);
GridData programArgumentsData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
programArgumentsData.horizontalSpan = 2;
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -94,7 +94,7 @@
return new ExternalRubyFileEditorInput(filesystemFile);
}
- RdtDebugCorePlugin.log(IStatus.INFO, RdtDebugUiMessages.getFormattedString("RdtDebugUiPlugin.couldNotOpenFile", sourceElement.getFilename())); //$NON-NLS-1$
+ RdtDebugCorePlugin.log(IStatus.INFO, RdtDebugUiMessages.getFormattedString(RdtDebugUiMessages.RdtDebugUiPlugin_couldNotOpenFile, sourceElement.getFilename()));
return null;
}
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ModifyCatchpointAction.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ModifyCatchpointAction.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ModifyCatchpointAction.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -45,8 +45,8 @@
*/
public void run(IAction action) {
final ModifyCatchpointDialog dialog = new ModifyCatchpointDialog(RdtDebugUiPlugin.getActiveWorkbenchWindow().getShell()) ;
- dialog.setTitle(RdtDebugUiMessages.getString("ModifyCatchpointDialog.title")); //$NON-NLS-1$
- dialog.setMessage(RdtDebugUiMessages.getString("ModifyCatchpointDialog.message")); //$NON-NLS-1$
+ dialog.setTitle(RdtDebugUiMessages.ModifyCatchpointDialog_title);
+ dialog.setMessage(RdtDebugUiMessages.ModifyCatchpointDialog_message);
int result = dialog.open();
if (result == Window.CANCEL) {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -59,8 +59,8 @@
} catch (CoreException e) {
log(e);
IStatus status= e.getStatus();
- String title = RdtDebugUiMessages.getString("Dialog.launchErrorTitle") ;
- String message = RdtDebugUiMessages.getString("Dialog.launchErrorMessage") ;
+ String title = RdtDebugUiMessages.Dialog_launchErrorTitle;
+ String message = RdtDebugUiMessages.Dialog_launchErrorMessage;
if (status != null) {
ErrorDialog.openError(RdtDebugUiPlugin.getActiveWorkbenchWindow().getShell(), title, message, status);
}
@@ -113,7 +113,7 @@
case 1:
return (ILaunchConfiguration) candidateConfigs.get(0);
default:
- Status status = new Status(Status.WARNING, RdtDebugUiPlugin.PLUGIN_ID, 0, RdtDebugUiMessages.getString("LaunchConfigurationShortcut.Ruby.multipleConfigurationsError"), null);
+ Status status = new Status(Status.WARNING, RdtDebugUiPlugin.PLUGIN_ID, 0, RdtDebugUiMessages.LaunchConfigurationShortcut_Ruby_multipleConfigurationsError, null);
throw new CoreException(status);
}
}
@@ -157,7 +157,7 @@
}
protected void showNoInterpreterDialog() {
- MessageDialog.openInformation(RubyPlugin.getActiveWorkbenchShell(), RdtDebugUiMessages.getString("Dialog.launchWithoutSelectedInterpreter.title"), RdtDebugUiMessages.getString("Dialog.launchWithoutSelectedInterpreter"));
+ MessageDialog.openInformation(RubyPlugin.getActiveWorkbenchShell(), RdtDebugUiMessages.Dialog_launchWithoutSelectedInterpreter_title, RdtDebugUiMessages.Dialog_launchWithoutSelectedInterpreter);
}
protected static String getDefaultWorkingDirectory(IProject project) {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -36,9 +36,9 @@
public void createControl(Composite parent) {
Composite composite = createPageRoot(parent);
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.working_dir"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir);
workingDirectorySelector = new DirectorySelector(composite);
- workingDirectorySelector.setBrowseDialogMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.working_dir_browser_message"));
+ workingDirectorySelector.setBrowseDialogMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir_browser_message);
workingDirectorySelector.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
workingDirectorySelector.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -56,12 +56,12 @@
setUseDefaultWorkingDirectory(((Button) e.getSource()).getSelection());
}
});
- new Label(defaultWorkingDirectoryComposite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.working_dir_use_default_message"));
+ new Label(defaultWorkingDirectoryComposite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir_use_default_message);
defaultWorkingDirectoryComposite.pack();
Label verticalSpacer = new Label(composite, SWT.NONE);
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.interpreter_args_box_title"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_interpreter_args_box_title);
interpreterArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
interpreterArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
interpreterArgsText.addModifyListener(new ModifyListener() {
@@ -70,7 +70,7 @@
}
});
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.program_args_box_title"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_program_args_box_title);
programArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
programArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
programArgsText.addModifyListener(new ModifyListener() {
@@ -133,14 +133,14 @@
}
public String getName() {
- return RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.name");
+ return RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_name;
}
public boolean isValid(ILaunchConfiguration launchConfig) {
try {
String workingDirectory = launchConfig.getAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
if (workingDirectory.length() == 0) {
- setErrorMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.working_dir_error_message"));
+ setErrorMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir_error_message);
return false;
}
} catch (CoreException e) {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEntryPointTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEntryPointTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEntryPointTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -37,9 +37,9 @@
public void createControl(Composite parent) {
Composite composite = createPageRoot(parent);
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.projectLabel"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_projectLabel);
projectSelector = new RubyProjectSelector(composite);
- projectSelector.setBrowseDialogMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.projectSelectorMessage"));
+ projectSelector.setBrowseDialogMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_projectSelectorMessage);
projectSelector.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
projectSelector.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
@@ -47,9 +47,9 @@
}
});
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.fileLabel"));
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_fileLabel);
fileSelector = new RubyFileSelector(composite, projectSelector);
- fileSelector.setBrowseDialogMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.fileSelectorMessage"));
+ fileSelector.setBrowseDialogMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_fileSelectorMessage);
fileSelector.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fileSelector.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
@@ -104,7 +104,7 @@
}
public String getName() {
- return RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.name");
+ return RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_name;
}
public boolean isValid(ILaunchConfiguration launchConfig) {
@@ -112,13 +112,13 @@
String projectName = launchConfig.getAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, "");
if (projectName.length() == 0) {
- setErrorMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.invalidProjectSelectionMessage"));
+ setErrorMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_invalidProjectSelectionMessage);
return false;
}
String fileName = launchConfig.getAttribute(RubyLaunchConfigurationAttribute.FILE_NAME, "");
if (fileName.length() == 0) {
- setErrorMessage(RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.invalidFileSelectionMessage"));
+ setErrorMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_invalidFileSelectionMessage);
return false;
}
} catch (CoreException e) {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -80,15 +80,13 @@
TabItem loadPathTab = new TabItem(tabFolder, SWT.NONE, 0);
loadPathTab
- .setText(RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.loadPathTab.label"));
+ .setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_loadPathTab_label);
loadPathTab.setControl(loadPathComposite);
loadPathTab.setData(loadPathListViewer);
loadPathDefaultButton = new Button(loadPathComposite, SWT.CHECK);
loadPathDefaultButton
- .setText(RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.loadPathDefaultButton.label"));
+ .setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_loadPathDefaultButton_label);
loadPathDefaultButton.setLayoutData(new GridData(
GridData.HORIZONTAL_ALIGN_BEGINNING));
loadPathDefaultButton
@@ -135,14 +133,12 @@
Button interpreterAddButton = new Button(interpreterComposite, SWT.PUSH);
interpreterAddButton
- .setText(RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.interpreterAddButton.label"));
+ .setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_interpreterAddButton_label);
interpreterAddButton.addSelectionListener(new AddInterpreterSelectionAdapter(interpreterCombo, getShell()));
TabItem interpreterTab = new TabItem(tabFolder, SWT.NONE);
interpreterTab
- .setText(RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.interpreterTab.label"));
+ .setText(RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_interpreterTab_label);
interpreterTab.setControl(interpreterComposite);
}
@@ -199,8 +195,7 @@
}
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
- IVMInstall defaultInterpreter = RubyRuntime.getDefault()
- .getDefaultVMInstall();
+ IVMInstall defaultInterpreter = RubyRuntime.getDefaultVMInstall();
if (defaultInterpreter != null) {
configuration.setAttribute(
RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER,
@@ -324,8 +319,7 @@
}
public String getName() {
- return RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.name");
+ return RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_name;
}
public boolean isValid(ILaunchConfiguration launchConfig) {
@@ -333,8 +327,7 @@
String selectedInterpreter = launchConfig.getAttribute(
RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, "");
if (selectedInterpreter.length() == 0) {
- setErrorMessage(RdtDebugUiMessages
- .getString("LaunchConfigurationTab.RubyEnvironment.interpreter_not_selected_error_message"));
+ setErrorMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_interpreter_not_selected_error_message);
return false;
}
} catch (CoreException e) {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditEvaluationExpressionDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditEvaluationExpressionDialog.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditEvaluationExpressionDialog.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -50,17 +50,17 @@
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_BOTH)) ;
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("EditEvaluationExpression.name.label")); //$NON-NLS-1$
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.EditEvaluationExpression_name_label);
txtName = new Text(composite, SWT.SINGLE | SWT.BORDER);
txtName.setLayoutData(new GridData(GridData.FILL_BOTH));
txtName.setText(evaluationExpression.getName());
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("EditEvaluationExpression.description.label")); //$NON-NLS-1$
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.EditEvaluationExpression_description_label);
txtDescription = new Text(composite, SWT.SINGLE | SWT.BORDER);
txtDescription.setLayoutData(new GridData(GridData.FILL_BOTH)) ;
txtDescription.setText(evaluationExpression.getDescription()) ;
- new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.getString("EditEvaluationExpression.expression.label")); //$NON-NLS-1$
+ new Label(composite, SWT.NONE).setText(RdtDebugUiMessages.EditEvaluationExpression_expression_label);
txtExpression = new Text(composite, SWT.SINGLE | SWT.BORDER);
txtExpression.setLayoutData(new GridData(GridData.FILL_BOTH)) ;
txtExpression.setText(evaluationExpression.getExpression()) ;
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EvaluationExpressionsPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EvaluationExpressionsPreferencePage.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EvaluationExpressionsPreferencePage.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -219,7 +219,7 @@
public EvaluationExpressionsPreferencePage() {
super();
fModel = new EditableExpressionModel();
- setDescription(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.description"));
+ setDescription(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_description);
}
/*
@@ -262,10 +262,10 @@
table.setLayout(tableLayout);
TableColumn column1 = new TableColumn(table, SWT.NONE);
- column1.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.column.name")); //$NON-NLS-1$
+ column1.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_column_name);
TableColumn column2 = new TableColumn(table, SWT.NONE);
- column2.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.column.description")); //$NON-NLS-1$
+ column2.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_column_description);
fTableViewer = new TableViewer(table);
fTableViewer.setLabelProvider(new EvaluationExpressionLabelProvider());
@@ -293,7 +293,7 @@
buttons.setLayout(layout);
fAddButton = new Button(buttons, SWT.PUSH);
- fAddButton.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.new")); //$NON-NLS-1$
+ fAddButton.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_new);
fAddButton.setLayoutData(getButtonGridData(fAddButton));
fAddButton.addListener(SWT.Selection, new Listener() {
@@ -303,7 +303,7 @@
});
fEditButton = new Button(buttons, SWT.PUSH);
- fEditButton.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.edit")); //$NON-NLS-1$
+ fEditButton.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_edit);
fEditButton.setLayoutData(getButtonGridData(fEditButton));
fEditButton.addListener(SWT.Selection, new Listener() {
@@ -313,7 +313,7 @@
});
fRemoveButton = new Button(buttons, SWT.PUSH);
- fRemoveButton.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.remove")); //$NON-NLS-1$
+ fRemoveButton.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_remove);
fRemoveButton.setLayoutData(getButtonGridData(fRemoveButton));
fRemoveButton.addListener(SWT.Selection, new Listener() {
@@ -325,7 +325,7 @@
createSeparator(buttons);
fImportButton = new Button(buttons, SWT.PUSH);
- fImportButton.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.import")); //$NON-NLS-1$
+ fImportButton.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_import);
fImportButton.setLayoutData(getButtonGridData(fImportButton));
fImportButton.addListener(SWT.Selection, new Listener() {
@@ -335,7 +335,7 @@
});
fExportButton = new Button(buttons, SWT.PUSH);
- fExportButton.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.export")); //$NON-NLS-1$
+ fExportButton.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export);
fExportButton.setLayoutData(getButtonGridData(fExportButton));
fExportButton.addListener(SWT.Selection, new Listener() {
@@ -439,7 +439,7 @@
private void add() {
EvaluationExpression evalExpression = new EvaluationExpression("", "", "");
- String title = RdtDebugUiMessages.getString("EditEvaluationExpressionDialog.add");
+ String title = RdtDebugUiMessages.EditEvaluationExpressionDialog_add;
Dialog dialog = new EditEvaluationExpressionDialog(getShell(), title, evalExpression);
if (dialog.open() == Window.OK) {
fModel.addExpression(evalExpression);
@@ -459,7 +459,7 @@
}
private void edit(EvaluationExpression evalExpression) {
- String title = RdtDebugUiMessages.getString("EditEvaluationExpressionDialog.edit");
+ String title = RdtDebugUiMessages.EditEvaluationExpressionDialog_edit;
Dialog dialog = new EditEvaluationExpressionDialog(getShell(), title, evalExpression);
if (dialog.open() == Window.OK) {
fTableViewer.refresh();
@@ -468,8 +468,8 @@
private void importFile() {
FileDialog dialog = new FileDialog(getShell());
- dialog.setText(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.import.title")); //$NON-NLS-1$
- dialog.setFilterExtensions(new String[] { RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.importexport.extension")}); //$NON-NLS-1$
+ dialog.setText(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_import_title);
+ dialog.setFilterExtensions(new String[] { RdtDebugUiMessages.EvaluationExpressionsPreferencePage_importexport_extension});
String path = dialog.open();
if (path == null) return;
@@ -502,9 +502,9 @@
private void export(EvaluationExpression[] expressions) {
FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
- dialog.setText(RdtDebugUiMessages.getFormattedString("EvaluationExpressionsPreferencePage.export.title", new Integer(expressions.length))); //$NON-NLS-1$
- dialog.setFilterExtensions(new String[] { RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.importexport.extension")}); //$NON-NLS-1$
- dialog.setFileName(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.export.filename")); //$NON-NLS-1$
+ dialog.setText(RdtDebugUiMessages.getFormattedString(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_title, new Integer(expressions.length)));
+ dialog.setFilterExtensions(new String[] { RdtDebugUiMessages.EvaluationExpressionsPreferencePage_importexport_extension});
+ dialog.setFileName(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_filename);
String path = dialog.open();
if (path == null) return;
@@ -512,15 +512,15 @@
File file = new File(path);
if (file.isHidden()) {
- String title = RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.export.error.title"); //$NON-NLS-1$
- String message = RdtDebugUiMessages.getFormattedString("EvaluationExpressionsPreferencePage.export.error.hidden", file.getAbsolutePath()); //$NON-NLS-1$
+ String title = RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_error_title;
+ String message = RdtDebugUiMessages.getFormattedString(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_error_hidden, file.getAbsolutePath());
MessageDialog.openError(getShell(), title, message);
return;
}
if (file.exists() && !file.canWrite()) {
- String title = RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.export.error.title"); //$NON-NLS-1$
- String message = RdtDebugUiMessages.getFormattedString("EvaluationExpressionsPreferencePage.export.error.canNotWrite", file.getAbsolutePath()); //$NON-NLS-1$
+ String title = RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_error_title;
+ String message = RdtDebugUiMessages.getFormattedString(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_error_canNotWrite, file.getAbsolutePath());
MessageDialog.openError(getShell(), title, message);
return;
}
@@ -536,8 +536,8 @@
}
private boolean confirmOverwrite(File file) {
- return MessageDialog.openQuestion(getShell(), RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.export.exists.title"), //$NON-NLS-1$
- RdtDebugUiMessages.getFormattedString("EvaluationExpressionsPreferencePage.export.exists.message", file.getAbsolutePath())); //$NON-NLS-1$
+ return MessageDialog.openQuestion(getShell(), RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_exists_title,
+ RdtDebugUiMessages.getFormattedString(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_export_exists_message, file.getAbsolutePath()));
}
private void remove() {
@@ -552,7 +552,7 @@
public void setVisible(boolean visible) {
super.setVisible(visible);
- if (visible) setTitle(RdtDebugUiMessages.getString("EvaluationExpressionsPreferencePage.title")); //$NON-NLS-1$
+ if (visible) setTitle(RdtDebugUiMessages.EvaluationExpressionsPreferencePage_title);
}
/*
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -110,7 +110,7 @@
addButton = new Button(buttons, SWT.PUSH);
addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- addButton.setText(RdtDebugUiMessages.getString("RubyInterpreterPreferencePage.addButton.label")); //$NON-NLS-1$
+ addButton.setText(RdtDebugUiMessages.RubyInterpreterPreferencePage_addButton_label);
addButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event evt) {
addInterpreter();
@@ -119,7 +119,7 @@
editButton = new Button(buttons, SWT.PUSH);
editButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- editButton.setText(RdtDebugUiMessages.getString("RubyInterpreterPreferencePage.editButton.label")); //$NON-NLS-1$
+ editButton.setText(RdtDebugUiMessages.RubyInterpreterPreferencePage_editButton_label);
editButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event evt) {
editInterpreter();
@@ -128,7 +128,7 @@
removeButton = new Button(buttons, SWT.PUSH);
removeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- removeButton.setText(RdtDebugUiMessages.getString("RubyInterpreterPreferencePage.removeButton.label")); //$NON-NLS-1$
+ removeButton.setText(RdtDebugUiMessages.RubyInterpreterPreferencePage_removeButton_label);
removeButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event evt) {
removeInterpreter();
@@ -170,11 +170,11 @@
table.setLinesVisible(false);
TableColumn column = new TableColumn(table, SWT.NULL);
- column.setText(RdtDebugUiMessages.getString("RubyInterpreterPreferencePage.rubyInterpreterTable.interpreterName")); //$NON-NLS-1$
+ column.setText(RdtDebugUiMessages.RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterName);
column.setWidth(125);
column = new TableColumn(table, SWT.NULL);
- column.setText(RdtDebugUiMessages.getString("RubyInterpreterPreferencePage.rubyInterpreterTable.interpreterPath")); //$NON-NLS-1$
+ column.setText(RdtDebugUiMessages.RubyInterpreterPreferencePage_rubyInterpreterTable_interpreterPath);
column.setWidth(350);
return table;
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/RubyVMMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/RubyVMMessages.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/RubyVMMessages.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -20,7 +20,6 @@
public static String InstalledJREsBlock_8;
public static String JREsUpdater_0;
public static String addVMDialog_pickJRERootDialog_message;
-
public static String VMLibraryBlock_7;
public static String VMLibraryBlock_6;
public static String VMLibraryBlock_4;
Modified: trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyArgumentsTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyArgumentsTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyArgumentsTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -21,7 +21,7 @@
String errorMessage = tab.getErrorMessage();
assertNull("There should be no error message.", errorMessage);
assertTrue("The tab is not valid when the configuration is completely empty.", !tab.isValid(configuration));
- errorMessage = RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyArguments.working_dir_error_message");
+ errorMessage = RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir_error_message;
assertEquals("The tab should set the error message for invalid working directory.", errorMessage, tab.getErrorMessage());
configuration.setAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, "aValidDirectory");
Modified: trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEntryPointTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEntryPointTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEntryPointTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -21,12 +21,12 @@
String errorMessage = tab.getErrorMessage();
assertNull("There should be no error message.", errorMessage);
assertTrue("The tab is not valid when the configuration is completely empty.", !tab.isValid(configuration));
- errorMessage = RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.invalidProjectSelectionMessage");
+ errorMessage = RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_invalidProjectSelectionMessage;
assertEquals("The tab should set the error message for no project.", errorMessage, tab.getErrorMessage());
configuration.setAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, "myProjectName");
assertTrue("The tab is not valid when the configuration has only a projectname.", !tab.isValid(configuration));
- errorMessage = RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEntryPoint.invalidFileSelectionMessage");
+ errorMessage = RdtDebugUiMessages.LaunchConfigurationTab_RubyEntryPoint_invalidFileSelectionMessage;
assertEquals("The tab should set the error message for no file.", errorMessage, tab.getErrorMessage());
configuration.setAttribute(RubyLaunchConfigurationAttribute.FILE_NAME, "myFileName");
Modified: trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEnvironmentTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEnvironmentTab.java 2007-01-22 20:57:20 UTC (rev 1848)
+++ trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyEnvironmentTab.java 2007-01-22 21:00:44 UTC (rev 1849)
@@ -21,7 +21,7 @@
String errorMessage = tab.getErrorMessage();
assertNull("There should be no error message.", errorMessage);
assertTrue("The tab is not valid when the configuration is completely empty.", !tab.isValid(configuration));
- errorMessage = RdtDebugUiMessages.getString("LaunchConfigurationTab.RubyEnvironment.interpreter_not_selected_error_message");
+ errorMessage = RdtDebugUiMessages.LaunchConfigurationTab_RubyEnvironment_interpreter_not_selected_error_message;
assertEquals("The tab should set the error message for no interpreter selected.", errorMessage, tab.getErrorMessage());
configuration.setAttribute(RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, "anInterpreter");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|