use IntelliJ default formatting, slightly corrected manually and via …

…NetBeans, graphhopper#770
helpbuttons · Sep 12, 2016 · ea1a8e2 · ea1a8e2
1 parent ca5fb9e
commit ea1a8e2
Show file tree

Hide file tree

Showing 412 changed files with 10,143 additions and 16,644 deletions.
diff --git a/android/app/src/main/java/com/graphhopper/android/AndroidDownloader.java b/android/app/src/main/java/com/graphhopper/android/AndroidDownloader.java
@@ -2,10 +2,8 @@
 
 import com.graphhopper.util.Downloader;
 
-public class AndroidDownloader extends Downloader
-{
-    public AndroidDownloader()
-    {
+public class AndroidDownloader extends Downloader {
+    public AndroidDownloader() {
         super("GraphHopper Android");
     }
 }
diff --git a/android/app/src/main/java/com/graphhopper/android/AndroidHelper.java b/android/app/src/main/java/com/graphhopper/android/AndroidHelper.java
@@ -1,37 +1,31 @@
 package com.graphhopper.android;
 
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-public class AndroidHelper
-{
-    public static List<String> readFile( Reader simpleReader ) throws IOException
-    {
+public class AndroidHelper {
+    public static List<String> readFile(Reader simpleReader) throws IOException {
         BufferedReader reader = new BufferedReader(simpleReader);
-        try
-        {
+        try {
             List<String> res = new ArrayList<String>();
             String line;
-            while ((line = reader.readLine()) != null)
-            {
+            while ((line = reader.readLine()) != null) {
                 res.add(line);
             }
             return res;
-        } finally
-        {
+        } finally {
             reader.close();
         }
     }
 
-    public static boolean isFastDownload( Context ctx )
-    {
+    public static boolean isFastDownload(Context ctx) {
         ConnectivityManager mgrConn = (ConnectivityManager) ctx
                 .getSystemService(Context.CONNECTIVITY_SERVICE);
         return mgrConn.getActiveNetworkInfo() != null
@@ -41,11 +35,9 @@ public static boolean isFastDownload( Context ctx )
         // || mgrTel.getNetworkType() == TelephonyManager.NETWORK_TYPE_UMTS) {
     }
 
-    public static String getFileName( String str )
-    {
+    public static String getFileName(String str) {
         int index = str.lastIndexOf("/");
-        if (index > 0)
-        {
+        if (index > 0) {
             return str.substring(index + 1);
         }
         return str;

diff --git a/android/app/src/main/java/com/graphhopper/android/GHAsyncTask.java b/android/app/src/main/java/com/graphhopper/android/GHAsyncTask.java
@@ -2,38 +2,30 @@
 
 import android.os.AsyncTask;
 
-public abstract class GHAsyncTask<A, B, C> extends AsyncTask<A, B, C>
-{
+public abstract class GHAsyncTask<A, B, C> extends AsyncTask<A, B, C> {
     private Throwable error;
 
-    protected abstract C saveDoInBackground( A... params ) throws Exception;
+    protected abstract C saveDoInBackground(A... params) throws Exception;
 
-    protected C doInBackground( A... params )
-    {
-        try
-        {
+    protected C doInBackground(A... params) {
+        try {
             return saveDoInBackground(params);
-        } catch (Throwable t)
-        {
+        } catch (Throwable t) {
             error = t;
             return null;
         }
     }
 
-    public boolean hasError()
-    {
+    public boolean hasError() {
         return error != null;
     }
 
-    public Throwable getError()
-    {
+    public Throwable getError() {
         return error;
     }
 
-    public String getErrorMessage()
-    {
-        if (hasError())
-        {
+    public String getErrorMessage() {
+        if (hasError()) {
             return error.getMessage();
         }
         return "No Error";