diff options
Diffstat (limited to 'dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt')
11 files changed, 19 insertions, 33 deletions
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 index 1faea82e179..1faea82e179 100644 --- 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 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 index 6866aeb6863..6866aeb6863 100644 --- 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 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 index d043fac2d3e..d043fac2d3e 100644 --- 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 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 index 6fc5cb55d34..6fc5cb55d34 100644 --- 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 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() { } } |