Bug 90318 - Change string externalization to use new format

41 files changed, 457 insertions, 318 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java
index 0c59979d2..af63e560e 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java
@@ -305,9 +305,9 @@ public final class DebugEvent extends EventObject {
 	public DebugEvent(Object eventSource, int kind, int detail) {
 		super(eventSource);
 		if ((kind & (RESUME | SUSPEND | CREATE | TERMINATE | CHANGE | MODEL_SPECIFIC)) == 0)
-			throw new IllegalArgumentException(DebugCoreMessages.getString("DebugEvent.illegal_kind")); //$NON-NLS-1$
+			throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_kind); //$NON-NLS-1$
 		if (kind != MODEL_SPECIFIC && detail != UNSPECIFIED && (detail & (STEP_END | STEP_INTO | STEP_OVER | STEP_RETURN | BREAKPOINT | CLIENT_REQUEST |EVALUATION | EVALUATION_IMPLICIT | STATE | CONTENT)) == 0)
-			throw new IllegalArgumentException(DebugCoreMessages.getString("DebugEvent.illegal_detail")); //$NON-NLS-1$
+			throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_detail); //$NON-NLS-1$
 		fKind= kind;
 		fDetail= detail;
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
index d90bb97ca..126916727 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
@@ -321,7 +321,7 @@ public class DebugPlugin extends Plugin {
          * Creates a new event dispatch job.
          */
         public EventDispatchJob() {
-            super(DebugCoreMessages.getString("DebugPlugin.1")); //$NON-NLS-1$
+            super(DebugCoreMessages.DebugPlugin_1); //$NON-NLS-1$
             setPriority(Job.INTERACTIVE);
         }
         /* (non-Javadoc)
@@ -511,7 +511,7 @@ public class DebugPlugin extends Plugin {
 				if (handler instanceof IStatusHandler) {
 					return (IStatusHandler)handler;
 				}
-				invalidStatusHandler(null, MessageFormat.format(DebugCoreMessages.getString("DebugPlugin.Registered_status_handler_{0}_does_not_implement_required_interface_IStatusHandler._1"), new String[] {config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
+				invalidStatusHandler(null, MessageFormat.format(DebugCoreMessages.DebugPlugin_Registered_status_handler__0__does_not_implement_required_interface_IStatusHandler__1, new String[] {config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
 			} catch (CoreException e) {
 				log(e);
 			}
@@ -746,11 +746,11 @@ public class DebugPlugin extends Plugin {
 				if (p != null) {
 					p.destroy();
 				}
-				Status status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.getString("DebugPlugin.Exception_occurred_executing_command_line._1"), e); //$NON-NLS-1$
+				Status status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_Exception_occurred_executing_command_line__1, e); //$NON-NLS-1$
 				throw new CoreException(status);
 		} catch (NoSuchMethodError e) {
 			//attempting launches on 1.2.* - no ability to set working directory			
-			IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), ERR_WORKING_DIRECTORY_NOT_SUPPORTED, DebugCoreMessages.getString("DebugPlugin.Eclipse_runtime_does_not_support_working_directory_2"), e); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), ERR_WORKING_DIRECTORY_NOT_SUPPORTED, DebugCoreMessages.DebugPlugin_Eclipse_runtime_does_not_support_working_directory_2, e); //$NON-NLS-1$
 			IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
 			
 			if (handler != null) {
@@ -918,13 +918,13 @@ public class DebugPlugin extends Plugin {
 			} else {
 				// invalid process factory
 				String badDefiner= infos[i].getNamespace();
-				log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("DebugPlugin.31"), new String[] {badDefiner, id}), null)); //$NON-NLS-1$
+				log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_31, new String[] {badDefiner, id}), null)); //$NON-NLS-1$
 			}
 		}			
 	}
 	
 	private void invalidStatusHandler(Exception e, String id) {
-		log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("DebugPlugin.Invalid_status_handler_extension__{0}_2"), new String[] {id}), e)); //$NON-NLS-1$
+		log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_Invalid_status_handler_extension___0__2, new String[] {id}), e)); //$NON-NLS-1$
 	}
 	
 	/**
@@ -993,7 +993,7 @@ public class DebugPlugin extends Plugin {
 	class AsynchJob extends Job {
 		
 		public AsynchJob() {
-			super(DebugCoreMessages.getString("DebugPlugin.Debug_async_queue_1")); //$NON-NLS-1$
+			super(DebugCoreMessages.DebugPlugin_Debug_async_queue_1); //$NON-NLS-1$
 			setPriority(Job.INTERACTIVE);
 			setSystem(true);
 		}
@@ -1016,7 +1016,7 @@ public class DebugPlugin extends Plugin {
 				fRunnables = new Vector(5);
 			}
 			MultiStatus failed = null;
-			monitor.beginTask(DebugCoreMessages.getString("DebugPlugin.Debug_async_queue_1"), v.size()); //$NON-NLS-1$
+			monitor.beginTask(DebugCoreMessages.DebugPlugin_Debug_async_queue_1, v.size()); //$NON-NLS-1$
 			Iterator iter = v.iterator();
 			while (iter.hasNext() && !fShuttingDown && !monitor.isCanceled()) {
 				Runnable r = (Runnable)iter.next();
@@ -1024,9 +1024,9 @@ public class DebugPlugin extends Plugin {
 					r.run();
 				} catch (Exception e) {
 					if (failed == null) {
-						failed = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("DebugPlugin.0"), null); //$NON-NLS-1$
+						failed = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, null); //$NON-NLS-1$
 					}
-					failed.add(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("DebugPlugin.0"), e)); //$NON-NLS-1$
+					failed.add(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, e)); //$NON-NLS-1$
 				}
 				monitor.worked(1);
 			}
@@ -1065,11 +1065,11 @@ public class DebugPlugin extends Plugin {
 		public void handleException(Throwable exception) {
 			switch (fMode) {
 				case NOTIFY_FILTERS:
-					IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.getString("DebugPlugin.An_exception_occurred_while_filtering_debug_events._3"), exception); //$NON-NLS-1$
+					IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_filtering_debug_events__3, exception); //$NON-NLS-1$
 					log(status);
 					break;
 				case NOTIFY_EVENTS:				
-					status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.getString("DebugPlugin.An_exception_occurred_while_dispatching_debug_events._2"), exception); //$NON-NLS-1$
+					status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_dispatching_debug_events__2, exception); //$NON-NLS-1$
 					log(status);
 					break;
 			}
@@ -1140,7 +1140,7 @@ public class DebugPlugin extends Plugin {
 		try {
 			return LaunchManager.getDocument();
 		} catch (ParserConfigurationException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.3"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_3, e); //$NON-NLS-1$
 		}		
 		return null;
 	}	
@@ -1157,9 +1157,9 @@ public class DebugPlugin extends Plugin {
 		try {
 			return LaunchManager.serializeDocument(document);
 		} catch (TransformerException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.4"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_4, e); //$NON-NLS-1$
 		} catch (IOException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.5"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_5, e); //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -1182,18 +1182,18 @@ public class DebugPlugin extends Plugin {
 			stream = new ByteArrayInputStream(document.getBytes());
 			root = parser.parse(stream).getDocumentElement();
 		} catch (ParserConfigurationException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.6"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_6, e); //$NON-NLS-1$
 		} catch (FactoryConfigurationError e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.7"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_7, e); //$NON-NLS-1$
 		} catch (SAXException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.8"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_8, e); //$NON-NLS-1$
 		} catch (IOException e) {
-			abort(SourceLookupMessages.getString("SourceLookupUtils.9"), e); //$NON-NLS-1$
+			abort(SourceLookupMessages.SourceLookupUtils_9, e); //$NON-NLS-1$
 		} finally { 
 			try{
 				stream.close();
 			} catch(IOException e) {
-				abort(SourceLookupMessages.getString("SourceLookupUtils.10"), e); //$NON-NLS-1$
+				abort(SourceLookupMessages.SourceLookupUtils_10, e); //$NON-NLS-1$
 			}
 		}		
 		return root;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
index d1edec93d..ae92c728f 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
@@ -230,7 +230,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	 */
 	public void terminate() throws DebugException {
 		MultiStatus status= 
-			new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugCoreMessages.getString("Launch.terminate_failed"), null); //$NON-NLS-1$
+			new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugCoreMessages.Launch_terminate_failed, null); //$NON-NLS-1$
 		
 		// terminate the system processes
 		IProcess[] processes = getProcesses();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
index 6e96828dd..5c921c851 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
@@ -266,7 +266,7 @@ public abstract class Breakpoint extends PlatformObject implements IBreakpoint {
 		IMarker m = getMarker();
 		if (m == null || !m.exists()) {
 			throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED,
-				DebugCoreMessages.getString("Breakpoint.no_associated_marker"), null)); //$NON-NLS-1$
+				DebugCoreMessages.Breakpoint_no_associated_marker, null)); //$NON-NLS-1$
 		}
 		return m;
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
index 54818ef08..9fde8c977 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
@@ -131,10 +131,10 @@ public abstract class LaunchConfigurationDelegate implements ILaunchConfiguratio
 		}
 		boolean continueLaunch = true;
 			
