From ed32ebbb62a289ad48894bd27226ce9fcc974349 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Fri, 12 May 2017 19:05:20 +0300 Subject: [PATCH] Fix Codacy issues --- .../nrw/commons/nearby/NearbyActivity.java | 3 +-- .../nrw/commons/nearby/NearbyController.java | 24 ++++++++++--------- .../free/nrw/commons/nearby/NearbyPlaces.java | 5 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 9e0ce1c13..53e01af86 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -55,12 +55,11 @@ public class NearbyActivity extends BaseActivity { } private void showMapView() { - if(!isMapViewActive){ + if (!isMapViewActive) { getSupportFragmentManager().beginTransaction() .replace(R.id.container, new NearbyMapFragment()).commit(); isMapViewActive = true; } - } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java index fab043d14..c2834dba8 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -7,6 +7,8 @@ import android.preference.PreferenceManager; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; import com.mapbox.mapboxsdk.annotations.MarkerOptions; +import fr.free.nrw.commons.location.LatLng; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -15,7 +17,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; @@ -56,13 +57,14 @@ public class NearbyController { } /** - * Loads attractions from location for list view, we need to return Place data type - * @param curLatLng - * @param context + * Loads attractions from location for list view, we need to return Place data type. + * @param curLatLng users current location + * @param context current activity * @return */ - public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, Context context) { + public static List loadAttractionsFromLocationToPlaces(LatLng curLatLng, + Context context) { List places = loadAttractionsFromLocation(curLatLng,context); places = places.subList(0, Math.min(places.size(), MAX_RESULTS)); @@ -74,9 +76,9 @@ public class NearbyController { } /** - *Loads attractions from location for map view, we need to return BaseMarkerOption data type - * @param curLatLng - * @param context + *Loads attractions from location for map view, we need to return BaseMarkerOption data type. + * @param curLatLng users current location + * @param context the activity * @return */ public static List loadAttractionsFromLocationToBaseMarkerOptions( @@ -89,10 +91,10 @@ public class NearbyController { String distance = formatDistanceBetween(curLatLng, place.location); place.setDistance(distance); baseMarkerOptionses.add(new MarkerOptions() - .position(new com.mapbox.mapboxsdk.geometry + .position(new com.mapbox.mapboxsdk.geometry .LatLng(place.location.latitude,place.location.longitude)) - .title(place.name) - .snippet(place.description)); + .title(place.name) + .snippet(place.description)); } return baseMarkerOptionses; } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java index 6fe319c85..44d415505 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java @@ -3,6 +3,9 @@ package fr.free.nrw.commons.nearby; import android.net.Uri; import android.os.StrictMode; +import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.location.LatLng; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -16,8 +19,6 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; public class NearbyPlaces {