From 8d513e2765b72e14afc51316aaa9f6f1ab2e078c Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Thu, 6 Jan 2011 22:57:54 +0800
Subject: [PATCH] Remaining FileUploader to FileTransfer

---
 .../js/{fileuploader.js => filetransfer.js}    | 18 +++++++++---------
 framework/src/com/phonegap/DroidGap.java       |  2 +-
 .../{FileUploader.java => FileTransfer.java}   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename framework/assets/js/{fileuploader.js => filetransfer.js} (84%)
 rename framework/src/com/phonegap/{FileUploader.java => FileTransfer.java} (99%)

diff --git a/framework/assets/js/fileuploader.js b/framework/assets/js/filetransfer.js
similarity index 84%
rename from framework/assets/js/fileuploader.js
rename to framework/assets/js/filetransfer.js
index 8417a00e..d2d18c22 100644
--- a/framework/assets/js/fileuploader.js
+++ b/framework/assets/js/filetransfer.js
@@ -7,9 +7,9 @@
  */
 
 /**
- * FileUploader uploads a file to a remote server.
+ * FileTransfer uploads a file to a remote server.
  */
-function FileUploader() {};
+function FileTransfer() {};
 
 /**
  * FileUploadResult
@@ -21,15 +21,15 @@ function FileUploadResult() {
 };
 
 /**
- * FileUploadError
+ * FileTransferError
  */
-function FileUploadError() {
+function FileTransferError() {
     this.code = null;
 };
 
-FileUploadError.FILE_NOT_FOUND_ERR = 1;
-FileUploadError.INVALID_URL_ERR = 2;
-FileUploadError.CONNECTION_ERR = 3;
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
 
 /**
 * Given an absolute file path, uploads a file on the device to a remote server 
@@ -40,7 +40,7 @@ FileUploadError.CONNECTION_ERR = 3;
 * @param errorCallback {Function}    Callback to be invoked upon error
 * @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
 */
-FileUploader.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
 
     // check for options
     var fileKey = null;
@@ -59,7 +59,7 @@ FileUploader.prototype.upload = function(filePath, server, successCallback, erro
         }
     }
     
-    PhoneGap.exec(successCallback, errorCallback, 'FileUploader', 'upload', [filePath, server, fileKey, fileName, mimeType, params]);
+    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params]);
 };
 
 /**
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 12a09b7b..ceddf979 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -284,7 +284,7 @@ public class DroidGap extends PhonegapActivity {
 		this.addService("Notification", "com.phonegap.Notification");
 		this.addService("Storage", "com.phonegap.Storage");
 		this.addService("Temperature", "com.phonegap.TempListener");
-		this.addService("FileUploader", "com.phonegap.FileUploader");
+		this.addService("FileTransfer", "com.phonegap.FileTransfer");
 	}
         
 	/**
diff --git a/framework/src/com/phonegap/FileUploader.java b/framework/src/com/phonegap/FileTransfer.java
similarity index 99%
rename from framework/src/com/phonegap/FileUploader.java
rename to framework/src/com/phonegap/FileTransfer.java
index 150841e9..ae8425d1 100644
--- a/framework/src/com/phonegap/FileUploader.java
+++ b/framework/src/com/phonegap/FileTransfer.java
@@ -28,7 +28,7 @@ import android.webkit.CookieManager;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;
 
-public class FileUploader extends Plugin {
+public class FileTransfer extends Plugin {
 
 	private static final String LOG_TAG = "FileUploader";
 	private static final String LINE_START = "--";