-		monitor.subTask(DebugCoreMessages.getString("LaunchConfigurationDelegate.6")); //$NON-NLS-1$
+		monitor.subTask(DebugCoreMessages.LaunchConfigurationDelegate_6); //$NON-NLS-1$
 		List errors = new ArrayList();
 		for (int i = 0; i < projects.length; i++) {
-			monitor.subTask(DebugCoreMessages.getString("LaunchConfigurationDelegate.7") + projects[i].getName()); //$NON-NLS-1$
+			monitor.subTask(DebugCoreMessages.LaunchConfigurationDelegate_7 + projects[i].getName()); //$NON-NLS-1$
 			if (existsProblems(projects[i])) {
 				errors.add(projects[i]);
 			}	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
index b4a5e6abc..c4b7925c8 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
@@ -219,7 +219,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 				fMonitor.killThread();
 				fMonitor = null;
 			}
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.getString("RuntimeProcess.terminate_failed"), null);		 //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_terminate_failed, null);		 //$NON-NLS-1$
 			throw new DebugException(status);
 		}
 	}
@@ -349,7 +349,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 		if (isTerminated()) {
 			return fExitValue;
 		} 
-		throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.getString("RuntimeProcess.Exit_value_not_available_until_process_terminates._1"), null)); //$NON-NLS-1$
+		throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_Exit_value_not_available_until_process_terminates__1, null)); //$NON-NLS-1$
 	}
 	
 	/**
@@ -411,7 +411,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 		 * termination.
 		 */
 		public ProcessMonitorThread(RuntimeProcess process) {
-			super(DebugCoreMessages.getString("ProcessMonitorJob.0")); //$NON-NLS-1$
+			super(DebugCoreMessages.ProcessMonitorJob_0); //$NON-NLS-1$
 			fRuntimeProcess= process;
 			fOSProcess= process.getSystemProcess();
 		}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
index e7521cc3e..615376d1b 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
@@ -141,7 +141,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec
 					if (single == null) {
 						single = e;
 					} else if (multiStatus == null) {
-						multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.getString("AbstractSourceLookupDirector.19"), null); //$NON-NLS-1$
+						multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.AbstractSourceLookupDirector_19, null); //$NON-NLS-1$
 						multiStatus.add(e.getStatus());
 					} else {
 						multiStatus.add(e.getStatus());
@@ -236,15 +236,15 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec
 			Element element = (Element)list.item(i);
 			String typeId = element.getAttribute(CONTAINER_TYPE_ATTR);
 			if (typeId == null || typeId.equals("")) {	 //$NON-NLS-1$
-				abort(SourceLookupMessages.getString("AbstractSourceLookupDirector.11"), null); //$NON-NLS-1$
+				abort(SourceLookupMessages.AbstractSourceLookupDirector_11, null); //$NON-NLS-1$
 			}
 			ISourceContainerType type = DebugPlugin.getDefault().getLaunchManager().getSourceContainerType(typeId);
 			if(type == null) {
-				abort(MessageFormat.format(SourceLookupMessages.getString("AbstractSourceLookupDirector.12"), new String[]{typeId}), null); //$NON-NLS-1$
+				abort(MessageFormat.format(SourceLookupMessages.AbstractSourceLookupDirector_12, new String[]{typeId}), null); //$NON-NLS-1$
 			}			
 			String memento = element.getAttribute(CONTAINER_MEMENTO_ATTR);
 			if (memento == null || memento.equals("")) {	 //$NON-NLS-1$
-				abort(SourceLookupMessages.getString("AbstractSourceLookupDirector.13"), null); //$NON-NLS-1$
+				abort(SourceLookupMessages.AbstractSourceLookupDirector_13, null); //$NON-NLS-1$
 			}
 			ISourceContainer container = type.createSourceContainer(memento);
 			containers.add(container);
@@ -396,7 +396,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec
 	    }
 		Element rootElement = DebugPlugin.parseDocument(memento);		
 		if (!rootElement.getNodeName().equalsIgnoreCase(DIRECTOR_ROOT_NODE)) { 
-			abort(SourceLookupMessages.getString("AbstractSourceLookupDirector.14"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.AbstractSourceLookupDirector_14, null); //$NON-NLS-1$
 		}
 		NodeList list = rootElement.getChildNodes();
 		int length = list.getLength();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java
index 4a13a490f..8bdceb406 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java
@@ -92,7 +92,7 @@ public abstract class CompositeSourceContainer extends AbstractSourceContainer {
 				if (single == null) {
 					single = e;
 				} else if (multiStatus == null) {
-					multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.getString("CompositeSourceContainer.0"), null); //$NON-NLS-1$
+					multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.CompositeSourceContainer_0, null); //$NON-NLS-1$
 					multiStatus.add(e.getStatus());
 				} else {
 					multiStatus.add(e.getStatus());
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
index 65e7a416d..b4fa8a24c 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
@@ -98,7 +98,7 @@ public class DefaultSourceContainer extends CompositeSourceContainer {
 	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
 	 */
 	public String getName() {
-		return SourceLookupMessages.getString("DefaultSourceContainer.0"); //$NON-NLS-1$
+		return SourceLookupMessages.DefaultSourceContainer_0; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java
index c8fa36307..3a28b811a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java
@@ -177,7 +177,7 @@ public class ExternalArchiveSourceContainer extends AbstractSourceContainer {
 					}
 				}
 			} catch (IllegalStateException e) {
-				abort(MessageFormat.format(SourceLookupMessages.getString("ExternalArchiveSourceContainer.1"), new String[] {getName()}), e); //$NON-NLS-1$
+				abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_1, new String[] {getName()}), e); //$NON-NLS-1$
 			}
 		}
 		return null;
@@ -192,7 +192,7 @@ public class ExternalArchiveSourceContainer extends AbstractSourceContainer {
 		try {
 			return SourceLookupUtils.getZipFile(fArchivePath);
 		} catch (IOException e) {
-			abort(MessageFormat.format(SourceLookupMessages.getString("ExternalArchiveSourceContainer.2"), new String[]{fArchivePath}), e); //$NON-NLS-1$
+			abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_2, new String[]{fArchivePath}), e); //$NON-NLS-1$
 		}
 		return null;
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
index db17c095b..29b7e578a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
@@ -57,7 +57,7 @@ public class LocalFileStorage extends PlatformObject implements IStorage {
 		try {
 			return new FileInputStream(getFile());
 		} catch (IOException e){
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.getString("LocalFileStorage.0"), e)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.LocalFileStorage_0, e)); //$NON-NLS-1$
 		}
 	}
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
index 3c79abe94..bf1e2ddf2 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
@@ -41,7 +41,7 @@ public class WorkspaceSourceContainer extends CompositeSourceContainer {
 	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
 	 */
 	public String getName() {
-		return SourceLookupMessages.getString("WorkspaceSourceContainer.0"); //$NON-NLS-1$
+		return SourceLookupMessages.WorkspaceSourceContainer_0; //$NON-NLS-1$
 	}
 		
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
index ab286a77f..de406fe21 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
@@ -65,7 +65,7 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 		try {
 			return getArchive().getInputStream(getZipEntry());
 		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.getString("ZipEntryStorage.0"), e)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.ZipEntryStorage_0, e)); //$NON-NLS-1$
 		}
 	}
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
index 6380230e3..9057dbc9c 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
@@ -234,9 +234,9 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 			String markerType = elements[i].getAttribute(MARKER_TYPE);
 			String className = elements[i].getAttribute(CLASS);
 			if (markerType == null) {
-				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.getString("BreakpointManager.Breakpoint_extension_{0}_missing_required_attribute__markerType_1"), new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
+				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__markerType_1, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
 			} else if (className == null){
-				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.getString("BreakpointManager.Breakpoint_extension_{0}_missing_required_attribute__class_2"), new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
+				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__class_2, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
 			} else {
 				fBreakpointExtensions.put(markerType, elements[i]);
 			}
@@ -402,14 +402,14 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 			IConfigurationElement config = (IConfigurationElement)fBreakpointExtensions.get(marker.getType());
 			if (config == null) {
 				throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), 
