From c445167843696d8acb32e2234144df7072fb79d2 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 22 Feb 2008 01:16:49 +0000
Subject: [PATCH] [216252] reverting % message back to messageformat

---
 .../rse/internal/services/files/ftp/FTPService.java  | 12 ++++++------
 .../internal/services/ssh/files/SftpFileService.java |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
index 0f0c4059d3b..4d110068e0b 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
@@ -86,6 +86,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -99,7 +100,6 @@ import org.apache.commons.net.ftp.FTPReply;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.model.IPropertySet;
 import org.eclipse.rse.internal.services.files.ftp.parser.IFTPClientConfigFactory;
 import org.eclipse.rse.internal.services.files.ftp.parser.IFTPClientConfigProxy;
@@ -1529,11 +1529,11 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
 			  fWorkToDate += count;
 			  Long workToDateKB = new Long(fWorkToDate / 1024L);
 			  Double workPercent = new Double(fWorkPercentFactor * fWorkToDate);
-			  String subDesc = NLS.bind(
-					 FTPServiceResources.FTP_File_Service_Monitor_Format,  
-					  new Object[] {
-						workToDateKB, fMaxWorkKB, workPercent	  
-					  });
+			  String subDesc = MessageFormat.format(
+						 FTPServiceResources.FTP_File_Service_Monitor_Format,  
+						  new Object[] {
+							workToDateKB, fMaxWorkKB, workPercent	  
+						  });
 			  fMonitor.subTask(subDesc);
 		      fMonitor.worked((int)count);
 		      return !(fMonitor.isCanceled());
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
index 75c279bb9e0..cd1983addc7 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
@@ -37,6 +37,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
@@ -684,11 +685,12 @@ public class SftpFileService extends AbstractFileService implements IFileService
 			  fWorkToDate += count;
 			  Long workToDateKB = new Long(fWorkToDate / 1024L);
 			  Double workPercent = new Double(fWorkPercentFactor * fWorkToDate);
-			  String subDesc = NLS.bind(
+			  String subDesc = MessageFormat.format(
 					  SshServiceResources.SftpFileService_Msg_Progress,
 					  new Object[] {
 						workToDateKB, fMaxWorkKB, workPercent	  
 					  });
+
 			  fMonitor.subTask(subDesc);
 		      fMonitor.worked((int)count);
 		      return !(fMonitor.isCanceled());