From 0514a49ba130e7b6afab63b1ad2be54beec276a8 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 3 Feb 2021 16:47:31 +0200 Subject: [PATCH] Rename methods --- OsmAnd/src/net/osmand/plus/OsmandPlugin.java | 6 +++--- .../plus/mapcontextmenu/builders/cards/ImageCard.java | 2 +- .../plus/openplacereviews/OpenPlaceReviewsPlugin.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java index aadeed5671..62ba9b40f5 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java @@ -211,7 +211,7 @@ public abstract class OsmandPlugin { return Collections.emptyList(); } - protected List getImageCards(@Nullable GetImageCardsListener listener) { + protected List getContextMenuImageCards(@Nullable GetImageCardsListener listener) { return Collections.emptyList(); } @@ -875,9 +875,9 @@ public abstract class OsmandPlugin { return collection; } - public static void populateImageCards(@NonNull List imageCards, @Nullable GetImageCardsListener listener) { + public static void populateContextMenuImageCards(@NonNull List imageCards, @Nullable GetImageCardsListener listener) { for (OsmandPlugin p : getEnabledPlugins()) { - imageCards.addAll(p.getImageCards(listener)); + imageCards.addAll(p.getContextMenuImageCards(listener)); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java index c754e6fc84..b4a473531a 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java @@ -431,7 +431,7 @@ public abstract class ImageCard extends AbstractCard { protected List doInBackground(Void... params) { TrafficStats.setThreadStatsTag(GET_IMAGE_CARD_THREAD_ID); List result = new ArrayList<>(); - OsmandPlugin.populateImageCards(result, listener); + OsmandPlugin.populateContextMenuImageCards(result, listener); try { final Map pms = new LinkedHashMap<>(); pms.put("lat", "" + (float) latLon.getLatitude()); diff --git a/OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java b/OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java index 42a8399c34..48c506a2a5 100644 --- a/OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java @@ -85,7 +85,7 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin { } @Override - protected List getImageCards(@Nullable GetImageCardsListener listener) { + protected List getContextMenuImageCards(@Nullable GetImageCardsListener listener) { List imageCards = new ArrayList<>(); if (mapActivity != null) { Object object = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObject();