From 97de910d8519cffd2c09980945fe5e897a252d97 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Mon, 20 Jul 2015 14:49:40 +0300 Subject: [PATCH] [android] Fixed typo in class name. --- .../maps/DownloadResourcesActivity.java | 6 +++--- android/src/com/mapswithme/maps/MWMActivity.java | 8 ++++---- ...rsedMmwRequest.java => ParsedMwmRequest.java} | 16 ++++++++-------- .../maps/search/SearchToolbarController.java | 10 +++++----- .../maps/widget/placepage/PlacePageView.java | 10 +++++----- .../mapswithme/util/statistics/Statistics.java | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) rename android/src/com/mapswithme/maps/api/{ParsedMmwRequest.java => ParsedMwmRequest.java} (90%) diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index ef32f5efef..ecef34327f 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -20,7 +20,7 @@ import com.mapswithme.maps.MWMActivity.MapTask; import com.mapswithme.maps.MWMActivity.OpenUrlTask; import com.mapswithme.maps.MapStorage.Index; import com.mapswithme.maps.api.Const; -import com.mapswithme.maps.api.ParsedMmwRequest; +import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.ConnectionState; @@ -662,8 +662,8 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity { Framework.cleanSearchLayerOnMap(); - final ParsedMmwRequest request = ParsedMmwRequest.extractFromIntent(intent); - ParsedMmwRequest.setCurrentRequest(request); + final ParsedMwmRequest request = ParsedMwmRequest.extractFromIntent(intent); + ParsedMwmRequest.setCurrentRequest(request); Statistics.INSTANCE.trackApiCall(request); if (!request.isPickPointMode()) diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index e3c534d6ef..e14ad24dc3 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -44,7 +44,7 @@ import com.mapswithme.maps.Framework.OnBalloonListener; import com.mapswithme.maps.MapStorage.Index; import com.mapswithme.maps.activity.CustomNavigateUpListener; import com.mapswithme.maps.ads.LikesManager; -import com.mapswithme.maps.api.ParsedMmwRequest; +import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.ChooseBookmarkCategoryActivity; @@ -1113,9 +1113,9 @@ public class MWMActivity extends BaseMwmFragmentActivity @Override public void onApiPointActivated(final double lat, final double lon, final String name, final String id) { - if (ParsedMmwRequest.hasRequest()) + if (ParsedMwmRequest.hasRequest()) { - final ParsedMmwRequest request = ParsedMmwRequest.getCurrentRequest(); + final ParsedMwmRequest request = ParsedMwmRequest.getCurrentRequest(); request.setPointData(lat, lon, name, id); runOnUiThread(new Runnable() @@ -1123,7 +1123,7 @@ public class MWMActivity extends BaseMwmFragmentActivity @Override public void run() { - final String poiType = ParsedMmwRequest.getCurrentRequest().getCallerName(MWMApplication.get()).toString(); + final String poiType = ParsedMwmRequest.getCurrentRequest().getCallerName(MWMApplication.get()).toString(); activateMapObject(new ApiPoint(name, id, poiType, lat, lon)); } }); diff --git a/android/src/com/mapswithme/maps/api/ParsedMmwRequest.java b/android/src/com/mapswithme/maps/api/ParsedMwmRequest.java similarity index 90% rename from android/src/com/mapswithme/maps/api/ParsedMmwRequest.java rename to android/src/com/mapswithme/maps/api/ParsedMwmRequest.java index 771f57ed33..d4352081a2 100644 --- a/android/src/com/mapswithme/maps/api/ParsedMmwRequest.java +++ b/android/src/com/mapswithme/maps/api/ParsedMwmRequest.java @@ -10,10 +10,10 @@ import android.text.TextUtils; import com.mapswithme.maps.Framework; -public class ParsedMmwRequest +public class ParsedMwmRequest { - private static volatile ParsedMmwRequest sCurrentRequest; + private static volatile ParsedMwmRequest sCurrentRequest; // caller info private ApplicationInfo mCallerInfo; @@ -50,15 +50,15 @@ public class ParsedMmwRequest public String getCustomButtonName() { return mCustomButtonName; } - public static ParsedMmwRequest getCurrentRequest() { return sCurrentRequest; } + public static ParsedMwmRequest getCurrentRequest() { return sCurrentRequest; } public static boolean hasRequest() { return sCurrentRequest != null; } - public static void setCurrentRequest(ParsedMmwRequest request) { sCurrentRequest = request; } + public static void setCurrentRequest(ParsedMwmRequest request) { sCurrentRequest = request; } - public static ParsedMmwRequest extractFromIntent(Intent data) + public static ParsedMwmRequest extractFromIntent(Intent data) { - final ParsedMmwRequest request = new ParsedMmwRequest(); + final ParsedMwmRequest request = new ParsedMwmRequest(); request.mCallerInfo = data.getParcelableExtra(Const.EXTRA_CALLER_APP_INFO); request.mTitle = data.getStringExtra(Const.EXTRA_TITLE); @@ -155,8 +155,8 @@ public class ParsedMmwRequest } /** - * Do not use constructor externally. Use {@link ParsedMmwRequest#extractFromIntent(android.content.Intent)} instead. + * Do not use constructor externally. Use {@link ParsedMwmRequest#extractFromIntent(android.content.Intent)} instead. */ - private ParsedMmwRequest() + private ParsedMwmRequest() {} } diff --git a/android/src/com/mapswithme/maps/search/SearchToolbarController.java b/android/src/com/mapswithme/maps/search/SearchToolbarController.java index a8aadf874a..fd36261194 100644 --- a/android/src/com/mapswithme/maps/search/SearchToolbarController.java +++ b/android/src/com/mapswithme/maps/search/SearchToolbarController.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MWMActivity; import com.mapswithme.maps.R; -import com.mapswithme.maps.api.ParsedMmwRequest; +import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.util.UiUtils; public class SearchToolbarController implements OnClickListener @@ -52,10 +52,10 @@ public class SearchToolbarController implements OnClickListener mSearchQuery.setFocusable(false); UiUtils.hide(mSearchProgress, mVoiceInput); - if (ParsedMmwRequest.hasRequest()) + if (ParsedMwmRequest.hasRequest()) { UiUtils.show(mSearchToolbar); - mSearchQuery.setText(ParsedMmwRequest.getCurrentRequest().getTitle()); + mSearchQuery.setText(ParsedMwmRequest.getCurrentRequest().getTitle()); } else if (!TextUtils.isEmpty(mQuery)) { @@ -94,8 +94,8 @@ public class SearchToolbarController implements OnClickListener public static void cancelApiCall() { - if (ParsedMmwRequest.hasRequest()) - ParsedMmwRequest.setCurrentRequest(null); + if (ParsedMwmRequest.hasRequest()) + ParsedMwmRequest.setCurrentRequest(null); Framework.nativeClearApiPoints(); } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index c878ed5ac4..c3506564d0 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -35,7 +35,7 @@ import android.widget.TextView; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; -import com.mapswithme.maps.api.ParsedMmwRequest; +import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.bookmarks.ChooseBookmarkCategoryActivity; import com.mapswithme.maps.bookmarks.data.Bookmark; import com.mapswithme.maps.bookmarks.data.BookmarkManager; @@ -419,7 +419,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private void refreshButtons(boolean showBackButton) { if (showBackButton || - (ParsedMmwRequest.hasRequest() && ParsedMmwRequest.getCurrentRequest().isPickPointMode())) + (ParsedMwmRequest.hasRequest() && ParsedMwmRequest.getCurrentRequest().isPickPointMode())) mLlApiBack.setVisibility(View.VISIBLE); else mLlApiBack.setVisibility(View.GONE); @@ -545,7 +545,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private void checkApiWasCanceled() { - if ((mMapObject.getType() == MapObjectType.API_POINT) && !ParsedMmwRequest.hasRequest()) + if ((mMapObject.getType() == MapObjectType.API_POINT) && !ParsedMwmRequest.hasRequest()) { setMapObject(null); @@ -616,9 +616,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene break; case R.id.rl__api_back: final Activity activity = (Activity) getContext(); - if (ParsedMmwRequest.hasRequest()) + if (ParsedMwmRequest.hasRequest()) { - final ParsedMmwRequest request = ParsedMmwRequest.getCurrentRequest(); + final ParsedMwmRequest request = ParsedMwmRequest.getCurrentRequest(); if (request.isPickPointMode()) request.setPointData(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getName(), ""); request.sendResponseAndFinish(activity, true); diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index cef9520a21..170e459fc3 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -6,7 +6,7 @@ import com.mapswithme.country.ActiveCountryTree; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MWMApplication; import com.mapswithme.maps.R; -import com.mapswithme.maps.api.ParsedMmwRequest; +import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.util.FbUtil; import com.mapswithme.util.MathUtils; @@ -224,7 +224,7 @@ public enum Statistics trackIfEnabled(event); } - public void trackApiCall(ParsedMmwRequest request) + public void trackApiCall(ParsedMwmRequest request) { if (request != null && request.getCallerInfo() != null) {