Removed hardcoded bundle names.

7 files changed, 20 insertions, 60 deletions

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
index 4262cb72bcd..4262cb72bcd 100644
--- 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
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
index face5431f25..face5431f25 100644
--- 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
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$
-
-	private Messages() {
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
 	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;
 
-	public static String AbstractImportExecutableWizard_windowTitle;
+	private Messages() {
+	}
 
-	public static String AbstractImportExecutableWizard_CreateLaunchConfiguration;
-	
-	public static String ImportExecutablePageOne_SelectBinaryParser;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
 }
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
index 2f486672af4..2f486672af4 100644
--- 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