Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A209610A32 for ; Wed, 22 Jan 2014 19:38:50 +0000 (UTC) Received: (qmail 9992 invoked by uid 500); 22 Jan 2014 19:38:34 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 9267 invoked by uid 500); 22 Jan 2014 19:38:18 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 9077 invoked by uid 99); 22 Jan 2014 19:38:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 19:38:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 296F18A06DC; Wed, 22 Jan 2014 19:38:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Wed, 22 Jan 2014 19:38:33 -0000 Message-Id: <2fb1e7c72d78410e99baafe7f42a4d47@git.apache.org> In-Reply-To: <35ee4e824f4749d38a571ff5143c46dd@git.apache.org> References: <35ee4e824f4749d38a571ff5143c46dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] git commit: Add javadoc comments to source classes Add javadoc comments to source classes Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/eb0aa970 Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/eb0aa970 Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/eb0aa970 Branch: refs/heads/master Commit: eb0aa970c07b59c608a299c54d4d8f04a7063e06 Parents: 20ee58f Author: Marcel Kinard Authored: Fri Nov 22 17:37:20 2013 -0500 Committer: Joe Bowser Committed: Wed Jan 22 11:37:17 2014 -0800 ---------------------------------------------------------------------- .../src/org/apache/cordova/CordovaChromeClient.java | 8 ++++++++ framework/src/org/apache/cordova/CordovaWebView.java | 11 ++++++++++- .../src/org/apache/cordova/CordovaWebViewClient.java | 9 +++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/eb0aa970/framework/src/org/apache/cordova/CordovaChromeClient.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java index bc31c66..1ed1a3d 100755 --- a/framework/src/org/apache/cordova/CordovaChromeClient.java +++ b/framework/src/org/apache/cordova/CordovaChromeClient.java @@ -49,6 +49,14 @@ import android.widget.RelativeLayout; /** * This class is the AmazonWebChromeClient that implements callbacks for our web view. + * The kind of callbacks that happen here are on the chrome outside the document, + * such as onCreateWindow(), onConsoleMessage(), onProgressChanged(), etc. Related + * to but different than CordovaWebViewClient. + * + * @see WebChromeClient + * @see WebView guide + * @see CordovaWebViewClient + * @see CordovaWebView */ public class CordovaChromeClient extends AmazonWebChromeClient { http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/eb0aa970/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 200e7fe..00eb6d7 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -60,6 +60,13 @@ import com.amazon.android.webkit.AmazonWebKitFactory; import android.widget.FrameLayout; public class CordovaWebView extends AmazonWebView { +/* + * This class is our web view. + * + * @see WebView guide + * @see WebView + */ + public static final String TAG = "CordovaWebView"; public static final String CORDOVA_VERSION = "3.3.0-dev"; @@ -267,7 +274,9 @@ public class CordovaWebView extends AmazonWebView { this.setup(); } - + /** + * set the WebViewClient, but provide special case handling for IceCreamSandwich. + */ private void initWebViewClient(CordovaInterface cordova) { if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB || android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/eb0aa970/framework/src/org/apache/cordova/CordovaWebViewClient.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java index 00ce660..b2abd85 100755 --- a/framework/src/org/apache/cordova/CordovaWebViewClient.java +++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java @@ -45,6 +45,15 @@ import com.amazon.android.webkit.AmazonWebViewClient; /** * This class is the AmazonWebViewClient that implements callbacks for our web view. + * The kind of callbacks that happen here are regarding the rendering of the + * document instead of the chrome surrounding it, such as onPageStarted(), + * shouldOverrideUrlLoading(), etc. Related to but different than + * CordovaChromeClient. + * + * @see WebViewClient + * @see WebView guide + * @see CordovaChromeClient + * @see CordovaWebView */ public class CordovaWebViewClient extends AmazonWebViewClient {