-					DebugException.CONFIGURATION_INVALID, MessageFormat.format(DebugCoreMessages.getString("BreakpointManager.Missing_breakpoint_definition"), new String[] {marker.getType()}), null)); //$NON-NLS-1$
+					DebugException.CONFIGURATION_INVALID, MessageFormat.format(DebugCoreMessages.BreakpointManager_Missing_breakpoint_definition, new String[] {marker.getType()}), null)); //$NON-NLS-1$
 			}
 			Object object = config.createExecutableExtension(CLASS);
 			if (object instanceof IBreakpoint) {
 				breakpoint = (IBreakpoint)object;
 				breakpoint.setMarker(marker);
 			} else {
-				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.getString("BreakpointManager.Class_{0}_specified_by_breakpoint_extension_{1}_does_not_implement_required_interface_IBreakpoint._3"), new String[]{config.getAttribute(CLASS), config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
+				invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Class__0__specified_by_breakpoint_extension__1__does_not_implement_required_interface_IBreakpoint__3, new String[]{config.getAttribute(CLASS), config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$
 			}
 			return breakpoint;		
 		} catch (CoreException e) {
@@ -514,7 +514,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 			String id= breakpoint.getModelIdentifier();
 			if (id == null) {
 				throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), 
-					DebugException.CONFIGURATION_INVALID, DebugCoreMessages.getString("BreakpointManager.Missing_model_identifier"), null)); //$NON-NLS-1$
+					DebugException.CONFIGURATION_INVALID, DebugCoreMessages.BreakpointManager_Missing_model_identifier, null)); //$NON-NLS-1$
 			}
 		} catch (CoreException e) {
 			throw new DebugException(e.getStatus());
@@ -776,7 +776,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("BreakpointManager.An_exception_occurred_during_breakpoint_change_notification._4"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__4, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
@@ -840,7 +840,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("BreakpointManager.An_exception_occurred_during_breakpoint_change_notification._5"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
@@ -943,7 +943,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("BreakpointManager.An_exception_occurred_during_breakpoint_change_notification._5"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java
index c2aa5bdf2..b3da6b6d2 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java
@@ -104,7 +104,7 @@ public class ContributedDelegate {
 			if (object instanceof ILaunchConfigurationDelegate) {
 				fDelegate = (ILaunchConfigurationDelegate)object;
 			} else {
-				throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationType.Launch_delegate_for_{0}_does_not_implement_required_interface_ILaunchConfigurationDelegate._1"), new String[]{getIdentifier()}), null)); //$NON-NLS-1$
+				throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getIdentifier()}), null)); //$NON-NLS-1$
 			}		
 		}
 		return fDelegate;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
index bdac8b59d..351192280 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
@@ -1,32 +1,119 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
 package org.eclipse.debug.internal.core;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
 
-public class DebugCoreMessages {
+public class DebugCoreMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.debug.internal.core.DebugCoreMessages";//$NON-NLS-1$
+	//
+	// Copyright (c) 2000, 2005 IBM Corporation and others.
+	// All rights reserved. This program and the accompanying materials
+	// are made available under the terms of the Eclipse Public License v1.0
+	// which accompanies this distribution, and is available at
+	// http://www.eclipse.org/legal/epl-v10.html
+	//
+	// Contributors:
+	//     IBM Corporation - initial API and implementation
+	//
 
-	private static final String RESOURCE_BUNDLE= "org.eclipse.debug.internal.core.DebugCoreMessages";//$NON-NLS-1$
+	public static String Breakpoint_no_associated_marker;
 
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+	public static String BreakpointManager_Missing_breakpoint_definition;
+	public static String BreakpointManager_Missing_model_identifier;
+	public static String BreakpointManager_Breakpoint_extension__0__missing_required_attribute__markerType_1;
+	public static String BreakpointManager_Breakpoint_extension__0__missing_required_attribute__class_2;
+	public static String BreakpointManager_Class__0__specified_by_breakpoint_extension__1__does_not_implement_required_interface_IBreakpoint__3;
+	public static String BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__4;
+	public static String BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5;
 
-	private DebugCoreMessages() {
-	}
+	public static String DebugEvent_illegal_detail;
+	public static String DebugEvent_illegal_kind;
+
+	public static String DebugPlugin_Invalid_status_handler_extension___0__2;
+	public static String DebugPlugin_Debug_async_queue_1;
+	public static String DebugPlugin_Exception_occurred_executing_command_line__1;
+	public static String DebugPlugin_Eclipse_runtime_does_not_support_working_directory_2;
+	public static String DebugPlugin_Registered_status_handler__0__does_not_implement_required_interface_IStatusHandler__1;
+	public static String DebugPlugin_An_exception_occurred_while_dispatching_debug_events__2;
+	public static String DebugPlugin_An_exception_occurred_while_filtering_debug_events__3;
+	public static String DebugPlugin_31;
+	public static String DebugPlugin_0;
+	public static String DebugPlugin_1;
+
+	public static String EnvironmentVariableResolver_0;
+
+	public static String InputStreamMonitor_label;
+
+	public static String Launch_terminate_failed;
+
+	public static String LaunchConfiguration_Exception_occurred_creating_launch_configuration_memento_9;
+	public static String LaunchConfiguration_Exception_occurred_parsing_memento_5;
+	public static String LaunchConfiguration_Failed_to_delete_launch_configuration__1;
+	public static String LaunchConfiguration_Invalid_launch_configuration_memento__missing_path_attribute_3;
+	public static String LaunchConfiguration_Invalid_launch_configuration_memento__missing_local_attribute_4;
+	public static String LaunchConfiguration_Unable_to_restore_location_for_launch_configuration_from_memento___0__1;
+	public static String LaunchConfiguration_Unable_to_generate_memento_for__0___shared_file_does_not_exist__1;
+	public static String LaunchConfiguration_13;
+	public static String LaunchConfigurationDelegate_6;
+	public static String LaunchConfigurationDelegate_7;
+
+	public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3;
+	public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2;
+	public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1;
+	public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_List__1;
+	public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_Map__1;
+	public static String LaunchConfigurationInfo_Invalid_launch_configuration_XML__10;
+	public static String LaunchConfigurationInfo_missing_type;
+	public static String LaunchConfigurationInfo_36;
+
+	public static String LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1;
+	public static String LaunchConfigurationWorkingCopy_Specified_container_for_launch_configuration_does_not_exist_2;
+	public static String LaunchConfigurationWorkingCopy_5;
+
+	public static String LaunchManager__0__occurred_while_reading_launch_configuration_file__1___1;
+	public static String LaunchManager_Invalid_launch_configuration_index__18;
+	public static String LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12;
+	public static String LaunchManager_does_not_exist;
+	public static String LaunchManager_Source_locator_does_not_exist___0__13;
+	public static String LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1;
+	public static String LaunchManager_An_exception_occurred_during_launch_change_notification__1;
+	public static String LaunchManager_An_exception_occurred_during_launch_configuration_change_notification__3;
+	public static String LaunchManager_30;
+
+	public static String LaunchMode_1;
+
+	public static String LogicalStructureType_7;
+	public static String LogicalStructureType_0;
+	public static String LogicalStructureProvider_0;
+	public static String LogicalStructureProvider_1;
+
+	public static String OutputStreamMonitor_label;
+
+	public static String ProcessMonitorJob_0;
+
+	public static String RuntimeProcess_terminate_failed;
+	public static String RuntimeProcess_Exit_value_not_available_until_process_terminates__1;
+
+	public static String ExpressionManager_An_exception_occurred_during_expression_change_notification__1;
+
+	public static String LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1;
+	public static String LaunchConfigurationType_9;
+	public static String LaunchConfigurationType_10;
+
+	public static String MemoryRenderingManager_ErrorMsg;
+	public static String WatchExpression_0;
+	public static String NullStreamsProxy_0;
 
-	public static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, DebugCoreMessages.class);
 	}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
