Massive Merge Commit of DEATH TO SPACES

framework/src/com/phonegap/api/LOG.java

@@ -20,7 +20,7 @@ package com.phonegap.api;
 
 /**
  * Log to Android logging system.
- * 
+ *
  * Log message can be a string or a printf formatted string with arguments.
  * See http://developer.android.com/reference/java/util/Formatter.html
  */

framework/src/com/phonegap/api/PluginManager.java

@@ -25,7 +25,7 @@ import android.webkit.WebView;
 
 /**
  * PluginManager is exposed to JavaScript in the Cordova WebView.
- * 
+ *
  * Calling native plugin code can be done by calling PluginManager.exec(...)
  * from JavaScript.
  */

framework/src/com/phonegap/api/PluginResult.java

@@ -22,32 +22,32 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class PluginResult extends org.apache.cordova.api.PluginResult {
-	
-	public PluginResult(Status status) {
-		super(status);
-	}
-	
-	public PluginResult(Status status, String message) {
-		super(status, message);
-	}
 
-	public PluginResult(Status status, JSONArray message) {
+    public PluginResult(Status status) {
+        super(status);
+    }
+
+    public PluginResult(Status status, String message) {
         super(status, message);
-	}
+    }
 
-	public PluginResult(Status status, JSONObject message) {
+    public PluginResult(Status status, JSONArray message) {
         super(status, message);
-	}
+    }
 
-	public PluginResult(Status status, int i) {
+    public PluginResult(Status status, JSONObject message) {
+        super(status, message);
+    }
+
+    public PluginResult(Status status, int i) {
         super(status, i);
-	}
+    }
 
-	public PluginResult(Status status, float f) {
+    public PluginResult(Status status, float f) {
         super(status, f);
-	}
+    }
 
-	public PluginResult(Status status, boolean b) {
+    public PluginResult(Status status, boolean b) {
         super(status, b);
-	}
+    }
 }