From 0ab461f70f6c3f31a93a0eb0182201b650e401cc Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 14 Jan 2014 10:28:30 -0800 Subject: [PATCH] Bug 943515 - Part 2: Url -> URL in Favicon method names. r=rnewman --- mobile/android/base/GeckoApp.java | 2 +- mobile/android/base/db/BrowserProvider.java | 2 +- mobile/android/base/favicons/Favicons.java | 12 ++++++------ mobile/android/base/favicons/LoadFaviconTask.java | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java index 4a22489503e4..6ee2ecbbae76 100644 --- a/mobile/android/base/GeckoApp.java +++ b/mobile/android/base/GeckoApp.java @@ -499,7 +499,7 @@ public abstract class GeckoApp (new UiAsyncTask(ThreadUtils.getBackgroundHandler()) { @Override public String doInBackground(Void... params) { - return Favicons.getFaviconUrlForPageUrl(url); + return Favicons.getFaviconURLForPageURL(url); } @Override diff --git a/mobile/android/base/db/BrowserProvider.java b/mobile/android/base/db/BrowserProvider.java index 8126bd30106e..1f8330faef0e 100644 --- a/mobile/android/base/db/BrowserProvider.java +++ b/mobile/android/base/db/BrowserProvider.java @@ -2975,7 +2975,7 @@ public class BrowserProvider extends ContentProvider { // If no URL is provided, insert using the default one. if (TextUtils.isEmpty(faviconUrl) && !TextUtils.isEmpty(pageUrl)) { - values.put(Favicons.URL, org.mozilla.gecko.favicons.Favicons.guessDefaultFaviconUrl(pageUrl)); + values.put(Favicons.URL, org.mozilla.gecko.favicons.Favicons.guessDefaultFaviconURL(pageUrl)); } long now = System.currentTimeMillis(); diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java index 9586912d91e3..51aa9bdc9225 100644 --- a/mobile/android/base/favicons/Favicons.java +++ b/mobile/android/base/favicons/Favicons.java @@ -65,7 +65,7 @@ public class Favicons { // doing so is not necessary. private static final NonEvictingLruCache sPageURLMappings = new NonEvictingLruCache(NUM_PAGE_URL_MAPPINGS_TO_STORE); - public static String getFaviconUrlForPageUrlFromCache(String pageURL) { + public static String getFaviconURLForPageURLFromCache(String pageURL) { return sPageURLMappings.get(pageURL); } @@ -73,7 +73,7 @@ public class Favicons { * Insert the given pageUrl->faviconUrl mapping into the memory cache of such mappings. * Useful for short-circuiting local database access. */ - public static void putFaviconUrlForPageUrlInCache(String pageURL, String faviconURL) { + public static void putFaviconURLForPageURLInCache(String pageURL, String faviconURL) { sPageURLMappings.put(pageURL, faviconURL); } @@ -143,7 +143,7 @@ public class Favicons { // If there's no favicon URL given, try and hit the cache with the default one. if (cacheURL == null) { - cacheURL = guessDefaultFaviconUrl(pageURL); + cacheURL = guessDefaultFaviconURL(pageURL); } // If it's something we can't even figure out a default URL for, just give up. @@ -231,7 +231,7 @@ public class Favicons { * @return The URL of the Favicon used by that webpage, according to either the History database * or a somewhat educated guess. */ - public static String getFaviconUrlForPageUrl(String pageURL) { + public static String getFaviconURLForPageURL(String pageURL) { // Attempt to determine the Favicon URL from the Tabs datastructure. Can dodge having to use // the database sometimes by doing this. String targetURL; @@ -246,7 +246,7 @@ public class Favicons { targetURL = BrowserDB.getFaviconUrlForHistoryUrl(sContext.getContentResolver(), pageURL); if (targetURL == null) { // Nothing in the history database. Fall back to the default URL and hope for the best. - targetURL = guessDefaultFaviconUrl(pageURL); + targetURL = guessDefaultFaviconURL(pageURL); } return targetURL; } @@ -407,7 +407,7 @@ public class Favicons { * @param pageURL Page URL for which a default Favicon URL is requested * @return The default Favicon URL. */ - public static String guessDefaultFaviconUrl(String pageURL) { + public static String guessDefaultFaviconURL(String pageURL) { // Special-casing for about: pages. The favicon for about:pages which don't provide a link tag // is bundled in the database, keyed only by page URL, hence the need to return the page URL // here. If the database ever migrates to stop being silly in this way, this can plausibly diff --git a/mobile/android/base/favicons/LoadFaviconTask.java b/mobile/android/base/favicons/LoadFaviconTask.java index 7f4b2a409baf..409bf5274763 100644 --- a/mobile/android/base/favicons/LoadFaviconTask.java +++ b/mobile/android/base/favicons/LoadFaviconTask.java @@ -88,7 +88,7 @@ public class LoadFaviconTask extends UiAsyncTask { } // Runs in background thread - private Bitmap loadFaviconFromDb() { + private Bitmap loadFaviconFromDB() { ContentResolver resolver = sContext.getContentResolver(); return BrowserDB.getFaviconForFaviconUrl(resolver, mFaviconUrl); } @@ -240,14 +240,14 @@ public class LoadFaviconTask extends UiAsyncTask { // If favicon is empty, fall back to the stored one. if (TextUtils.isEmpty(mFaviconUrl)) { // Try to get the favicon URL from the memory cache. - storedFaviconUrl = Favicons.getFaviconUrlForPageUrlFromCache(mPageUrl); + storedFaviconUrl = Favicons.getFaviconURLForPageURLFromCache(mPageUrl); // If that failed, try to get the URL from the database. if (storedFaviconUrl == null) { - storedFaviconUrl = Favicons.getFaviconUrlForPageUrl(mPageUrl); + storedFaviconUrl = Favicons.getFaviconURLForPageURL(mPageUrl); if (storedFaviconUrl != null) { // If that succeeded, cache the URL loaded from the database in memory. - Favicons.putFaviconUrlForPageUrlInCache(mPageUrl, storedFaviconUrl); + Favicons.putFaviconURLForPageURLInCache(mPageUrl, storedFaviconUrl); } } @@ -256,7 +256,7 @@ public class LoadFaviconTask extends UiAsyncTask { mFaviconUrl = storedFaviconUrl; } else { // If we don't have a stored one, fall back to the default. - mFaviconUrl = Favicons.guessDefaultFaviconUrl(mPageUrl); + mFaviconUrl = Favicons.guessDefaultFaviconURL(mPageUrl); if (TextUtils.isEmpty(mFaviconUrl)) { return null; @@ -299,7 +299,7 @@ public class LoadFaviconTask extends UiAsyncTask { return null; } - image = loadFaviconFromDb(); + image = loadFaviconFromDB(); if (imageIsValid(image)) { return image; } @@ -335,7 +335,7 @@ public class LoadFaviconTask extends UiAsyncTask { } // If we're not already trying the default URL, try it now. - final String guessed = Favicons.guessDefaultFaviconUrl(mPageUrl); + final String guessed = Favicons.guessDefaultFaviconURL(mPageUrl); if (guessed == null) { Favicons.putFaviconInFailedCache(mFaviconUrl); return null;