From 1ddf51d57757d16e7e340da7d95fdd89f1d1d10b Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 21 Jun 2010 00:35:25 +0000 Subject: [PATCH] Removed hardcoded bundle names. --- .../adapters/ElementAdapterMessages.java | 7 +- .../ui/views/executables/Messages.java | 4 +- ...essages.properties => Messages.properties} | 0 .../internal/ui/views/memory/Messages.java | 16 ++- ...essages.properties => Messages.properties} | 0 .../debug/ui/importexecutable/Messages.java | 105 ++++++------------ ...essages.properties => Messages.properties} | 0 .../gdb/internal/ui/breakpoints/Messages.java | 4 +- ...essages.properties => Messages.properties} | 0 .../internal/ui/console/ConsoleMessages.java | 4 +- .../launch/MessagesForGdbLaunchVM.java | 8 +- ...ties => MessagesForGdbLaunchVM.properties} | 0 .../service/command/events/Messages.java | 8 +- .../cdt/dsf/debug/internal/ui/Messages.java | 4 +- ...essages.properties => Messages.properties} | 0 .../ui/disassembly/DisassemblyMessages.java | 13 +-- .../detailsupport/MessagesForDetailPane.java | 9 +- ...rties => MessagesForDetailPane.properties} | 0 .../ui/viewmodel/MessagesForDebugVM.java | 5 +- ...operties => MessagesForDebugVM.properties} | 0 .../expression/MessagesForExpressionVM.java | 4 +- ...ies => MessagesForExpressionVM.properties} | 0 .../launch/LaunchVMUpdateMessages.java | 8 +- .../update/ViewModelUpdateMessages.java | 9 +- 24 files changed, 73 insertions(+), 135 deletions(-) rename debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/{messages.properties => Messages.properties} (100%) rename debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/{messages.properties => Messages.properties} (100%) rename debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/{messages.properties => Messages.properties} (100%) rename dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/{messages.properties => Messages.properties} (100%) rename dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/{messages.properties => MessagesForGdbLaunchVM.properties} (100%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/{messages.properties => Messages.properties} (100%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/{messages.properties => MessagesForDetailPane.properties} (100%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/{messages.properties => MessagesForDebugVM.properties} (100%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/{messages.properties => MessagesForExpressionVM.properties} (100%) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/ElementAdapterMessages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/ElementAdapterMessages.java index fd05d3c98d6..2acb0ac831f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/ElementAdapterMessages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/ElementAdapterMessages.java @@ -14,16 +14,13 @@ package org.eclipse.cdt.debug.internal.ui.elements.adapters; import org.eclipse.osgi.util.NLS; public class ElementAdapterMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.elements.adapters.ElementAdapterMessages"; //$NON-NLS-1$ - public static String RegistersViewColumnPresentation_0; - public static String RegistersViewColumnPresentation_1; - public static String RegistersViewColumnPresentation_2; + static { // initialize resource bundle - NLS.initializeMessages( BUNDLE_NAME, ElementAdapterMessages.class ); + NLS.initializeMessages(ElementAdapterMessages.class.getName(), ElementAdapterMessages.class); } private ElementAdapterMessages() { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java index 0de4f34c9e4..1507dfb3d19 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.views.executables.messages"; //$NON-NLS-1$ public static String ExecutablesContentProvider_FetchingExecutables; public static String ExecutablesView_Columns; public static String ExecutablesView_ConfigureColumns; @@ -61,9 +60,10 @@ public class Messages extends NLS { public static String SourceFilesViewer_Size; public static String SourceFilesViewer_SourceFileName; public static String SourceFilesViewer_Type; + static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } private Messages() { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.properties similarity index 100% rename from debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties rename to debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.properties diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.java index 258793cf9ed..ffc2d5eca99 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.java @@ -14,14 +14,6 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - - private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$ - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - public static String AddMemBlockDlg_enterAddrAndMemSpace; public static String AddMemBlockDlg_enterExpression; public static String AddMemBlockDlg_or; @@ -32,5 +24,11 @@ public class Messages extends NLS { public static String AddMemBlocks_failed; public static String AddMemBlocks_input_invalid; -} + static { + // initialize resource bundle + NLS.initializeMessages(Messages.class.getName(), Messages.class); + } + private Messages() { + } +} diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/messages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.properties similarity index 100% rename from debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/messages.properties rename to debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/Messages.properties diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.java index 6f741af436a..d3fe6942e71 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.java @@ -14,81 +14,46 @@ package org.eclipse.cdt.debug.ui.importexecutable; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.ui.importexecutable.messages"; //$NON-NLS-1$ + public static String AbstractImportExecutableWizard_ErrorImporting; + public static String AbstractImportExecutableWizard_windowTitle; + public static String AbstractImportExecutableWizard_CreateLaunchConfiguration; + public static String ImportExecutableWizard_pageOneTitle; + public static String ImportExecutableWizard_pageOneDescription; + public static String ImportExecutableWizard_executableListLabel; + public static String ImportExecutableWizard_fileDialogTitle; + public static String ImportExecutableWizard_AllFiles; + public static String ImportExecutableWizard_Applications; + public static String ImportExecutableWizard_LIbaries; + public static String ImportExecutablePageOne_SearchDirectory; + public static String ImportExecutablePageOne_SelectExecutable; + public static String ImportExecutablePageOne_NoteAnEXE; + public static String ImportExecutablePageOne_NoSuchFile; + public static String ImportExecutablePageOne_Browse; + public static String ImportExecutablePageOne_SelectAll; + public static String ImportExecutablePageOne_DeselectAll; + public static String ImportExecutablePageOne_SelectADirectory; + public static String ImportExecutablePageOne_Searching; + public static String ImportExecutablePageOne_ProcessingResults; + public static String ImportExecutablePageOne_SelectBinaryParser; + public static String ImportExecutablePageTwo_ChooseProject; + public static String ImportExecutablePageTwo_ChooseExisting; + public static String ImportExecutablePageTwo_BadProjectName; + public static String ImportExecutablePageTwo_EnterLaunchConfig; + public static String ImportExecutablePageTwo_EnterProjectName; + public static String ImportExecutablePageTwo_ProjectAlreadyExists; + public static String ImportExecutablePageTwo_NewProjectName; + public static String ImportExecutablePageTwo_ProjectLabel; + public static String ImportExecutablePageTwo_ExistingProject; + public static String ImportExecutablePageTwo_Search; + public static String ImportExecutablePageTwo_CreateLaunch; + public static String ImportExecutablePageTwo_Name; + public static String ImportExecutablePageTwo_DefaultProjectPrefix; private Messages() { } static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } - - public static String AbstractImportExecutableWizard_ErrorImporting; - - public static String ImportExecutableWizard_pageOneTitle; - - public static String ImportExecutableWizard_pageOneDescription; - - public static String ImportExecutableWizard_executableListLabel; - - public static String ImportExecutableWizard_fileDialogTitle; - - public static String ImportExecutableWizard_AllFiles; - - public static String ImportExecutableWizard_Applications; - - public static String ImportExecutableWizard_LIbaries; - - public static String ImportExecutablePageOne_SearchDirectory; - - public static String ImportExecutablePageOne_SelectExecutable; - - public static String ImportExecutablePageOne_NoteAnEXE; - - public static String ImportExecutablePageOne_NoSuchFile; - - public static String ImportExecutablePageOne_Browse; - - public static String ImportExecutablePageOne_SelectAll; - - public static String ImportExecutablePageOne_DeselectAll; - - public static String ImportExecutablePageOne_SelectADirectory; - - public static String ImportExecutablePageOne_Searching; - - public static String ImportExecutablePageOne_ProcessingResults; - - public static String ImportExecutablePageTwo_ChooseProject; - - public static String ImportExecutablePageTwo_ChooseExisting; - - public static String ImportExecutablePageTwo_BadProjectName; - - public static String ImportExecutablePageTwo_EnterLaunchConfig; - - public static String ImportExecutablePageTwo_EnterProjectName; - - public static String ImportExecutablePageTwo_ProjectAlreadyExists; - - public static String ImportExecutablePageTwo_NewProjectName; - - public static String ImportExecutablePageTwo_ProjectLabel; - - public static String ImportExecutablePageTwo_ExistingProject; - - public static String ImportExecutablePageTwo_Search; - - public static String ImportExecutablePageTwo_CreateLaunch; - - public static String ImportExecutablePageTwo_Name; - - public static String ImportExecutablePageTwo_DefaultProjectPrefix; - - public static String AbstractImportExecutableWizard_windowTitle; - - public static String AbstractImportExecutableWizard_CreateLaunchConfiguration; - - public static String ImportExecutablePageOne_SelectBinaryParser; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/messages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.properties similarity index 100% rename from debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/messages.properties rename to debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/Messages.properties diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.java index 6a18ac2bf94..2eeb0e892b3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.java @@ -13,8 +13,6 @@ package org.eclipse.cdt.dsf.gdb.internal.ui.breakpoints; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME= "org.eclipse.cdt.dsf.gdb.internal.ui.breakpoints.messages"; //$NON-NLS-1$ - public static String ToggleTracepointsTargetFactory_description; public static String ToggleTracepointsTargetFactory_name; public static String TracepointPropertyPage_integer_negative; @@ -36,7 +34,7 @@ public class Messages extends NLS { static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } private Messages() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/messages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.properties similarity index 100% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/messages.properties rename to dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/Messages.properties diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsoleMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsoleMessages.java index 18e89578b3e..059e39b039b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsoleMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsoleMessages.java @@ -16,8 +16,6 @@ import org.eclipse.osgi.util.NLS; * @since 2.1 */ public class ConsoleMessages extends NLS { - private static final String BUNDLE_NAME= "org.eclipse.cdt.dsf.gdb.internal.ui.console.ConsoleMessages"; //$NON-NLS-1$ - public static String ConsoleMessages_trace_console_name; public static String ConsoleMessages_trace_console_terminated; @@ -29,7 +27,7 @@ public class ConsoleMessages extends NLS { static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, ConsoleMessages.class); + NLS.initializeMessages(ConsoleMessages.class.getName(), ConsoleMessages.class); } private ConsoleMessages() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.java index 54e6bff1c86..8d8f09727ca 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.java @@ -17,16 +17,14 @@ import org.eclipse.osgi.util.NLS; * @noinstantiate This class is not intended to be instantiated by clients. */ public class MessagesForGdbLaunchVM extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch.messages"; //$NON-NLS-1$ + public static String ThreadVMNode_No_columns__text_format; + public static String ThreadVMNode_No_columns__Error__label; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, MessagesForGdbLaunchVM.class); + NLS.initializeMessages(MessagesForGdbLaunchVM.class.getName(), MessagesForGdbLaunchVM.class); } private MessagesForGdbLaunchVM() { } - - public static String ThreadVMNode_No_columns__text_format; - public static String ThreadVMNode_No_columns__Error__label; } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/messages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.properties similarity index 100% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/messages.properties rename to dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/MessagesForGdbLaunchVM.properties diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java index 54192eadb8c..b6946be763d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java @@ -17,16 +17,14 @@ import org.eclipse.osgi.util.NLS; * @noinstantiate This class is not intended to be instantiated by clients. */ public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.internal.service.command.events.messages"; //$NON-NLS-1$ + public static String Tracepoint; + public static String Record; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } private Messages() { } - - public static String Tracepoint; - public static String Record; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.java index 7b5b9b922fa..f28a4ab53a5 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.java @@ -14,14 +14,12 @@ package org.eclipse.cdt.dsf.debug.internal.ui; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME= "org.eclipse.cdt.dsf.debug.internal.ui.messages"; //$NON-NLS-1$ - public static String ToggleBreakpointsTargetFactory_description; public static String ToggleBreakpointsTargetFactory_name; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } private Messages() { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/messages.properties b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.properties similarity index 100% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/messages.properties rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/Messages.properties diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyMessages.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyMessages.java index 68136db4131..483cef42c28 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyMessages.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyMessages.java @@ -15,7 +15,6 @@ import java.util.ResourceBundle; import org.eclipse.osgi.util.NLS; public final class DisassemblyMessages extends NLS { - private static final String BUNDLE_FOR_CONSTRUCTED_KEYS = "org.eclipse.cdt.dsf.debug.internal.ui.disassembly.ConstructedDisassemblyMessages";//$NON-NLS-1$ private static ResourceBundle fgBundleForConstructedKeys = ResourceBundle.getBundle(BUNDLE_FOR_CONSTRUCTED_KEYS); @@ -28,12 +27,6 @@ public final class DisassemblyMessages extends NLS { return fgBundleForConstructedKeys; } - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyMessages";//$NON-NLS-1$ - - private DisassemblyMessages() { - // Do not instantiate - } - public static String Disassembly_action_ShowAddresses_label; public static String Disassembly_action_ShowFunctionOffsets_label; public static String Disassembly_action_ShowSource_label; @@ -85,6 +78,10 @@ public final class DisassemblyMessages extends NLS { public static String DisassemblyBackendDsf_error_UnableToRetrieveData; static { - NLS.initializeMessages(BUNDLE_NAME, DisassemblyMessages.class); + NLS.initializeMessages(DisassemblyMessages.class.getName(), DisassemblyMessages.class); + } + + // Do not instantiate + private DisassemblyMessages() { } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.java index d8d26ba0898..c6733b263e4 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.java @@ -15,12 +15,8 @@ package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.detailsupport; import org.eclipse.osgi.util.NLS; public class MessagesForDetailPane extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.detailsupport.messages"; //$NON-NLS-1$ - public static String NumberFormatDetailPane_Name; public static String NumberFormatDetailPane_Description; - public static String DetailPane_Copy; public static String DetailPane_LabelPattern; public static String DetailPane_Select_All; @@ -33,8 +29,9 @@ public class MessagesForDetailPane extends NLS { static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, MessagesForDetailPane.class); + NLS.initializeMessages(MessagesForDetailPane.class.getName(), MessagesForDetailPane.class); } - private MessagesForDetailPane() {} + private MessagesForDetailPane() { + } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/messages.properties b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.properties similarity index 100% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/messages.properties rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/MessagesForDetailPane.properties diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.java index 0124fad6e36..5803cef1dbc 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.java @@ -17,15 +17,12 @@ import org.eclipse.osgi.util.NLS; * @noinstantiate This class is not intended to be instantiated by clients. */ public class MessagesForDebugVM extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.debug.ui.viewmodel.messages"; //$NON-NLS-1$ - public static String ErrorLabelText__text_format; public static String ErrorLabelText_Error_message__text_page_break_delimiter; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, MessagesForDebugVM.class); + NLS.initializeMessages(MessagesForDebugVM.class.getName(), MessagesForDebugVM.class); } private MessagesForDebugVM() {} diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/messages.properties b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.properties similarity index 100% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/messages.properties rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/MessagesForDebugVM.properties diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.java index 2c3e2ec902e..22ccee1d961 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.java @@ -16,8 +16,6 @@ import org.eclipse.osgi.util.NLS; * @noinstantiate This class is not intended to be instantiated by clients. */ public class MessagesForExpressionVM extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.messages"; //$NON-NLS-1$ - public static String ExpressionColumnPresentation_expression; public static String ExpressionColumnPresentation_name; public static String ExpressionColumnPresentation_type; @@ -35,7 +33,7 @@ public class MessagesForExpressionVM extends NLS { static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, MessagesForExpressionVM.class); + NLS.initializeMessages(MessagesForExpressionVM.class.getName(), MessagesForExpressionVM.class); } private MessagesForExpressionVM() { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/messages.properties b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.properties similarity index 100% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/messages.properties rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.properties diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchVMUpdateMessages.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchVMUpdateMessages.java index 8d4908ccccb..fd08f981f52 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchVMUpdateMessages.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchVMUpdateMessages.java @@ -16,14 +16,14 @@ import org.eclipse.osgi.util.NLS; * @since 1.1 */ public class LaunchVMUpdateMessages extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.LaunchVMUpdateMessages";//$NON-NLS-1$ - public static String ThreadsAutomaticUpdatePolicy_name; public static String ThreadsManualUpdatePolicy_name; static { // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, LaunchVMUpdateMessages.class); + NLS.initializeMessages(LaunchVMUpdateMessages.class.getName(), LaunchVMUpdateMessages.class); + } + + private LaunchVMUpdateMessages() { } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java index d1007d4f823..eb3e4a88934 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java @@ -13,12 +13,8 @@ package org.eclipse.cdt.dsf.ui.viewmodel.update; import org.eclipse.osgi.util.NLS; public class ViewModelUpdateMessages extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.ui.viewmodel.update.ViewModelUpdateMessages";//$NON-NLS-1$ - public static String AutomaticUpdatePolicy_name; public static String ManualUpdatePolicy_InitialDataElement__label; - public static String ManualUpdatePolicy_name; /** * @since 1.1 @@ -31,6 +27,9 @@ public class ViewModelUpdateMessages extends NLS { static { // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, ViewModelUpdateMessages.class); + NLS.initializeMessages(ViewModelUpdateMessages.class.getName(), ViewModelUpdateMessages.class); + } + + private ViewModelUpdateMessages() { } }