Removed hardcoded bundle names.

5 files changed, 9 insertions, 17 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