Fix linebreaks for codefactor

5 files changed, 48 insertions, 16 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 50e5d579c..d3bd64210 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -123,7 +123,9 @@ public class Navit extends Activity {
     public void removeFileIfExists(String source) {
         File file = new File(source);
 
-        if (!file.exists()) { return; }
+        if (!file.exists()) {
+            return;
+        }
 
         file.delete();
     }
@@ -131,7 +133,9 @@ public class Navit extends Activity {
     public void copyFileIfExists(String source, String destination) throws IOException {
         File file = new File(source);
 
-        if (!file.exists()) { return; }
+        if (!file.exists()) {
+            return;
+        }
 
         FileInputStream is = null;
         FileOutputStream os = null;
@@ -148,9 +152,13 @@ public class Navit extends Activity {
             }
         } finally {
             /* Close the FileStreams to prevent Resource leaks */
-            if (is != null) { is.close(); }
+            if (is != null) {
+                is.close();
+            }
 
-            if (os != null) { os.close(); }
+            if (os != null) {
+                os.close();
+            }
         }
     }
 
@@ -169,7 +177,9 @@ public class Navit extends Activity {
         Log.e(TAG, "Res Name " + resname + ", result " + result);
         int id = NavitResources.getIdentifier(resname, "raw", NAVIT_PACKAGE_NAME);
         Log.e(TAG, "Res ID " + id);
-        if (id == 0) { return false; }
+        if (id == 0) {
+            return false;
+        }
 
         File resultfile = new File(result);
         if (!resultfile.exists()) {
@@ -488,7 +498,9 @@ public class Navit extends Activity {
         String geoString = params.get("ll");
         if (geoString != null) {
             String address = params.get("q");
-            if (address != null) { b.putString("q", address); }
+            if (address != null) {
+                b.putString("q", address);
+            }
         } else {
             geoString = params.get("q");
         }
@@ -757,7 +769,9 @@ public class Navit extends Activity {
                 prefs_editor.apply();
 
                 Toast.makeText(this, String.format(getTstring(R.string.map_location_changed),newDir),Toast.LENGTH_LONG).show();
-            } else { Log.w(TAG, "select path failed"); }
+            } else {
+                Log.w(TAG, "select path failed");
+            }
             break;
         default :
             ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
index 98ef447ad..22c310f70 100755
--- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java
+++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
@@ -40,7 +40,9 @@ public class NavitAppConfig extends Application {
                                                addr_str));
                     }
 
-                    if (--index < 0) { index = MAX_LAST_ADDRESSES - 1; }
+                    if (--index < 0) {
+                        index = MAX_LAST_ADDRESSES - 1;
+                    }
 
                 } while (index != mLastAddressField);
             }
@@ -52,10 +54,14 @@ public class NavitAppConfig extends Application {
         getLastAddresses();
 
         mLastAddresses.add(newAddress);
-        if (mLastAddresses.size() > MAX_LAST_ADDRESSES) { mLastAddresses.remove(0); }
+        if (mLastAddresses.size() > MAX_LAST_ADDRESSES) {
+            mLastAddresses.remove(0);
+        }
 
         mLastAddressField++;
-        if (mLastAddressField >= MAX_LAST_ADDRESSES) { mLastAddressField = 0; }
+        if (mLastAddressField >= MAX_LAST_ADDRESSES) {
+            mLastAddressField = 0;
+        }
 
         SharedPreferences.Editor editSettings = mSettings.edit();
 
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 201ab4efc..7e6205744 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -242,7 +242,9 @@ public class NavitGraphics {
 
             if (switch_value == MotionEvent.ACTION_DOWN) {
                 touch_mode = PRESSED;
-                if (!in_map) { ButtonCallback(ButtonCallbackID, 1, 1, x, y); } // down
+                if (!in_map) {
+                    ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                }
                 mPressedPosition = new PointF(x, y);
                 postDelayed(this, time_for_long_press);
             } else if ((switch_value == MotionEvent.ACTION_UP) || (switch_value == _ACTION_POINTER_UP_)) {
@@ -272,7 +274,9 @@ public class NavitGraphics {
                     }
                     break;
                 case PRESSED:
-                    if (in_map) { ButtonCallback(ButtonCallbackID, 1, 1, x, y); } // down
+                    if (in_map) {
+                        ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                    }
                     ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
 
                     break;
diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java
index 81b1b057f..3393a55fd 100644
--- a/navit/android/src/org/navitproject/navit/NavitVehicle.java
+++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java
@@ -110,7 +110,9 @@ public class NavitVehicle {
                 if (intent.getBooleanExtra("enabled", false)) {
                     VehicleCallback(vehicle_fcbid, 1);
                 } else {
-                    if (!intent.getBooleanExtra("enabled", true)) { VehicleCallback(vehicle_fcbid, 0); }
+                    if (!intent.getBooleanExtra("enabled", true)) {
+                        VehicleCallback(vehicle_fcbid, 0);
+                    }
                 }
             }
         }
diff --git a/navit/android/src/org/navitproject/navit/NavitWatch.java b/navit/android/src/org/navitproject/navit/NavitWatch.java
index 43a2434ad..426e5bdfd 100644
--- a/navit/android/src/org/navitproject/navit/NavitWatch.java
+++ b/navit/android/src/org/navitproject/navit/NavitWatch.java
@@ -65,19 +65,25 @@ public class NavitWatch implements Runnable {
             // Log.e("NavitWatch","Polling "+watch_fd+" "+watch_cond + " from " + java.lang.Thread.currentThread().getName());
             poll(watch_func, watch_fd, watch_cond);
             // Log.e("NavitWatch","poll returned");
-            if (removed) { break; }
+            if (removed) {
+                break;
+            }
             callback_pending = true;
             handler.post(callback_runnable);
             try {
                 // Log.e("NavitWatch","wait");
                 synchronized (this) {
-                    if (callback_pending) { this.wait(); }
+                    if (callback_pending) {
+                        this.wait();
+                    }
                 }
                 // Log.e("NavitWatch","wait returned");
             } catch (Exception e) {
                 Log.e("NavitWatch","Exception " + e.getMessage());
             }
-            if (removed) { break; }
+            if (removed) {
+                break;
+            }
         }
     }