Updated Branches: refs/heads/master 5c38101a9 -> 810df6104
[CB-4410] Fixed @param mismatching Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/810df610 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/810df610 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/810df610 Branch: refs/heads/master Commit: 810df61049bdb326d8d22d1b0e0e9ce0dfb3d2cc Parents: 5c38101 Author: Sharif Ahmed <[email protected]> Authored: Sun Jul 28 13:09:44 2013 +0600 Committer: Max Woghiren <[email protected]> Committed: Tue Jul 30 11:21:02 2013 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/CallbackContext.java | 4 ---- framework/src/org/apache/cordova/CordovaActivity.java | 2 +- framework/src/org/apache/cordova/CordovaPlugin.java | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 5 +++-- 4 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/810df610/framework/src/org/apache/cordova/CallbackContext.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CallbackContext.java b/framework/src/org/apache/cordova/CallbackContext.java index b9df45d..446c37d 100644 --- a/framework/src/org/apache/cordova/CallbackContext.java +++ b/framework/src/org/apache/cordova/CallbackContext.java @@ -110,8 +110,6 @@ public class CallbackContext { /** * Helper for success callbacks that just returns the Status.OK by default - * - * @param message The message to add to the success result. */ public void success() { sendPluginResult(new PluginResult(PluginResult.Status.OK)); @@ -130,7 +128,6 @@ public class CallbackContext { * Helper for error callbacks that just returns the Status.ERROR by default * * @param message The message to add to the error result. - * @param callbackId The callback id used when calling back into JavaScript. */ public void error(String message) { sendPluginResult(new PluginResult(PluginResult.Status.ERROR, message)); @@ -140,7 +137,6 @@ public class CallbackContext { * Helper for error callbacks that just returns the Status.ERROR by default * * @param message The message to add to the error result. - * @param callbackId The callback id used when calling back into JavaScript. */ public void error(int message) { sendPluginResult(new PluginResult(PluginResult.Status.ERROR, message)); http://git-wip-us.apache.org/repos/asf/cordova-android/blob/810df610/framework/src/org/apache/cordova/CordovaActivity.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java index 6f9bc91..685424c 100755 --- a/framework/src/org/apache/cordova/CordovaActivity.java +++ b/framework/src/org/apache/cordova/CordovaActivity.java @@ -776,7 +776,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * Send JavaScript statement back to JavaScript. * (This is a convenience method) * - * @param message + * @param statement */ public void sendJavascript(String statement) { if (this.appView != null) { http://git-wip-us.apache.org/repos/asf/cordova-android/blob/810df610/framework/src/org/apache/cordova/CordovaPlugin.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaPlugin.java b/framework/src/org/apache/cordova/CordovaPlugin.java index 455f56f..8111e7b 100644 --- a/framework/src/org/apache/cordova/CordovaPlugin.java +++ b/framework/src/org/apache/cordova/CordovaPlugin.java @@ -148,7 +148,7 @@ public class CordovaPlugin { * @param requestCode The request code originally supplied to startActivityForResult(), * allowing you to identify who this result came from. * @param resultCode The integer result code returned by the child activity through its setResult(). - * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras"). + * @param intent An Intent, which can return result data to the caller (various data can be attached to Intent "extras"). */ public void onActivityResult(int requestCode, int resultCode, Intent intent) { } http://git-wip-us.apache.org/repos/asf/cordova-android/blob/810df610/framework/src/org/apache/cordova/CordovaWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 06cee9c..49bcf2b 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -511,7 +511,7 @@ public class CordovaWebView extends WebView { * Send JavaScript statement back to JavaScript. * (This is a convenience method) * - * @param message + * @param statement */ public void sendJavascript(String statement) { this.jsMessageQueue.addJavaScript(statement); @@ -521,7 +521,8 @@ public class CordovaWebView extends WebView { * Send a plugin result back to JavaScript. * (This is a convenience method) * - * @param message + * @param result + * @param callbackId */ public void sendPluginResult(PluginResult result, String callbackId) { this.jsMessageQueue.addPluginResult(result, callbackId);
