use NLS.bind()
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/InterpreterArgumentsBlock.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/InterpreterArgumentsBlock.java
index 3a81d8f..9b810d8 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/InterpreterArgumentsBlock.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/InterpreterArgumentsBlock.java
@@ -9,9 +9,6 @@
  *******************************************************************************/
 package org.eclipse.dltk.internal.debug.ui.launcher;
 
-
-import java.text.MessageFormat;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -21,6 +18,7 @@
 import org.eclipse.dltk.debug.ui.launchConfigurations.CommonScriptLaunchTab;
 import org.eclipse.dltk.debug.ui.messages.ScriptLaunchMessages;
 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -34,7 +32,6 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Text;
 
-
 /**
  * Editor for Interpreter arguments of a Script launch configuration.
  */
@@ -43,7 +40,7 @@
 	// Interpreter arguments widgets
 	protected Text fInterpreterArgumentsText;
 	private Button fPgrmArgVariableButton;
-	
+
 	/**
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
 	 */
@@ -53,13 +50,15 @@
 		Group group = new Group(parent, SWT.NONE);
 		setControl(group);
 		GridLayout topLayout = new GridLayout();
-		group.setLayout(topLayout);	
+		group.setLayout(topLayout);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		group.setLayoutData(gd);
 		group.setFont(font);
-		group.setText(ScriptLaunchMessages.InterpreterArgumentsTab_Interpreter_ar_guments); 
-		
-		fInterpreterArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP| SWT.BORDER | SWT.V_SCROLL);
+		group
+				.setText(ScriptLaunchMessages.InterpreterArgumentsTab_Interpreter_ar_guments);
+
+		fInterpreterArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP
+				| SWT.BORDER | SWT.V_SCROLL);
 		gd = new GridData(GridData.FILL_BOTH);
 		gd.heightHint = 40;
 		gd.widthHint = 100;
@@ -69,24 +68,29 @@
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
-		});	
-		ControlAccessibleListener.addListener(fInterpreterArgumentsText, group.getText());
-				
-		fPgrmArgVariableButton = createPushButton(group, ScriptLaunchMessages.InterpreterArgumentsBlock, null);
+		});
+		ControlAccessibleListener.addListener(fInterpreterArgumentsText, group
+				.getText());
+
+		fPgrmArgVariableButton = createPushButton(group,
+				ScriptLaunchMessages.InterpreterArgumentsBlock, null);
 		fPgrmArgVariableButton.setFont(font);
-		fPgrmArgVariableButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		fPgrmArgVariableButton.setLayoutData(new GridData(
+				GridData.HORIZONTAL_ALIGN_END));
 		fPgrmArgVariableButton.addSelectionListener(new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
-				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell());
+				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(
+						getShell());
 				dialog.open();
 				String variable = dialog.getVariableExpression();
 				if (variable != null) {
 					fInterpreterArgumentsText.insert(variable);
 				}
 			}
+
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
-			
+
 		});
 	}
 
@@ -94,7 +98,9 @@
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
 	 */
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS, (String)null);		
+		configuration.setAttribute(
+				ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS,
+				(String) null);
 	}
 
 	/**
@@ -102,10 +108,17 @@
 	 */
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		try {
-			fInterpreterArgumentsText.setText(configuration.getAttribute(ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS, "")); //$NON-NLS-1$
+			fInterpreterArgumentsText
+					.setText(configuration
+							.getAttribute(
+									ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS,
+									"")); //$NON-NLS-1$
 		} catch (CoreException e) {
-			setErrorMessage(MessageFormat.format(ScriptLaunchMessages.InterpreterArgumentsTab_Exception_occurred_reading_configuration, new Object[] { e.getStatus().getMessage() })); 
-			DLTKDebugUIPlugin.log(e);			
+			setErrorMessage(NLS
+					.bind(
+							ScriptLaunchMessages.InterpreterArgumentsTab_Exception_occurred_reading_configuration,
+							e.getStatus().getMessage()));
+			DLTKDebugUIPlugin.log(e);
 		}
 	}
 
@@ -113,16 +126,18 @@
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
 	 */
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS, getAttributeValueFrom(fInterpreterArgumentsText));
+		configuration.setAttribute(
+				ScriptLaunchConfigurationConstants.ATTR_INTERPRETER_ARGUMENTS,
+				getAttributeValueFrom(fInterpreterArgumentsText));
 	}
 
 	/**
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
 	public String getName() {
-		return ScriptLaunchMessages.InterpreterArgumentsBlock_Interpreter_Arguments; 
+		return ScriptLaunchMessages.InterpreterArgumentsBlock_Interpreter_Arguments;
 	}
-	
+
 	/**
 	 * Retuns the string in the text widget, or <code>null</code> if empty.
 	 * 
@@ -134,8 +149,8 @@
 			return content;
 		}
 		return null;
-	}	
-	
+	}
+
 	public void setEnabled(boolean enabled) {
 		fInterpreterArgumentsText.setEnabled(enabled);
 		fPgrmArgVariableButton.setEnabled(enabled);
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/WorkingDirectoryBlock.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/WorkingDirectoryBlock.java
index 8b557b0..05ea4f5 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/WorkingDirectoryBlock.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/launcher/WorkingDirectoryBlock.java
@@ -10,7 +10,6 @@
 package org.eclipse.dltk.internal.debug.ui.launcher;
 
 import java.io.File;
-import java.text.MessageFormat;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
@@ -33,6 +32,7 @@
 import org.eclipse.dltk.debug.ui.messages.ScriptLaunchMessages;
 import org.eclipse.dltk.internal.launching.DLTKLaunchingPlugin;
 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -411,10 +411,10 @@
 			}// end else
 		}// end try
 		catch (CoreException e) {
-			setErrorMessage(MessageFormat
-					.format(
+			setErrorMessage(NLS
+					.bind(
 							ScriptLaunchMessages.ArgumentsTab_Exception_occurred_reading_configuration___15,
-							new Object[] { e.getStatus().getMessage() }));
+							e.getStatus().getMessage()));
 			DLTKLaunchingPlugin.log(e);
 		}// end catch
 	}