index 75d7e71c5..ccfb9c4b9 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
@@ -1,98 +1,98 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Breakpoint.no_associated_marker=Breakpoint does not have an associated marker.
-
-BreakpointManager.Missing_breakpoint_definition=Missing breakpoint definition for marker type {0}
-BreakpointManager.Missing_model_identifier=Breakpoint missing debug model identifier
-BreakpointManager.Breakpoint_extension_{0}_missing_required_attribute__markerType_1=Breakpoint extension {0} missing required attribute: markerType
-BreakpointManager.Breakpoint_extension_{0}_missing_required_attribute__class_2=Breakpoint extension {0} missing required attribute: class
-BreakpointManager.Class_{0}_specified_by_breakpoint_extension_{1}_does_not_implement_required_interface_IBreakpoint._3=Class {0} specified by breakpoint extension {1} does not implement required interface IBreakpoint.
-BreakpointManager.An_exception_occurred_during_breakpoint_change_notification._4=An exception occurred during breakpoint change notification.
-BreakpointManager.An_exception_occurred_during_breakpoint_change_notification._5=An exception occurred during breakpoint change notification.
-
-DebugEvent.illegal_detail=detail is not one of the allowed constants, see IDebugEventConstants
-DebugEvent.illegal_kind=kind is not one of the allowed constants, see IDebugEventConstants
-
-DebugPlugin.Invalid_status_handler_extension__{0}_2=Invalid status handler extension: {0}
-DebugPlugin.Debug_async_queue_1=Debug async queue
-DebugPlugin.Exception_occurred_executing_command_line._1=Exception occurred executing command line.
-DebugPlugin.Eclipse_runtime_does_not_support_working_directory_2=Eclipse runtime does not support working directory
-DebugPlugin.Registered_status_handler_{0}_does_not_implement_required_interface_IStatusHandler._1=Registered status handler {0} does not implement required interface IStatusHandler.
-DebugPlugin.An_exception_occurred_while_dispatching_debug_events._2=An exception occurred while dispatching debug events.
-DebugPlugin.An_exception_occurred_while_filtering_debug_events._3=An exception occurred while filtering debug events.
-DebugPlugin.31=Invalid process factory extension contributed by {0}; id: {1}
-DebugPlugin.0=Exception processing debug async queue
-DebugPlugin.1=Debug Event Dispatch
-
-EnvironmentVariableResolver.0=Environment variable not specified
-
-InputStreamMonitor.label=Input Stream Monitor
-
-Launch.terminate_failed=Terminate failed
-
-LaunchConfiguration.Exception_occurred_creating_launch_configuration_memento_9=Exception occurred creating launch configuration memento
-LaunchConfiguration.Exception_occurred_parsing_memento_5=Exception occurred parsing memento
-LaunchConfiguration.Failed_to_delete_launch_configuration._1=Failed to delete launch configuration.
-LaunchConfiguration.Invalid_launch_configuration_memento__missing_path_attribute_3=Invalid launch configuration memento: missing path attribute
-LaunchConfiguration.Invalid_launch_configuration_memento__missing_local_attribute_4=Invalid launch configuration memento: missing local attribute
-LaunchConfiguration.Unable_to_restore_location_for_launch_configuration_from_memento__{0}_1=Unable to restore location for launch configuration from memento: {0}
-LaunchConfiguration.Unable_to_generate_memento_for_{0},_shared_file_does_not_exist._1=Unable to generate memento for {0}, shared file does not exist.
-LaunchConfiguration.13=Incompatible launch mode: expecting {0} instead of {1}
-LaunchConfigurationDelegate.6=Searching for errors
-LaunchConfigurationDelegate.7=Searching for errors in 
-
-LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_boolean._3=Attribute {0} is not of type boolean.
-LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_int._2=Attribute {0} is not of type int.
-LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.lang.String._1=Attribute {0} is not of type java.lang.String.
-LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.util.List._1=Attribute {0} is not of type java.util.List.
-LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.util.Map._1=Attribute {0} is not of type java.util.Map.
-LaunchConfigurationInfo.Invalid_launch_configuration_XML._10=Invalid launch configuration XML.
-LaunchConfigurationInfo.missing_type=Launch configuration type id \"{0}\" does not exist.\nPossible causes:\n\tMissing specification of a launch type (missing plug-in)\n\tIncorrect launch configuration XML
-LaunchConfigurationInfo.36=A null key has been specified for an attribute in this launch configuration
-
-LaunchConfigurationWorkingCopy.{0}_occurred_generating_launch_configuration_XML._1={0} occurred generating launch configuration XML.
-LaunchConfigurationWorkingCopy.Specified_container_for_launch_configuration_does_not_exist_2=Specified container for launch configuration does not exist
-LaunchConfigurationWorkingCopy.5=Unable to save launch configuration.
-
-LaunchManager.{0}_occurred_while_reading_launch_configuration_file_{1}._1={0} occurred while reading launch configuration file: {1}.
-LaunchManager.Invalid_launch_configuration_index._18=Invalid launch configuration index.
-LaunchManager.Invalid_source_locator_extentsion_defined_by_plug-in___{0}______id___not_specified_12=Invalid source locator extension defined by plug-in \"{0}\": \"id\" not specified
-LaunchManager.does_not_exist=Launch configuration {0} at {1} does not exist.
-LaunchManager.Source_locator_does_not_exist__{0}_13=Source locator does not exist: {0}
-LaunchManager.Invalid_launch_configuration_comparator_extension_defined_by_plug-in_{0}_-_attribute_not_specified_1=Invalid launch configuration comparator extension defined by plug-in {0} - attribute not specified
-LaunchManager.An_exception_occurred_during_launch_change_notification._1=An exception occurred during launch change notification.
-LaunchManager.An_exception_occurred_during_launch_configuration_change_notification._3=An exception occurred during launch configuration change notification.
-LaunchManager.30=Unable to retrieve shared launch configuration file for {0}
-
-LaunchMode.1=Required attribute {0} missing for launchMode extension.
-
-LogicalStructureType.7=Required attribute {0} missing for logicalStructureType extension.
-LogicalStructureType.0=<Missing Description>
-LogicalStructureProvider.0=Required attribute modelIdentifier missing for logicalStructureType extension.
-LogicalStructureProvider.1=Required attribute class missing for logicalStructureType extension.
-
-OutputStreamMonitor.label=Output Stream Monitor
-
-ProcessMonitorJob.0=Process monitor
-
-RuntimeProcess.terminate_failed=Terminate failed
-RuntimeProcess.Exit_value_not_available_until_process_terminates._1=Exit value not available until process terminates.
-
-ExpressionManager.An_exception_occurred_during_expression_change_notification._1=An exception occurred during expression change notification.
-
-LaunchConfigurationType.Launch_delegate_for_{0}_does_not_implement_required_interface_ILaunchConfigurationDelegate._1=Launch delegate for {0} does not implement required interface ILaunchConfigurationDelegate.
-LaunchConfigurationType.9=Launch mode {0} not supported for configuration type {1}
-LaunchConfigurationType.10=Launch delegate not registered for configuration type {0}, mode {1}
-
-MemoryRenderingManager.ErrorMsg = The selected rendering cannot be created: {0}
-WatchExpression.0=(Watch expressions not supported)
-NullStreamsProxy.0=Null Stream Monitor
+###############################################################################

+# Copyright (c) 2000, 2005 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

+

+Breakpoint_no_associated_marker=Breakpoint does not have an associated marker.

+

+BreakpointManager_Missing_breakpoint_definition=Missing breakpoint definition for marker type {0}

+BreakpointManager_Missing_model_identifier=Breakpoint missing debug model identifier

+BreakpointManager_Breakpoint_extension__0__missing_required_attribute__markerType_1=Breakpoint extension {0} missing required attribute: markerType

+BreakpointManager_Breakpoint_extension__0__missing_required_attribute__class_2=Breakpoint extension {0} missing required attribute: class

+BreakpointManager_Class__0__specified_by_breakpoint_extension__1__does_not_implement_required_interface_IBreakpoint__3=Class {0} specified by breakpoint extension {1} does not implement required interface IBreakpoint.

+BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__4=An exception occurred during breakpoint change notification.

+BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5=An exception occurred during breakpoint change notification.

+

+DebugEvent_illegal_detail=detail is not one of the allowed constants, see IDebugEventConstants

+DebugEvent_illegal_kind=kind is not one of the allowed constants, see IDebugEventConstants

+

+DebugPlugin_Invalid_status_handler_extension___0__2=Invalid status handler extension: {0}

+DebugPlugin_Debug_async_queue_1=Debug async queue

+DebugPlugin_Exception_occurred_executing_command_line__1=Exception occurred executing command line.

+DebugPlugin_Eclipse_runtime_does_not_support_working_directory_2=Eclipse runtime does not support working directory

+DebugPlugin_Registered_status_handler__0__does_not_implement_required_interface_IStatusHandler__1=Registered status handler {0} does not implement required interface IStatusHandler.

+DebugPlugin_An_exception_occurred_while_dispatching_debug_events__2=An exception occurred while dispatching debug events.

+DebugPlugin_An_exception_occurred_while_filtering_debug_events__3=An exception occurred while filtering debug events.

+DebugPlugin_31=Invalid process factory extension contributed by {0}; id: {1}

+DebugPlugin_0=Exception processing debug async queue

+DebugPlugin_1=Debug Event Dispatch

+

+EnvironmentVariableResolver_0=Environment variable not specified

+

+InputStreamMonitor_label=Input Stream Monitor

+

+Launch_terminate_failed=Terminate failed

+

+LaunchConfiguration_Exception_occurred_creating_launch_configuration_memento_9=Exception occurred creating launch configuration memento

+LaunchConfiguration_Exception_occurred_parsing_memento_5=Exception occurred parsing memento

+LaunchConfiguration_Failed_to_delete_launch_configuration__1=Failed to delete launch configuration.

+LaunchConfiguration_Invalid_launch_configuration_memento__missing_path_attribute_3=Invalid launch configuration memento: missing path attribute

+LaunchConfiguration_Invalid_launch_configuration_memento__missing_local_attribute_4=Invalid launch configuration memento: missing local attribute

+LaunchConfiguration_Unable_to_restore_location_for_launch_configuration_from_memento___0__1=Unable to restore location for launch configuration from memento: {0}

+LaunchConfiguration_Unable_to_generate_memento_for__0___shared_file_does_not_exist__1=Unable to generate memento for {0}, shared file does not exist.

+LaunchConfiguration_13=Incompatible launch mode: expecting {0} instead of {1}

+LaunchConfigurationDelegate_6=Searching for errors

+LaunchConfigurationDelegate_7=Searching for errors in

+

+LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3=Attribute {0} is not of type boolean.

+LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2=Attribute {0} is not of type int.

+LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1=Attribute {0} is not of type java.lang.String.

+LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_List__1=Attribute {0} is not of type java.util.List.

+LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_Map__1=Attribute {0} is not of type java.util.Map.

+LaunchConfigurationInfo_Invalid_launch_configuration_XML__10=Invalid launch configuration XML.

