From 45199b395d60e6fc49f431ad88fa7cec6a110fa2 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Wed, 13 Jan 2016 18:17:34 +0200 Subject: [PATCH] Fixed typo --- .../net/osmand/plus/TargetPointsHelper.java | 26 +++++++++---------- .../activities/FavoritesTreeFragment.java | 2 +- .../osmand/plus/activities/MapActivity.java | 2 +- .../plus/activities/MapActivityActions.java | 2 +- .../osmand/plus/base/FailSafeFuntions.java | 2 +- .../osmand/plus/dashboard/DashboardOnMap.java | 2 +- .../other/RoutePreferencesMenu.java | 4 +-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java index 2a9096b876..6ca16604fd 100644 --- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java +++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java @@ -1,8 +1,7 @@ package net.osmand.plus; -import java.util.ArrayList; -import java.util.List; +import android.content.Context; import net.osmand.Location; import net.osmand.StateChangedListener; @@ -11,9 +10,10 @@ import net.osmand.data.LocationPoint; import net.osmand.data.PointDescription; import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RoutingHelper; -import net.osmand.plus.activities.MapActivity; import net.osmand.util.MapUtils; -import android.content.Context; + +import java.util.ArrayList; +import java.util.List; public class TargetPointsHelper { @@ -188,7 +188,7 @@ public class TargetPointsHelper { pointToStart = null; intermediatePoints.clear(); readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } /** @@ -200,7 +200,7 @@ public class TargetPointsHelper { pointToNavigate.pointDescription); pointToNavigate.intermediate = false; settings.deleteIntermediatePoint(index); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } public void removeWayPoint(boolean updateRoute, int index){ @@ -223,10 +223,10 @@ public class TargetPointsHelper { tp.index = ind++; } } - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } - public void updateRouteAndReferesh(boolean updateRoute) { + public void updateRouteAndRefresh(boolean updateRoute) { if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) { updateRoutingHelper(); @@ -285,13 +285,13 @@ public class TargetPointsHelper { settings.clearIntermediatePoints(); intermediatePoints.clear(); readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } public void clearStartPoint(boolean updateRoute) { settings.clearPointToStart(); readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } @@ -312,7 +312,7 @@ public class TargetPointsHelper { settings.clearIntermediatePoints(); } readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } @@ -360,7 +360,7 @@ public class TargetPointsHelper { settings.clearIntermediatePoints(); } readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } public void setStartPoint(LatLon startPoint, boolean updateRoute, PointDescription name) { @@ -370,7 +370,7 @@ public class TargetPointsHelper { settings.clearPointToStart(); } readFromSettings(settings); - updateRouteAndReferesh(updateRoute); + updateRouteAndRefresh(updateRoute); } public boolean checkPointToNavigate(){ diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index 8fb41d5d43..c77470bde8 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -437,7 +437,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { new PointDescription(PointDescription.POINT_TYPE_FAVORITE, fp.getName())); } if(getMyApplication().getRoutingHelper().isRouteCalculated()) { - targetPointsHelper.updateRouteAndReferesh(true); + targetPointsHelper.updateRouteAndRefresh(true); } IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), true); //MapActivity.launchMapActivityMoveToTop(getActivity()); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 535b12ad2c..014085092c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -457,7 +457,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents, if (routingHelper.isFollowingMode() && (!Algorithms.objectEquals(targets.getPointToNavigate().point, routingHelper.getFinalLocation()) || !Algorithms .objectEquals(targets.getIntermediatePointsLatLonNavigation(), routingHelper.getIntermediatePoints()))) { - targets.updateRouteAndReferesh(true); + targets.updateRouteAndRefresh(true); } app.getLocationProvider().resumeAllUpdates(); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 9c19de02c2..e8677b8f50 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -422,7 +422,7 @@ public class MapActivityActions implements DialogProvider { // then set gpx setGPXRouteParams(gpxFile); // then update start and destination point - targets.updateRouteAndReferesh(true); + targets.updateRouteAndRefresh(true); mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode(); mapActivity.getMapView().refreshMap(true); diff --git a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java index 1f9d4bf637..aac072837f 100644 --- a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java +++ b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java @@ -171,7 +171,7 @@ public class FailSafeFuntions { app.getTargetPointsHelper().setStartPoint(null, false, null); app.getSettings().FOLLOW_THE_ROUTE.set(true); routingHelper.setFollowingMode(true); - app.getTargetPointsHelper().updateRouteAndReferesh(true); + app.getTargetPointsHelper().updateRouteAndRefresh(true); app.initVoiceCommandPlayer(ma); if(ma.getDashboard().isVisible()) { ma.getDashboard().hideDashboard(); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index 8c5bdff6c9..7501a3ea48 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -1183,7 +1183,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis } getMyApplication().getTargetPointsHelper().reorderAllTargetPoints(allTargets, false); newRouteIsCalculated(false, new ValueHolder()); - getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true); + getMyApplication().getTargetPointsHelper().updateRouteAndRefresh(true); if (swipeDismissListener != null) { swipeDismissListener.setEnabled(true); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java index 5312be368c..04540e71a3 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java @@ -474,7 +474,7 @@ public class RoutePreferencesMenu { update = true; } if (update) { - tg.updateRouteAndReferesh(true); + tg.updateRouteAndRefresh(true); } } } else if (gpxParam.id == R.string.gpx_option_calculate_first_last_segment) { @@ -572,7 +572,7 @@ public class RoutePreferencesMenu { @Override public boolean processResult(GPXUtilities.GPXFile[] result) { mapActivity.getMapActions().setGPXRouteParams(result[0]); - app.getTargetPointsHelper().updateRouteAndReferesh(true); + app.getTargetPointsHelper().updateRouteAndRefresh(true); updateSpinnerItems(gpxSpinner); updateParameters(); mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();