From 376379fd5cfa85c484d68dbf99e4b6545d6bef1a Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Thu, 2 Jun 2016 14:25:05 -0700 Subject: [PATCH] Bug 1265708 - Pre: make getForURLs arguments more generic r=sebastian MozReview-Commit-ID: IkPiLVB5mop --HG-- extra : rebase_source : 209fc8cf05e3f91392f6944914e260483900b967 extra : source : 047961bdb4adf91179be3b8a983cffc0d8e9debb --- .../base/java/org/mozilla/gecko/db/LocalURLMetadata.java | 3 ++- .../android/base/java/org/mozilla/gecko/db/StubBrowserDB.java | 2 +- mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java b/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java index 67aa44806268..26048dd20eeb 100644 --- a/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java @@ -6,6 +6,7 @@ package org.mozilla.gecko.db; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -124,7 +125,7 @@ public class LocalURLMetadata implements URLMetadata { */ @Override public Map> getForURLs(final ContentResolver cr, - final List urls, + final Collection urls, final List requestedColumns) { ThreadUtils.assertNotOnUiThread(); ThreadUtils.assertNotOnGeckoThread(); diff --git a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java index 3dafcd1d6c3c..6befe66b241e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java @@ -44,7 +44,7 @@ class StubURLMetadata implements URLMetadata { } public Map> getForURLs(final ContentResolver cr, - final List urls, + final Collection urls, final List columns) { return new HashMap>(); } diff --git a/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java b/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java index 3e8162dfe781..5330b036b3f5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java @@ -5,6 +5,7 @@ */ package org.mozilla.gecko.db; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -15,7 +16,7 @@ import android.content.ContentResolver; public interface URLMetadata { public Map fromJSON(JSONObject obj); public Map> getForURLs(final ContentResolver cr, - final List urls, + final Collection urls, final List columns); public void save(final ContentResolver cr, final Map data); }