From fb89cef256be6521ce3b1178fbd392cddd2a4686 Mon Sep 17 00:00:00 2001 From: Ian Clelland Date: Fri, 31 May 2013 11:16:09 -0400 Subject: [PATCH] [CB-3563] Replace instances of DroidGap in log messages with more appropriate symbols --- framework/src/org/apache/cordova/App.java | 2 +- .../src/org/apache/cordova/CordovaActivity.java | 14 +++++++------- .../org/apache/cordova/CordovaChromeClient.java | 2 +- .../src/org/apache/cordova/CordovaWebView.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java index afdbf3f2..965f9de7 100755 --- a/framework/src/org/apache/cordova/App.java +++ b/framework/src/org/apache/cordova/App.java @@ -198,7 +198,7 @@ public class App extends CordovaPlugin { * @param override T=override, F=cancel override */ public void overrideButton(String button, boolean override) { - LOG.i("DroidGap", "WARNING: Volume Button Default Behaviour will be overridden. The volume event will be fired!"); + LOG.i("App", "WARNING: Volume Button Default Behaviour will be overridden. The volume event will be fired!"); webView.bindButton(button, override); } diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java index c59e1ee3..097b3252 100755 --- a/framework/src/org/apache/cordova/CordovaActivity.java +++ b/framework/src/org/apache/cordova/CordovaActivity.java @@ -259,7 +259,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { @Override public void onCreate(Bundle savedInstanceState) { Config.init(this); - LOG.d(TAG, "DroidGap.onCreate()"); + LOG.d(TAG, "CordovaActivity.onCreate()"); super.onCreate(savedInstanceState); if(savedInstanceState != null) @@ -332,7 +332,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { */ @SuppressLint("NewApi") public void init(CordovaWebView webView, CordovaWebViewClient webViewClient, CordovaChromeClient webChromeClient) { - LOG.d(TAG, "DroidGap.init()"); + LOG.d(TAG, "CordovaActivity.init()"); // Set up web container this.appView = webView; @@ -595,7 +595,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * @param value */ public void setBooleanProperty(String name, boolean value) { - Log.d(TAG, "Setting boolean properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml"); + Log.d(TAG, "Setting boolean properties in CordovaActivity will be deprecated in 3.0 on July 2013, please use config.xml"); this.getIntent().putExtra(name, value); } @@ -606,7 +606,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * @param value */ public void setIntegerProperty(String name, int value) { - Log.d(TAG, "Setting integer properties in DroidGap will be deprecated in 3.1 on August 2013, please use config.xml"); + Log.d(TAG, "Setting integer properties in CordovaActivity will be deprecated in 3.1 on August 2013, please use config.xml"); this.getIntent().putExtra(name, value); } @@ -617,7 +617,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * @param value */ public void setStringProperty(String name, String value) { - Log.d(TAG, "Setting string properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml"); + Log.d(TAG, "Setting string properties in CordovaActivity will be deprecated in 3.0 on July 2013, please use config.xml"); this.getIntent().putExtra(name, value); } @@ -628,7 +628,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * @param value */ public void setDoubleProperty(String name, double value) { - Log.d(TAG, "Setting double properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml"); + Log.d(TAG, "Setting double properties in CordovaActivity will be deprecated in 3.0 on July 2013, please use config.xml"); this.getIntent().putExtra(name, value); } @@ -712,7 +712,7 @@ public class CordovaActivity extends Activity implements CordovaInterface { * The final call you receive before your activity is destroyed. */ public void onDestroy() { - LOG.d(TAG, "onDestroy()"); + LOG.d(TAG, "CordovaActivity.onDestroy()"); super.onDestroy(); // hide the splash screen to avoid leaking a window diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java index d9da6baf..93833a5c 100755 --- a/framework/src/org/apache/cordova/CordovaChromeClient.java +++ b/framework/src/org/apache/cordova/CordovaChromeClient.java @@ -286,7 +286,7 @@ public class CordovaChromeClient extends WebChromeClient { public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize, long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) { - LOG.d(TAG, "DroidGap: onExceededDatabaseQuota estimatedSize: %d currentQuota: %d totalUsedQuota: %d", estimatedSize, currentQuota, totalUsedQuota); + LOG.d(TAG, "onExceededDatabaseQuota estimatedSize: %d currentQuota: %d totalUsedQuota: %d", estimatedSize, currentQuota, totalUsedQuota); if (estimatedSize < MAX_QUOTA) { diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index c57cd505..afb1e7f7 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -485,7 +485,7 @@ public class CordovaWebView extends WebView { // If first page, then show splashscreen else { - LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time); + LOG.d(TAG, "loadUrlIntoView(%s, %d)", url, time); // Send message to show splashscreen now if desired this.postMessage("splashscreen", "show");