+LaunchConfigurationInfo_missing_type=Launch configuration type id \"{0}\" does not exist.\nPossible causes:\n\tMissing specification of a launch type (missing plug-in)\n\tIncorrect launch configuration XML

+LaunchConfigurationInfo_36=A null key has been specified for an attribute in this launch configuration

+

+LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1={0} occurred generating launch configuration XML.

+LaunchConfigurationWorkingCopy_Specified_container_for_launch_configuration_does_not_exist_2=Specified container for launch configuration does not exist

+LaunchConfigurationWorkingCopy_5=Unable to save launch configuration.

+

+LaunchManager__0__occurred_while_reading_launch_configuration_file__1___1={0} occurred while reading launch configuration file: {1}.

+LaunchManager_Invalid_launch_configuration_index__18=Invalid launch configuration index.

+LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12=Invalid source locator extension defined by plug-in \"{0}\": \"id\" not specified

+LaunchManager_does_not_exist=Launch configuration {0} at {1} does not exist.

+LaunchManager_Source_locator_does_not_exist___0__13=Source locator does not exist: {0}

+LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1=Invalid launch configuration comparator extension defined by plug-in {0} - attribute not specified

+LaunchManager_An_exception_occurred_during_launch_change_notification__1=An exception occurred during launch change notification.

+LaunchManager_An_exception_occurred_during_launch_configuration_change_notification__3=An exception occurred during launch configuration change notification.

+LaunchManager_30=Unable to retrieve shared launch configuration file for {0}

+

+LaunchMode_1=Required attribute {0} missing for launchMode extension.

+

+LogicalStructureType_7=Required attribute {0} missing for logicalStructureType extension.

+LogicalStructureType_0=<Missing Description>

+LogicalStructureProvider_0=Required attribute modelIdentifier missing for logicalStructureType extension.

+LogicalStructureProvider_1=Required attribute class missing for logicalStructureType extension.

+

+OutputStreamMonitor_label=Output Stream Monitor

+

+ProcessMonitorJob_0=Process monitor

+

+RuntimeProcess_terminate_failed=Terminate failed

+RuntimeProcess_Exit_value_not_available_until_process_terminates__1=Exit value not available until process terminates.

+

+ExpressionManager_An_exception_occurred_during_expression_change_notification__1=An exception occurred during expression change notification.

+

+LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1=Launch delegate for {0} does not implement required interface ILaunchConfigurationDelegate.

+LaunchConfigurationType_9=Launch mode {0} not supported for configuration type {1}

+LaunchConfigurationType_10=Launch delegate not registered for configuration type {0}, mode {1}

+

+MemoryRenderingManager_ErrorMsg = The selected rendering cannot be created: {0}

+WatchExpression_0=(Watch expressions not supported)

+NullStreamsProxy_0=Null Stream Monitor

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
index 55a1a5216..ba4595bfa 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
@@ -33,7 +33,7 @@ public class EnvironmentVariableResolver implements IDynamicVariableResolver {
 	 */
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		if (argument == null) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), IStatus.ERROR, DebugCoreMessages.getString("EnvironmentVariableResolver.0"), null)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), IStatus.ERROR, DebugCoreMessages.EnvironmentVariableResolver_0, null)); //$NON-NLS-1$
 		}
 		Map map= DebugPlugin.getDefault().getLaunchManager().getNativeEnvironmentCasePreserved();
         String value= (String) map.get(argument);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
index ded163fea..e74b1658c 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
@@ -475,7 +475,7 @@ public class ExpressionManager implements IExpressionManager, IDebugEventSetList
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("ExpressionManager.An_exception_occurred_during_expression_change_notification._1"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
@@ -537,7 +537,7 @@ public class ExpressionManager implements IExpressionManager, IDebugEventSetList
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("ExpressionManager.An_exception_occurred_during_expression_change_notification._1"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java
index 678f352d2..7dd4b916b 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java
@@ -79,7 +79,7 @@ public class InputStreamMonitor {
 				public void run() {
 					write();
 				}
-			}, DebugCoreMessages.getString("InputStreamMonitor.label")); //$NON-NLS-1$
+			}, DebugCoreMessages.InputStreamMonitor_label); //$NON-NLS-1$
 			fThread.start();
 		}
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java
index 358d3be6b..f2107e197 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java
@@ -99,9 +99,9 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 
 			String message = null;				
 			if (path == null) {
-				message = DebugCoreMessages.getString("LaunchConfiguration.Invalid_launch_configuration_memento__missing_path_attribute_3"); //$NON-NLS-1$
+				message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_path_attribute_3; //$NON-NLS-1$
 			} else if (localString == null) {
-				message = DebugCoreMessages.getString("LaunchConfiguration.Invalid_launch_configuration_memento__missing_local_attribute_4"); //$NON-NLS-1$
+				message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_local_attribute_4; //$NON-NLS-1$
 			}
 			if (message != null) {
 				IStatus s = newStatus(message, DebugException.INTERNAL_ERROR, null);
@@ -117,7 +117,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 			}
 			setLocation(location);
 			if (location == null) {
-				IStatus s = newStatus(MessageFormat.format(DebugCoreMessages.getString("LaunchConfiguration.Unable_to_restore_location_for_launch_configuration_from_memento__{0}_1"), new String[]{path}), DebugPlugin.INTERNAL_ERROR, null); //$NON-NLS-1$
+				IStatus s = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_restore_location_for_launch_configuration_from_memento___0__1, new String[]{path}), DebugPlugin.INTERNAL_ERROR, null); //$NON-NLS-1$
 				throw new CoreException(s);
 			}
 			return;
@@ -128,7 +128,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 		} catch (IOException e) {
 			ex = e;
 		}
-		IStatus s = newStatus(DebugCoreMessages.getString("LaunchConfiguration.Exception_occurred_parsing_memento_5"), DebugException.INTERNAL_ERROR, ex); //$NON-NLS-1$
+		IStatus s = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_parsing_memento_5, DebugException.INTERNAL_ERROR, ex); //$NON-NLS-1$
 		throw new CoreException(s);
 	}
 	
@@ -311,7 +311,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 				if (!(getLocation().toFile().delete())) {
 					throw new DebugException(
 						new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-						 DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchConfiguration.Failed_to_delete_launch_configuration._1"), null) //$NON-NLS-1$
+						 DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfiguration_Failed_to_delete_launch_configuration__1, null) //$NON-NLS-1$
 					);
 				}
 				// manually update the launch manager cache since there
@@ -385,7 +385,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 			IFile file = getFile();
 			if (file == null) {
 				// cannot generate memento - missing file
-				IStatus status = newStatus(MessageFormat.format(DebugCoreMessages.getString("LaunchConfiguration.Unable_to_generate_memento_for_{0},_shared_file_does_not_exist._1"), new String[]{getName()}), DebugException.INTERNAL_ERROR, null); //$NON-NLS-1$
+				IStatus status = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_generate_memento_for__0___shared_file_does_not_exist__1, new String[]{getName()}), DebugException.INTERNAL_ERROR, null); //$NON-NLS-1$
 				throw new CoreException(status); 
 			}
 			relativePath = getFile().getFullPath();
@@ -406,7 +406,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 			e= te;
 		}
 		if (e != null) {
-			IStatus status = newStatus(DebugCoreMessages.getString("LaunchConfiguration.Exception_occurred_creating_launch_configuration_memento_9"), DebugException.INTERNAL_ERROR,  e); //$NON-NLS-1$
+			IStatus status = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_creating_launch_configuration_memento_9, DebugException.INTERNAL_ERROR,  e); //$NON-NLS-1$
 			throw new CoreException(status);
 		}
 		//execution will never reach here
@@ -537,7 +537,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig
 			// ensure the launch mode is valid
 			if (!mode.equals(launch.getLaunchMode())) {
 				IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, 
-						MessageFormat.format(DebugCoreMessages.getString("LaunchConfiguration.13"), new String[]{mode, launch.getLaunchMode()}), null); //$NON-NLS-1$
+						MessageFormat.format(DebugCoreMessages.LaunchConfiguration_13, new String[]{mode, launch.getLaunchMode()}), null); //$NON-NLS-1$
 				throw new CoreException(status);
 			}
 		}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java
index 72586162c..1b4e70ecc 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java
@@ -117,7 +117,7 @@ public class LaunchConfigurationInfo {
 			throw new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.lang.String._1"), new String[] {key}), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1, new String[] {key}), null //$NON-NLS-1$
 				)
 			);
 		}
@@ -142,7 +142,7 @@ public class LaunchConfigurationInfo {
 			throw new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_int._2"), new String[] {key}), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2, new String[] {key}), null //$NON-NLS-1$
 				)
 			);
 		}
@@ -167,7 +167,7 @@ public class LaunchConfigurationInfo {
 			throw new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_boolean._3"), new String[] {key}), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3, new String[] {key}), null //$NON-NLS-1$
 				)
 			);
 		}
@@ -192,7 +192,7 @@ public class LaunchConfigurationInfo {
 			throw new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.util.List._1"), new String[] {key}), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_List__1, new String[] {key}), null //$NON-NLS-1$
 				)
 			);
 		}
