From fff771bfe215ee8d31cc9a75e862422220568010 Mon Sep 17 00:00:00 2001 From: Felipe Duarte Date: Mon, 19 Oct 2015 10:04:39 -0700 Subject: [PATCH] Compilation issue on class Routing / Lint warnings --- .../com/directions/route/AbstractRouting.java | 7 +-- .../com/directions/route/GoogleParser.java | 3 +- .../java/com/directions/route/Parser.java | 2 +- .../java/com/directions/route/Routing.java | 56 +++++++++---------- .../com/directions/route/RoutingListener.java | 10 ++-- 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/library/src/main/java/com/directions/route/AbstractRouting.java b/library/src/main/java/com/directions/route/AbstractRouting.java index f80dc26..839dacf 100644 --- a/library/src/main/java/com/directions/route/AbstractRouting.java +++ b/library/src/main/java/com/directions/route/AbstractRouting.java @@ -30,7 +30,7 @@ public enum TravelMode { protected String _sValue; - private TravelMode(String sValue) { + TravelMode(String sValue) { this._sValue = sValue; } @@ -47,7 +47,7 @@ public enum AvoidKind { private final String _sRequestParam; private final int _sBitValue; - private AvoidKind (int bit, String param) { + AvoidKind(int bit, String param) { this._sBitValue = bit; this._sRequestParam = param; } @@ -107,8 +107,7 @@ private void dispatchOnCancelled() { * Performs the call to the google maps API to acquire routing data and * deserializes it to a format the map can display. * - * @param - * @return + * @return an array list containing the routes */ @Override protected ArrayList doInBackground(Void... voids) { diff --git a/library/src/main/java/com/directions/route/GoogleParser.java b/library/src/main/java/com/directions/route/GoogleParser.java index 894575a..3232673 100644 --- a/library/src/main/java/com/directions/route/GoogleParser.java +++ b/library/src/main/java/com/directions/route/GoogleParser.java @@ -130,7 +130,7 @@ private static String convertStreamToString(final InputStream input) { final BufferedReader reader = new BufferedReader(new InputStreamReader(input)); final StringBuilder sBuf = new StringBuilder(); - String line = null; + String line; try { while ((line = reader.readLine()) != null) { sBuf.append(line); @@ -140,6 +140,7 @@ private static String convertStreamToString(final InputStream input) { } finally { try { input.close(); + reader.close(); } catch (IOException e) { Log.e("Routing Error", e.getMessage()); } diff --git a/library/src/main/java/com/directions/route/Parser.java b/library/src/main/java/com/directions/route/Parser.java index d5c0965..114a9ee 100644 --- a/library/src/main/java/com/directions/route/Parser.java +++ b/library/src/main/java/com/directions/route/Parser.java @@ -4,5 +4,5 @@ //. by Haseem Saheed public interface Parser { - public List parse(); + List parse(); } \ No newline at end of file diff --git a/library/src/main/java/com/directions/route/Routing.java b/library/src/main/java/com/directions/route/Routing.java index 91a9b51..2044b8e 100644 --- a/library/src/main/java/com/directions/route/Routing.java +++ b/library/src/main/java/com/directions/route/Routing.java @@ -3,6 +3,7 @@ import com.google.android.gms.maps.model.LatLng; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -25,63 +26,64 @@ private Routing(Builder builder) { this.avoidKinds = builder.avoidKinds; this.optimize = builder.optimize; this.alternativeRoutes = builder.alternativeRoutes; + this.language = builder.language; } protected String constructURL () { - final StringBuffer stringBuffer = new StringBuffer(AbstractRouting.DIRECTIONS_API_URL); + final StringBuilder stringBuilder = new StringBuilder(AbstractRouting.DIRECTIONS_API_URL); // origin final LatLng origin = waypoints.get(0); - stringBuffer.append("origin="); - stringBuffer.append(origin.latitude); - stringBuffer.append(','); - stringBuffer.append(origin.longitude); + stringBuilder.append("origin="); + stringBuilder.append(origin.latitude); + stringBuilder.append(','); + stringBuilder.append(origin.longitude); // destination final LatLng destination = waypoints.get(waypoints.size() - 1); - stringBuffer.append("&destination="); - stringBuffer.append(destination.latitude); - stringBuffer.append(','); - stringBuffer.append(destination.longitude); + stringBuilder.append("&destination="); + stringBuilder.append(destination.latitude); + stringBuilder.append(','); + stringBuilder.append(destination.longitude); // travel - stringBuffer.append("&mode="); - stringBuffer.append(travelMode.getValue()); + stringBuilder.append("&mode="); + stringBuilder.append(travelMode.getValue()); // waypoints if (waypoints.size() > 2) { - stringBuffer.append("&waypoints="); + stringBuilder.append("&waypoints="); if(optimize) - stringBuffer.append("optimize:true|"); + stringBuilder.append("optimize:true|"); for (int i = 1; i < waypoints.size() - 1; i++) { final LatLng p = waypoints.get(i); - stringBuffer.append("via:"); // we don't want to parse the resulting JSON for 'legs'. - stringBuffer.append(p.latitude); - stringBuffer.append(","); - stringBuffer.append(p.longitude); - stringBuffer.append("|"); + stringBuilder.append("via:"); // we don't want to parse the resulting JSON for 'legs'. + stringBuilder.append(p.latitude); + stringBuilder.append(","); + stringBuilder.append(p.longitude); + stringBuilder.append("|"); } } // avoid if (avoidKinds > 0) { - stringBuffer.append("&avoid="); - stringBuffer.append(AvoidKind.getRequestParam(avoidKinds)); + stringBuilder.append("&avoid="); + stringBuilder.append(AvoidKind.getRequestParam(avoidKinds)); } - if (alternativeRoutes == true) { - stringBuffer.append("&alternatives=true"); + if (alternativeRoutes) { + stringBuilder.append("&alternatives=true"); } // sensor - stringBuffer.append("&sensor=true"); + stringBuilder.append("&sensor=true"); // language if (language != null) { - stringBuffer.append("&language=").append(language); + stringBuilder.append("&language=").append(language); } - return stringBuffer.toString(); + return stringBuilder.toString(); } public static class Builder { @@ -116,9 +118,7 @@ public Builder alternativeRoutes (boolean alternativeRoutes) { public Builder waypoints (LatLng... points) { waypoints.clear(); - for (LatLng p : points) { - waypoints.add(p); - } + Collections.addAll(waypoints, points); return this; } diff --git a/library/src/main/java/com/directions/route/RoutingListener.java b/library/src/main/java/com/directions/route/RoutingListener.java index a72c7f1..51005c1 100644 --- a/library/src/main/java/com/directions/route/RoutingListener.java +++ b/library/src/main/java/com/directions/route/RoutingListener.java @@ -1,15 +1,13 @@ package com.directions.route; -import com.google.android.gms.maps.model.PolylineOptions; - import java.util.ArrayList; public interface RoutingListener { - public void onRoutingFailure(); + void onRoutingFailure(); - public void onRoutingStart(); + void onRoutingStart(); - public void onRoutingSuccess(ArrayList route,int shortestRouteIndex); + void onRoutingSuccess(ArrayList route, int shortestRouteIndex); - public void onRoutingCancelled(); + void onRoutingCancelled(); }