cleanup:android:Fix EmptyLineSeparator checkstyle issues

10 files changed, 42 insertions, 3 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 018c6b7ab..045feb039 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -841,6 +841,7 @@ public class Navit extends Activity {
 
     public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path,
                                  String path2);
+
     public native void NavitDestroy();
 
 
diff --git a/navit/android/src/org/navitproject/navit/NavitActivityResult.java b/navit/android/src/org/navitproject/navit/NavitActivityResult.java
index f52f06c9c..7d3ef8cb4 100644
--- a/navit/android/src/org/navitproject/navit/NavitActivityResult.java
+++ b/navit/android/src/org/navitproject/navit/NavitActivityResult.java
@@ -4,4 +4,4 @@ import android.content.Intent;
 
 public interface NavitActivityResult {
     public void onActivityResult(int requestCode, int resultCode, Intent data);
-};
+}
diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index b5f18d734..543a75194 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -345,6 +345,7 @@ public class NavitAddressSearchActivity extends Activity {
     }
 
     public native long CallbackStartAddressSearch(int partial_match, String country, String s);
+
     public native void CallbackCancelAddressSearch(long handle);
 
     @Override
diff --git a/navit/android/src/org/navitproject/navit/NavitCamera.java b/navit/android/src/org/navitproject/navit/NavitCamera.java
index a10150c48..66f1f4aa9 100644
--- a/navit/android/src/org/navitproject/navit/NavitCamera.java
+++ b/navit/android/src/org/navitproject/navit/NavitCamera.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.navitproject.navit;
 
 import android.content.Context;
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 81e3321e0..4cd27ccfd 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -62,7 +62,8 @@ public class NavitGraphics {
     private int                            pos_wraparound;
     private int                            overlay_disabled;
     private int                            bgcolor;
-    private float                          trackball_x, trackball_y;
+    private float                          trackball_x;
+    private float                          trackball_y;
     private View                           view;
     private SystemBarTintView              navigationTintView;
     private SystemBarTintView              statusTintView;
@@ -649,16 +650,28 @@ public class NavitGraphics {
     };
 
     public native void SizeChangedCallback(int id, int x, int y);
+
     public native void PaddingChangedCallback(int id, int left, int right, int top, int bottom);
+
     public native void KeypressCallback(int id, String s);
+
     public native int CallbackMessageChannel(int i, String s);
+
     public native void ButtonCallback(int id, int pressed, int button, int x, int y);
+
     public native void MotionCallback(int id, int x, int y);
+
     public native String GetDefaultCountry(int id, String s);
+
     public static native String[][] GetAllCountries();
+
     private Canvas  draw_canvas;
     private Bitmap  draw_bitmap;
-    private int     SizeChangedCallbackID, PaddingChangedCallbackID, ButtonCallbackID, MotionCallbackID, KeypressCallbackID;
+    private int SizeChangedCallbackID;
+    private int PaddingChangedCallbackID;
+    private int ButtonCallbackID;
+    private int MotionCallbackID;
+    private int KeypressCallbackID;
 
     /**
      * @brief Adjust views used to tint navigation and status bars.
@@ -796,12 +809,15 @@ public class NavitGraphics {
     public void setSizeChangedCallback(int id) {
         SizeChangedCallbackID = id;
     }
+
     public void setPaddingChangedCallback(int id) {
         PaddingChangedCallbackID = id;
     }
+
     public void setButtonCallback(int id) {
         ButtonCallbackID = id;
     }
+
     public void setMotionCallback(int id) {
         MotionCallbackID = id;
         if(activity != null) {
@@ -912,6 +928,7 @@ public class NavitGraphics {
         }
         paint.clearShadowLayer();
     }
+
     protected void draw_image(Paint paint, int x, int y, Bitmap bitmap) {
         draw_canvas.drawBitmap(bitmap, x, y, null);
     }
@@ -974,10 +991,12 @@ public class NavitGraphics {
         }
 
     }
+
     protected void draw_drag(int x, int y) {
         pos_x = x;
         pos_y = y;
     }
+
     protected void overlay_disable(int disable) {
         Log.d(TAG,"overlay_disable: " + disable + "Parent: " + (parent_graphics != null));
         // assume we are NOT in map view mode!
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 01611d0ad..eff20db0e 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -485,6 +485,7 @@ public class NavitMapDownloader extends Thread {
     private long uiLastUpdated = -1;
     private Boolean retryDownload = false; //Download failed, but
     private int retry_counter = 0;
+
     NavitMapDownloader(int map_id) {
         this.map_values = osm_maps[map_id];
         this.map_id = map_id;
@@ -498,6 +499,7 @@ public class NavitMapDownloader extends Thread {
                 return (filename.endsWith(".bin"));
             }
         }
+
         NavitMap maps[] = new NavitMap[0];
         File map_dir = new File(Navit.map_filename_path);
         String map_file_names[] = map_dir.list(new filterMaps());
diff --git a/navit/android/src/org/navitproject/navit/NavitSensors.java b/navit/android/src/org/navitproject/navit/NavitSensors.java
index d4d8abf3e..949dcd8f0 100644
--- a/navit/android/src/org/navitproject/navit/NavitSensors.java
+++ b/navit/android/src/org/navitproject/navit/NavitSensors.java
@@ -27,6 +27,7 @@ import android.hardware.SensorManager;
 public class NavitSensors implements SensorEventListener {
     private SensorManager mSensorManager;
     private int callbackid;
+
     public native void SensorCallback(int id, int sensor, float x, float y, float z);
 
 
diff --git a/navit/android/src/org/navitproject/navit/NavitTimeout.java b/navit/android/src/org/navitproject/navit/NavitTimeout.java
index 20884f616..81451ab47 100644
--- a/navit/android/src/org/navitproject/navit/NavitTimeout.java
+++ b/navit/android/src/org/navitproject/navit/NavitTimeout.java
@@ -34,6 +34,7 @@ public class NavitTimeout implements Runnable {
     private boolean event_multi;
     private int event_callbackid;
     private int event_timeout;
+
     public native void TimeoutCallback(int id);
 
     NavitTimeout(int timeout, boolean multi, int callbackid) {
@@ -42,6 +43,7 @@ public class NavitTimeout implements Runnable {
         event_callbackid = callbackid;
         handler.postDelayed(this, event_timeout);
     }
+
     public void run() {
         // Log.e("Navit","Handle Event");
         if (event_multi) {
@@ -49,6 +51,7 @@ public class NavitTimeout implements Runnable {
         }
         TimeoutCallback(event_callbackid);
     }
+
     public void remove() {
         handler.removeCallbacks(this);
     }
diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java
index 65f4830de..2bdcf8c58 100644
--- a/navit/android/src/org/navitproject/navit/NavitVehicle.java
+++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java
@@ -56,11 +56,14 @@ public class NavitVehicle {
     private static NavitLocationListener fastLocationListener = null;
 
     public native void VehicleCallback(int id, Location location);
+
     public native void VehicleCallback(int id, int satsInView, int satsUsed);
+
     public native void VehicleCallback(int id, int enabled);
 
     private class NavitLocationListener extends BroadcastReceiver implements GpsStatus.Listener, LocationListener {
         public boolean precise = false;
+
         public void onLocationChanged(Location location) {
             lastLocation = location;
             // Disable the fast provider if still active
@@ -72,8 +75,11 @@ public class NavitVehicle {
             VehicleCallback(vehicle_pcbid, location);
             VehicleCallback(vehicle_fcbid, 1);
         }
+
         public void onProviderDisabled(String provider) {}
+
         public void onProviderEnabled(String provider) {}
+
         public void onStatusChanged(String provider, int status, Bundle extras) {}
 
         /**
diff --git a/navit/android/src/org/navitproject/navit/NavitWatch.java b/navit/android/src/org/navitproject/navit/NavitWatch.java
index 6f8dd5cd6..ade5140e8 100644
--- a/navit/android/src/org/navitproject/navit/NavitWatch.java
+++ b/navit/android/src/org/navitproject/navit/NavitWatch.java
@@ -39,7 +39,9 @@ public class NavitWatch implements Runnable {
     private int watch_callbackid;
     private boolean callback_pending;
     private Runnable callback_runnable;
+
     public native void poll(int func, int fd, int cond);
+
     public native void WatchCallback(int id);
 
     NavitWatch(int func, int fd, int cond, int callbackid) {
@@ -57,6 +59,7 @@ public class NavitWatch implements Runnable {
         thread = new Thread(this, "poll thread");
         thread.start();
     }
+
     public void run() {
         for (;;) {
             // Log.e("NavitWatch","Polling "+watch_fd+" "+watch_cond + " from " + java.lang.Thread.currentThread().getName());
@@ -77,6 +80,7 @@ public class NavitWatch implements Runnable {
             if (removed) { break; }
         }
     }
+
     public void callback() {
         // Log.e("NavitWatch","Calling Callback");
         if (!removed) { WatchCallback(watch_callbackid); }
@@ -86,6 +90,7 @@ public class NavitWatch implements Runnable {
             this.notify();
         }
     }
+
     public void remove() {
         removed = true;
         thread.interrupt();