pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed typo in class name.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-07-20 14:49:40 +03:00 • committed by Alex Zolotarev
parent 10420c0cb3
commit 97de910d85
6 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -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())

8
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -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));
}
});

16
android/src/com/mapswithme/maps/api/ParsedMmwRequest.java → android/src/com/mapswithme/maps/api/ParsedMwmRequest.java
View file

@ -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()
{}
}

10
android/src/com/mapswithme/maps/search/SearchToolbarController.java
View file

@ -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();
}

10
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -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);

4
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -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)
{