@@ -217,7 +217,7 @@ public class LaunchConfigurationInfo {
 			throw new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.Attribute_{0}_is_not_of_type_java.util.Map._1"), new String[] {key}), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_Map__1, new String[] {key}), null //$NON-NLS-1$
 				)
 			);
 		}
@@ -303,7 +303,7 @@ public class LaunchConfigurationInfo {
 				throw new DebugException(
 					new Status(
 						IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-						DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchConfigurationInfo.36"), null //$NON-NLS-1$
+						DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_36, null //$NON-NLS-1$
 					)
 				);
 			}
@@ -385,7 +385,7 @@ public class LaunchConfigurationInfo {
 		
 		ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(id);
 		if (type == null) {
-			String message= MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationInfo.missing_type"), new Object[]{id}); //$NON-NLS-1$
+			String message= MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_missing_type, new Object[]{id}); //$NON-NLS-1$
 			throw new DebugException(
 					new Status(
 					 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
@@ -500,7 +500,7 @@ public class LaunchConfigurationInfo {
 			new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchConfigurationInfo.Invalid_launch_configuration_XML._10"), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_Invalid_launch_configuration_XML__10, null //$NON-NLS-1$
 				)
 			);
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
index 17e0b383f..6097eb03c 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
@@ -229,7 +229,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo
 	 */
 	public ILaunchConfigurationDelegate getDelegate(String mode) throws CoreException {
 		if (!supportsMode(mode)) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationType.9"), new String[] {mode, getIdentifier()}), null));  //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_9, new String[] {mode, getIdentifier()}), null));  //$NON-NLS-1$
 		}
 		if (fDelegates == null) {
 			// initialize delegate table with base modes
@@ -247,7 +247,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo
 					}
 					return (ILaunchConfigurationDelegate)object;
 				} 
-				throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationType.Launch_delegate_for_{0}_does_not_implement_required_interface_ILaunchConfigurationDelegate._1"), new String[]{getName()}), null)); //$NON-NLS-1$
+				throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getName()}), null)); //$NON-NLS-1$
 			} 
 			// contributed modes
 			List contributed = ((LaunchManager)DebugPlugin.getDefault().getLaunchManager()).getContributedDelegates();
@@ -269,7 +269,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo
 		} else {
 			return delegate;
 		}
-		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationType.10"), new String[] {getIdentifier(), mode}), null)); //$NON-NLS-1$
+		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_10, new String[] {getIdentifier(), mode}), null)); //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java
index 2bcfb750e..4eb0c9dd1 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java
@@ -255,7 +255,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen
 			throw new DebugException(
 				new Status(
 					IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-					DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationWorkingCopy.{0}_occurred_generating_launch_configuration_XML._1"), new String[]{e.toString()}), null //$NON-NLS-1$
+					DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{e.toString()}), null //$NON-NLS-1$
 					)
 				);		
 		}
@@ -283,7 +283,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen
 				throw new DebugException(
 					new Status(
 					 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-					 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.getString("LaunchConfigurationWorkingCopy.{0}_occurred_generating_launch_configuration_XML._1"), new String[]{ie.toString()}), null //$NON-NLS-1$
+					 DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{ie.toString()}), null //$NON-NLS-1$
 					)
 				);				
 			}
@@ -295,7 +295,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen
 				throw new DebugException(
 					new Status(
 					 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-					 DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchConfigurationWorkingCopy.Specified_container_for_launch_configuration_does_not_exist_2"), null //$NON-NLS-1$
+					 DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_Specified_container_for_launch_configuration_does_not_exist_2, null //$NON-NLS-1$
 					)
 				);				
 			}
@@ -306,7 +306,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen
 				throw new DebugException(
 					new Status(
 						 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-						 DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchConfigurationWorkingCopy.5"), null //$NON-NLS-1$
+						 DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_5, null //$NON-NLS-1$
 					));
 			}
 			if (!file.exists()) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
index 976c834b2..c4edd2953 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
@@ -553,7 +553,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 					} else {
 						IFile file = ((LaunchConfiguration) config).getFile();
 						if (file == null) {
-							throw createDebugException(MessageFormat.format(DebugCoreMessages.getString("LaunchManager.30"), new String[] {config.getName()}), null); //$NON-NLS-1$
+							throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_30, new String[] {config.getName()}), null); //$NON-NLS-1$
 						}
 						stream = file.getContents();
 					}
@@ -579,7 +579,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 		
 			} else {
 				throw createDebugException(
-					MessageFormat.format(DebugCoreMessages.getString("LaunchManager.does_not_exist"), new String[]{config.getName(), config.getLocation().toOSString()}), null); //$NON-NLS-1$
+					MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist, new String[]{config.getName(), config.getLocation().toOSString()}), null); //$NON-NLS-1$
 			}
 		}
 		return info;
@@ -591,7 +591,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 	 */
 	private void throwException(ILaunchConfiguration config, Throwable e) throws DebugException {
 		IPath path = config.getLocation();
-		throw createDebugException(MessageFormat.format(DebugCoreMessages.getString("LaunchManager.{0}_occurred_while_reading_launch_configuration_file_{1}._1"), new String[]{e.toString(), path.toOSString()}), e); //$NON-NLS-1$
+		throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager__0__occurred_while_reading_launch_configuration_file__1___1, new String[]{e.toString(), path.toOSString()}), e); //$NON-NLS-1$
 	}
 	
 	/**
@@ -1015,7 +1015,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 			new DebugException(
 				new Status(
 				 IStatus.ERROR, DebugPlugin.getUniqueIdentifier(),
-				 DebugException.REQUEST_FAILED, DebugCoreMessages.getString("LaunchManager.Invalid_launch_configuration_index._18"), null //$NON-NLS-1$
+				 DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchManager_Invalid_launch_configuration_index__18, null //$NON-NLS-1$
 				)
 			);		
 			
@@ -1201,7 +1201,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 				} else {
 					// invalid status handler
 					IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR,
-					MessageFormat.format(DebugCoreMessages.getString("LaunchManager.Invalid_source_locator_extentsion_defined_by_plug-in___{0}______id___not_specified_12"), new String[] {configurationElement.getNamespace()} ), null);  //$NON-NLS-1$
+					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12, new String[] {configurationElement.getNamespace()} ), null);  //$NON-NLS-1$
 					DebugPlugin.log(s);
 				}
 			}
@@ -1225,7 +1225,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 				} else {
 					// invalid status handler
 					IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR,
-					MessageFormat.format(DebugCoreMessages.getString("LaunchManager.Invalid_launch_configuration_comparator_extension_defined_by_plug-in_{0}_-_attribute_not_specified_1"), new String[] {configurationElement.getNamespace()}), null); //$NON-NLS-1$
+					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1, new String[] {configurationElement.getNamespace()}), null); //$NON-NLS-1$
 					DebugPlugin.log(s);
 				}
 			}
@@ -1240,7 +1240,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 		IConfigurationElement config = (IConfigurationElement)fSourceLocators.get(identifier);
 		if (config == null) {
 			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR,
-				MessageFormat.format(DebugCoreMessages.getString("LaunchManager.Source_locator_does_not_exist__{0}_13"), new String[] {identifier} ), null)); //$NON-NLS-1$
+				MessageFormat.format(DebugCoreMessages.LaunchManager_Source_locator_does_not_exist___0__13, new String[] {identifier} ), null)); //$NON-NLS-1$
 		} 
 		IPersistableSourceLocator sourceLocator = (IPersistableSourceLocator)config.createExecutableExtension("class"); //$NON-NLS-1$
 		if (sourceLocator instanceof AbstractSourceLookupDirector) {
@@ -1405,7 +1405,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("LaunchManager.An_exception_occurred_during_launch_change_notification._1"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
@@ -1467,7 +1467,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("LaunchManager.An_exception_occurred_during_launch_change_notification._1"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
@@ -1557,7 +1557,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
 		 */
 		public void handleException(Throwable exception) {
-			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("LaunchManager.An_exception_occurred_during_launch_configuration_change_notification._3"), exception); //$NON-NLS-1$
+			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_configuration_change_notification__3, exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
index 0855d4ba9..b4bfc5ddf 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
@@ -57,7 +57,7 @@ public class LaunchMode implements ILaunchMode {
 	}
 
 	private void missingAttribute(String attrName) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LaunchMode.1"),new String[]{attrName}), null));		 //$NON-NLS-1$
+		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchMode_1,new String[]{attrName}), null));		 //$NON-NLS-1$
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java
index 483c5b82a..b52129231 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java
@@ -34,11 +34,11 @@ public class LogicalStructureProvider {
 		fConfigurationElement= element;
 		fModelIdentifier= fConfigurationElement.getAttribute("modelIdentifier"); //$NON-NLS-1$
 		if (fModelIdentifier == null) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("LogicalStructureProvider.0"), null)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_0, null)); //$NON-NLS-1$
 		}
 		String className= fConfigurationElement.getAttribute("class"); //$NON-NLS-1$
 		if (className == null) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.getString("LogicalStructureProvider.1"), null)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_1, null)); //$NON-NLS-1$
 		}
 	}
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
index cc94a6547..10f81bb55 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
@@ -69,7 +69,7 @@ public class LogicalStructureType implements ILogicalStructureType {
 	}
 
 	private void missingAttribute(String attrName) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.getString("LogicalStructureType.7"),new String[]{attrName}), null));		 //$NON-NLS-1$
+		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LogicalStructureType_7,new String[]{attrName}), null));		 //$NON-NLS-1$
 	}
 	
 	/* (non-Javadoc)
@@ -133,7 +133,7 @@ public class LogicalStructureType implements ILogicalStructureType {
 		}
 		String description = getDescription();
 		if (description == null) {
-		    return DebugCoreMessages.getString("LogicalStructureType.0"); //$NON-NLS-1$
+		    return DebugCoreMessages.LogicalStructureType_0; //$NON-NLS-1$
 		}
 		return description;
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
index 89d4f77cd..4d0449a99 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
@@ -71,7 +71,7 @@ public class NullStreamsProxy implements IStreamsProxy2 {
                     } catch (IOException e) {
                     }
                 }
-            }, DebugCoreMessages.getString("NullStreamsProxy.0")); //$NON-NLS-1$
+            }, DebugCoreMessages.NullStreamsProxy_0); //$NON-NLS-1$
             thread.start();
             
         }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
index bc92576bf..13954d7f2 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
@@ -190,7 +190,7 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor {
 				public void run() {
 					read();
 				}
-			}, DebugCoreMessages.getString("OutputStreamMonitor.label")); //$NON-NLS-1$
+			}, DebugCoreMessages.OutputStreamMonitor_label); //$NON-NLS-1$
 			fThread.start();
 		}
 	}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
index e8f7ef1de..0b2334347 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
@@ -93,7 +93,7 @@ public class WatchExpression implements IWatchExpression {
 					return true;
 				}
 				public String[] getErrorMessages() {
-					return new String[] { DebugCoreMessages.getString("WatchExpression.0") }; //$NON-NLS-1$
+					return new String[] { DebugCoreMessages.WatchExpression_0 }; //$NON-NLS-1$
 				}
 				public String getExpressionText() {
 					return WatchExpression.this.getExpressionText();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
index 98fb9a006..f361a9f19 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
@@ -54,7 +54,7 @@ public class SourceContainerType implements ISourceContainerType {
 		if (this.equals(container.getType())) {
 			return getDelegate().getMemento(container);
 		}
-		IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.getString("SourceContainerType.3"), null); //$NON-NLS-1$
+		IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.SourceContainerType_3, null); //$NON-NLS-1$
 		throw new CoreException(status);
 	}
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.java
index c54b9b2f3..836b17abf 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.java
@@ -1,28 +1,80 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
 package org.eclipse.debug.internal.core.sourcelookup;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
 
-public class SourceLookupMessages {
+import org.eclipse.osgi.util.NLS;
+
+public class SourceLookupMessages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.debug.internal.core.sourcelookup.SourceLookupMessages";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-	
-	private SourceLookupMessages() {
-	}
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
+	//
+	// Copyright (c) 2000, 2005 IBM Corporation and others.
+	// All rights reserved. This program and the accompanying materials
+	// are made available under the terms of the Eclipse Public License v1.0
+	// which accompanies this distribution, and is available at
+	// http://www.eclipse.org/legal/epl-v10.html
+	//
+	// Contributors:
+	//     IBM Corporation - initial API and implementation
+	//
+
+	public static String AbstractSourceLookupDirector_11;
+	public static String AbstractSourceLookupDirector_12;
+	public static String AbstractSourceLookupDirector_13;
+	public static String AbstractSourceLookupDirector_14;
+	public static String AbstractSourceLookupDirector_19;
+	public static String CompositeSourceContainer_0;
+
+	public static String ExternalArchiveSourceContainer_1;
+	public static String ExternalArchiveSourceContainer_2;
+
+	public static String ExternalArchiveSourceContainerType_10;
+	public static String ExternalArchiveSourceContainerType_11;
+	public static String ExternalArchiveSourceContainerType_12;
+
+	public static String DefaultSourceContainer_0;
+	public static String DefaultSourceContainerType_6;
+	public static String DefaultSourceContainerType_7;
+
+	public static String DirectorySourceContainerType_10;
+	public static String DirectorySourceContainerType_11;
+	public static String DirectorySourceContainerType_12;
+
+	public static String FolderSourceContainerType_10;
+	public static String FolderSourceContainerType_11;
+	public static String FolderSourceContainerType_12;
+
+	public static String LocalFileStorage_0;
+
+	public static String ProjectSourceContainerType_10;
+	public static String ProjectSourceContainerType_11;
+	public static String ProjectSourceContainerType_12;
+
+	public static String SourceLookupUtils_3;
+	public static String SourceLookupUtils_4;
+	public static String SourceLookupUtils_5;
+	public static String SourceLookupUtils_6;
+	public static String SourceLookupUtils_7;
+	public static String SourceLookupUtils_8;
+	public static String SourceLookupUtils_9;
+	public static String SourceLookupUtils_10;
+	public static String SourceContainerType_3;
+
+	public static String WorkspaceSourceContainer_0;
+
+	public static String WorkspaceSourceContainerType_3;
+	public static String WorkspaceSourceContainerType_4;
+
+	public static String ZipEntryStorage_0;
+
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, SourceLookupMessages.class);
 	}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
index efe54b2fd..15225ff77 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
@@ -1,59 +1,59 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AbstractSourceLookupDirector.11=Unable to restore source lookup path - expecting typeId attribute.
-AbstractSourceLookupDirector.12=Unable to restore source lookup path - unknown type source container type specified: {0}
-AbstractSourceLookupDirector.13=Unable to restore source lookup path - expecting memento attribute.
-AbstractSourceLookupDirector.14=Unable to read source lookup path - expecting sourceLookupDirector node.
-AbstractSourceLookupDirector.19=Source lookup error
-CompositeSourceContainer.0=Source lookup error
-
-ExternalArchiveSourceContainer.1=Exception occurred while detecting root directory in archive {0}
-ExternalArchiveSourceContainer.2=Unable to access archive {0}
-
-ExternalArchiveSourceContainerType.10=Invalid or missing <path> attribute in archive memento.
-ExternalArchiveSourceContainerType.11=Missing <archive> node in archive memento.
-ExternalArchiveSourceContainerType.12=Invalid archive memento
-
-DefaultSourceContainer.0=Default
-DefaultSourceContainerType.6=Unable to restore default source lookup path - expecting default element.
-DefaultSourceContainerType.7=Unable to restore default source lookup path - invalid memento.
-
-DirectorySourceContainerType.10=Unable to restore directory source lookup entry - missing path attribute.
-DirectorySourceContainerType.11=Unable to restore directory source lookup entry - expecting directory element.
-DirectorySourceContainerType.12=Unable to restore directory source lookup entry - invalid memento.
-
-FolderSourceContainerType.10=Unable to restore source lookup folder - missing path attribute.
-FolderSourceContainerType.11=Unable to restore source lookup folder - expecting folder element.
-FolderSourceContainerType.12=Unable to restore source lookup folder - invalid memento.
-
-LocalFileStorage.0=Exception ocurred retrieving file contents.
-
-ProjectSourceContainerType.10=Unable to restore project source lookup entry - missing name attribute.
-ProjectSourceContainerType.11=Unable to restore project source lookup entry - expecting project element.
-ProjectSourceContainerType.12=Unable to restore project source lookup entry - invalid memento.
-
-SourceLookupUtils.3=Unable to create new XML document.
-SourceLookupUtils.4=Unable to serialize XML document.
-SourceLookupUtils.5=Unable to serialize XML document.
-SourceLookupUtils.6=Unable to parse XML document.
-SourceLookupUtils.7=Unable to parse XML document.
-SourceLookupUtils.8=Unable to parse XML document.
-SourceLookupUtils.9=Unable to parse XML document.
-SourceLookupUtils.10=Unable to parse XML document.
-SourceContainerType.3=Unable to persist source lookup path.
-
-WorkspaceSourceContainer.0=Workspace
-
-WorkspaceSourceContainerType.3=Unable to restore workspace source lookup entry - expecting workspace element.
-WorkspaceSourceContainerType.4=Unable to restore workspace source lookup entry - invalid memento.
-
-ZipEntryStorage.0=Unable to read ZipEntry contents
+###############################################################################

+# Copyright (c) 2000, 2005 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

+

+AbstractSourceLookupDirector_11=Unable to restore source lookup path - expecting typeId attribute.

+AbstractSourceLookupDirector_12=Unable to restore source lookup path - unknown type source container type specified: {0}

+AbstractSourceLookupDirector_13=Unable to restore source lookup path - expecting memento attribute.

+AbstractSourceLookupDirector_14=Unable to read source lookup path - expecting sourceLookupDirector node.

+AbstractSourceLookupDirector_19=Source lookup error

+CompositeSourceContainer_0=Source lookup error

+

+ExternalArchiveSourceContainer_1=Exception occurred while detecting root directory in archive {0}

+ExternalArchiveSourceContainer_2=Unable to access archive {0}

+

+ExternalArchiveSourceContainerType_10=Invalid or missing <path> attribute in archive memento.

+ExternalArchiveSourceContainerType_11=Missing <archive> node in archive memento.

+ExternalArchiveSourceContainerType_12=Invalid archive memento

+

+DefaultSourceContainer_0=Default

+DefaultSourceContainerType_6=Unable to restore default source lookup path - expecting default element.

+DefaultSourceContainerType_7=Unable to restore default source lookup path - invalid memento.

+

+DirectorySourceContainerType_10=Unable to restore directory source lookup entry - missing path attribute.

+DirectorySourceContainerType_11=Unable to restore directory source lookup entry - expecting directory element.

+DirectorySourceContainerType_12=Unable to restore directory source lookup entry - invalid memento.

+

+FolderSourceContainerType_10=Unable to restore source lookup folder - missing path attribute.

+FolderSourceContainerType_11=Unable to restore source lookup folder - expecting folder element.

+FolderSourceContainerType_12=Unable to restore source lookup folder - invalid memento.

+

+LocalFileStorage_0=Exception ocurred retrieving file contents.

+

+ProjectSourceContainerType_10=Unable to restore project source lookup entry - missing name attribute.

+ProjectSourceContainerType_11=Unable to restore project source lookup entry - expecting project element.

+ProjectSourceContainerType_12=Unable to restore project source lookup entry - invalid memento.

+

+SourceLookupUtils_3=Unable to create new XML document.

+SourceLookupUtils_4=Unable to serialize XML document.

+SourceLookupUtils_5=Unable to serialize XML document.

+SourceLookupUtils_6=Unable to parse XML document.

+SourceLookupUtils_7=Unable to parse XML document.

+SourceLookupUtils_8=Unable to parse XML document.

+SourceLookupUtils_9=Unable to parse XML document.

+SourceLookupUtils_10=Unable to parse XML document.

+SourceContainerType_3=Unable to persist source lookup path.

+

+WorkspaceSourceContainer_0=Workspace

+

+WorkspaceSourceContainerType_3=Unable to restore workspace source lookup entry - expecting workspace element.

+WorkspaceSourceContainerType_4=Unable to restore workspace source lookup entry - invalid memento.

+

+ZipEntryStorage_0=Unable to read ZipEntry contents

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
index 9a677b1d7..6d3f67382 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
@@ -39,16 +39,16 @@ public class ArchiveSourceContainerType extends AbstractSourceContainerTypeDeleg
 			if ("archive".equals(element.getNodeName())) { //$NON-NLS-1$
 				String string = element.getAttribute("path"); //$NON-NLS-1$
 				if (string == null || string.length() == 0) {
-					abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.10"), null); //$NON-NLS-1$
+					abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); //$NON-NLS-1$
 				}
 				String detect = element.getAttribute("detectRoot"); //$NON-NLS-1$
 				boolean auto = "true".equals(detect); //$NON-NLS-1$
 				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(string));
 				return new ArchiveSourceContainer(file, auto);
 			} 
-			abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.11"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.12"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); //$NON-NLS-1$
 		return null;
 	}
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
index 78368e8f6..9cfa78177 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
@@ -47,9 +47,9 @@ public class DefaultSourceContainerType extends AbstractSourceContainerTypeDeleg
 			if ("default".equals(element.getNodeName())) { //$NON-NLS-1$
 				return new DefaultSourceContainer();
 			}
-			abort(SourceLookupMessages.getString("DefaultSourceContainerType.6"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.DefaultSourceContainerType_6, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("DefaultSourceContainerType.7"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.DefaultSourceContainerType_7, null); //$NON-NLS-1$
 		return null;		
 	}
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
index 4d8e0ada1..7734295ae 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
@@ -37,15 +37,15 @@ public class DirectorySourceContainerType extends AbstractSourceContainerTypeDel
 			if ("directory".equals(element.getNodeName())) { //$NON-NLS-1$
 				String string = element.getAttribute("path"); //$NON-NLS-1$
 				if (string == null || string.length() == 0) {
-					abort(SourceLookupMessages.getString("DirectorySourceContainerType.10"), null); //$NON-NLS-1$
+					abort(SourceLookupMessages.DirectorySourceContainerType_10, null); //$NON-NLS-1$
 				}
 				String nest = element.getAttribute("nest"); //$NON-NLS-1$
 				boolean nested = "true".equals(nest); //$NON-NLS-1$
 				return new DirectorySourceContainer(new Path(string), nested);
 			}
-			abort(SourceLookupMessages.getString("DirectorySourceContainerType.11"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.DirectorySourceContainerType_11, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("DirectorySourceContainerType.12"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.DirectorySourceContainerType_12, null); //$NON-NLS-1$
 		return null;
 	}
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
index e74b95110..2734b6b00 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
@@ -36,15 +36,15 @@ public class ExternalArchiveSourceContainerType extends AbstractSourceContainerT
 			if ("archive".equals(element.getNodeName())) { //$NON-NLS-1$
 				String string = element.getAttribute("path"); //$NON-NLS-1$
 				if (string == null || string.length() == 0) {
-					abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.10"), null); //$NON-NLS-1$
+					abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); //$NON-NLS-1$
 				}
 				String detect = element.getAttribute("detectRoot"); //$NON-NLS-1$
 				boolean auto = "true".equals(detect); //$NON-NLS-1$
 				return new ExternalArchiveSourceContainer(string, auto);
 			} 
-			abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.11"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("ExternalArchiveSourceContainerType.12"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); //$NON-NLS-1$
 		return null;
 	}
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
index 035a7ad08..ea83044dd 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
@@ -57,7 +57,7 @@ public class FolderSourceContainerType extends AbstractSourceContainerTypeDelega
 			if ("folder".equals(element.getNodeName())) { //$NON-NLS-1$
 				String string = element.getAttribute("path"); //$NON-NLS-1$
 				if (string == null || string.length() == 0) {
-					abort(SourceLookupMessages.getString("FolderSourceContainerType.10"), null); //$NON-NLS-1$
+					abort(SourceLookupMessages.FolderSourceContainerType_10, null); //$NON-NLS-1$
 				}
 				String nest = element.getAttribute("nest"); //$NON-NLS-1$
 				boolean nested = "true".equals(nest); //$NON-NLS-1$
@@ -65,9 +65,9 @@ public class FolderSourceContainerType extends AbstractSourceContainerTypeDelega
 				IFolder folder = workspace.getRoot().getFolder(new Path(string));
 				return new FolderSourceContainer(folder, nested);
 			} 
-			abort(SourceLookupMessages.getString("FolderSourceContainerType.11"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.FolderSourceContainerType_11, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("FolderSourceContainerType.12"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.FolderSourceContainerType_12, null); //$NON-NLS-1$
 		return null;
 	}
 }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
index b35f3f4e0..ef2ac2185 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
@@ -56,7 +56,7 @@ public class ProjectSourceContainerType extends AbstractSourceContainerTypeDeleg
 			if ("project".equals(element.getNodeName())) { //$NON-NLS-1$
 				String string = element.getAttribute("name"); //$NON-NLS-1$
 				if (string == null || string.length() == 0) {
-					abort(SourceLookupMessages.getString("ProjectSourceContainerType.10"), null); //$NON-NLS-1$
+					abort(SourceLookupMessages.ProjectSourceContainerType_10, null); //$NON-NLS-1$
 				}
 				String nest = element.getAttribute("referencedProjects"); //$NON-NLS-1$
 				boolean ref = "true".equals(nest); //$NON-NLS-1$
@@ -64,9 +64,9 @@ public class ProjectSourceContainerType extends AbstractSourceContainerTypeDeleg
 				IProject project = workspace.getRoot().getProject(string);
 				return new ProjectSourceContainer(project, ref);
 			} 
-			abort(SourceLookupMessages.getString("ProjectSourceContainerType.11"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.ProjectSourceContainerType_11, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("ProjectSourceContainerType.12"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.ProjectSourceContainerType_12, null); //$NON-NLS-1$
 		return null;
 	}
 }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
index d863fb090..cc7a8d7fe 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
@@ -36,9 +36,9 @@ public class WorkspaceSourceContainerType extends AbstractSourceContainerTypeDel
 			if ("workspace".equals(element.getNodeName())) { //$NON-NLS-1$
 				return new WorkspaceSourceContainer();
 			} 
-			abort(SourceLookupMessages.getString("WorkspaceSourceContainerType.3"), null); //$NON-NLS-1$
+			abort(SourceLookupMessages.WorkspaceSourceContainerType_3, null); //$NON-NLS-1$
 		}
-		abort(SourceLookupMessages.getString("WorkspaceSourceContainerType.4"), null); //$NON-NLS-1$
+		abort(SourceLookupMessages.WorkspaceSourceContainerType_4, null); //$NON-NLS-1$
 		return null;
 	}
 	/* (non-Javadoc)