cleanup:android:Fix checkstyle LineLength

7 files changed, 91 insertions, 56 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 82a797253..76cf65055 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -241,15 +241,16 @@ public class Navit extends Activity {
                 }
             });
 
-            infobox.setNeutralButton(getTstring(R.string.initial_info_box_more_info), new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface arg0, int arg1) {
-                    Log.d(TAG, "user wants more info, show the website");
-                    String url = "http://wiki.navit-project.org/index.php/Navit_on_Android";
-                    Intent i = new Intent(Intent.ACTION_VIEW);
-                    i.setData(Uri.parse(url));
-                    startActivity(i);
-                }
-            });
+            infobox.setNeutralButton(getTstring(R.string.initial_info_box_more_info),
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface arg0, int arg1) {
+                            Log.d(TAG, "user wants more info, show the website");
+                            String url = "http://wiki.navit-project.org/index.php/Navit_on_Android";
+                            Intent i = new Intent(Intent.ACTION_VIEW);
+                            i.setData(Uri.parse(url));
+                            startActivity(i);
+                        }
+                    });
             infobox.show();
             SharedPreferences.Editor edit_settings = settings.edit();
             edit_settings.putBoolean("firstStart", false);
@@ -308,17 +309,19 @@ public class Navit extends Activity {
         navigation_bar_height = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;
         navigation_bar_height_landscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;
         navigation_bar_width = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;
-        Log.d(TAG,
-                String.format("status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, navigation_bar_height_landscape=%d, navigation_bar_width=%d",
-                    status_bar_height, action_bar_default_height, navigation_bar_height, navigation_bar_height_landscape,
-                    navigation_bar_width));
+        Log.d(TAG, String.format(
+                    "status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, "
+                    + "navigation_bar_height_landscape=%d, navigation_bar_width=%d",
+                    status_bar_height, action_bar_default_height, navigation_bar_height,
+                    navigation_bar_height_landscape, navigation_bar_width));
         if ((ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
                     || (ContextCompat.checkSelfPermission(this,
                         Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
             Log.d (TAG,"ask for permission(s)");
             ActivityCompat.requestPermissions(this,
-                    new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION},MY_PERMISSIONS_REQUEST_ALL);
+                    new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION},
+                    MY_PERMISSIONS_REQUEST_ALL);
         }
         // get the local language -------------
         Locale locale = java.util.Locale.getDefault();
@@ -339,7 +342,8 @@ public class Navit extends Activity {
         Log.d(TAG, "Language " + lang);
 
         SharedPreferences prefs = getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
-        map_filename_path  = prefs.getString("filenamePath", Environment.getExternalStorageDirectory().getPath() + "/navit/");
+        map_filename_path  = prefs.getString("filenamePath",
+                Environment.getExternalStorageDirectory().getPath() + "/navit/");
 
         // make sure the new path for the navitmap.bin file(s) exist!!
         File navit_maps_dir = new File(map_filename_path);
@@ -464,11 +468,12 @@ public class Navit extends Activity {
                 infobox.setCancelable(false);
                 infobox.setMessage(getTstring(R.string.permissions_not_granted));
                 // TRANS
-                infobox.setPositiveButton(getTstring(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        exit();
-                    }
-                });
+                infobox.setPositiveButton(getTstring(R.string.initial_info_box_OK),
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface arg0, int arg1) {
+                                exit();
+                            }
+                        });
                 infobox.show();
             }
         }
@@ -514,7 +519,8 @@ public class Navit extends Activity {
                         lon = Float.valueOf(geo[1]);
                         b.putFloat("lat", lat);
                         b.putFloat("lon", lon);
-                        Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+                        Message msg = Message.obtain(N_NavitGraphics.callback_handler,
+                                NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
 
                         msg.setData(b);
                         msg.sendToTarget();
@@ -601,13 +607,15 @@ public class Navit extends Activity {
         switch (id) {
             case 1 :
                 // zoom in
-                Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_IN.ordinal()).sendToTarget();
+                Message.obtain(N_NavitGraphics.callback_handler,
+                        NavitGraphics.msg_type.CLB_ZOOM_IN.ordinal()).sendToTarget();
                 // if we zoom, hide the bubble
                 Log.d(TAG, "onOptionsItemSelected -> zoom in");
                 break;
             case 2 :
                 // zoom out
-                Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_OUT.ordinal()).sendToTarget();
+                Message.obtain(N_NavitGraphics.callback_handler,
+                        NavitGraphics.msg_type.CLB_ZOOM_OUT.ordinal()).sendToTarget();
                 // if we zoom, hide the bubble
                 Log.d(TAG, "onOptionsItemSelected -> zoom out");
                 break;
@@ -618,7 +626,8 @@ public class Navit extends Activity {
                 break;
             case 5 :
                 // toggle the normal POI layers and labels (to avoid double POIs)
-                Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+                Message msg = Message.obtain(N_NavitGraphics.callback_handler,
+                        NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
                 Bundle b = new Bundle();
                 b.putString("cmd", "toggle_layer(\"POI Symbols\");");
                 msg.setData(b);
@@ -724,7 +733,8 @@ public class Navit extends Activity {
         Toast.makeText( getApplicationContext(),getTstring(R.string.address_search_set_destination) + "\n" + address,
                 Toast.LENGTH_LONG).show(); //TRANS
 
-        Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+        Message msg = Message.obtain(N_NavitGraphics.callback_handler,
+                NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
         Bundle b = new Bundle();
         b.putFloat("lat", latitude);
         b.putFloat("lon", longitude);
@@ -749,7 +759,8 @@ public class Navit extends Activity {
                             getTstring(R.string.address_search_set_destination) + "\n" + destination.getString(("q")),
                             Toast.LENGTH_LONG).show(); //TRANS
 
-                    Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+                    Message msg = Message.obtain(N_NavitGraphics.callback_handler,
+                            NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
                     msg.setData(destination);
                     msg.sendToTarget();
                 }
@@ -768,7 +779,8 @@ public class Navit extends Activity {
                     prefs_editor.putString("filenamePath", newDir);
                     prefs_editor.apply();
 
-                    Toast.makeText(this, String.format(getTstring(R.string.map_location_changed),newDir),Toast.LENGTH_LONG).show();
+                    Toast.makeText(this, String.format(getTstring(R.string.map_location_changed),newDir),
+                            Toast.LENGTH_LONG).show();
                 } else {
                     Log.w(TAG, "select path failed");
                 }
diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index 5750ad61b..0775ca05b 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -307,8 +307,9 @@ public class NavitAddressSearchActivity extends Activity {
 
     public void finishAddressSearch() {
         if (Addresses_found.isEmpty()) {
-            Toast.makeText( getApplicationContext(),getString(R.string.address_search_not_found) + "\n" + mAddressString,
-                    Toast.LENGTH_LONG).show(); //TRANS
+            // TRANS
+            Toast.makeText( getApplicationContext(),
+                    getString(R.string.address_search_not_found) + "\n" + mAddressString, Toast.LENGTH_LONG).show();
             setResult(Activity.RESULT_CANCELED);
             finish();
         }
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index efefd8216..0202ddff1 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -150,7 +150,8 @@ public class NavitGraphics {
             super.onCreateContextMenu(menu);
 
             menu.setHeaderTitle(activity.getTstring(R.string.position_popup_title) + "..");
-            menu.add(1, 1, NONE, activity.getTstring(R.string.position_popup_drive_here)).setOnMenuItemClickListener(this);
+            menu.add(1, 1, NONE, activity.getTstring(R.string.position_popup_drive_here))
+                    .setOnMenuItemClickListener(this);
             menu.add(1, 2, NONE, activity.getTstring(R.string.cancel)).setOnMenuItemClickListener(this);
         }
 
@@ -597,8 +598,8 @@ public class NavitGraphics {
     }
 
     public enum msg_type {
-        CLB_ZOOM_IN, CLB_ZOOM_OUT, CLB_REDRAW, CLB_MOVE, CLB_BUTTON_UP, CLB_BUTTON_DOWN, CLB_SET_DESTINATION
-            , CLB_SET_DISPLAY_DESTINATION, CLB_CALL_CMD, CLB_COUNTRY_CHOOSER, CLB_LOAD_MAP, CLB_UNLOAD_MAP, CLB_DELETE_MAP
+        CLB_ZOOM_IN, CLB_ZOOM_OUT, CLB_REDRAW, CLB_MOVE, CLB_BUTTON_UP, CLB_BUTTON_DOWN, CLB_SET_DESTINATION,
+        CLB_SET_DISPLAY_DESTINATION, CLB_CALL_CMD, CLB_COUNTRY_CHOOSER, CLB_LOAD_MAP, CLB_UNLOAD_MAP, CLB_DELETE_MAP
     }
 
     static private final msg_type[] msg_values = msg_type.values();
@@ -634,7 +635,8 @@ public class NavitGraphics {
                     ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
                     break;
                 case CLB_BUTTON_DOWN:
-                    ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // down
+                    // down
+                    ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y"));
                     break;
                 case CLB_COUNTRY_CHOOSER:
                     break;
@@ -715,11 +717,12 @@ public class NavitGraphics {
         /*
          * Determine where the navigation bar would be displayed.
          * Logic is taken from AOSP RenderSessionImpl.findNavigationBar()
-         * (platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java)
+         * platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
          */
         final Boolean isLandscape = (navit.getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_LANDSCAPE);
-        final Boolean isNavAtBottom = (!isLandscape) || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600);
+        final Boolean isNavAtBottom = (!isLandscape)
+                || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600);
         Log.d(TAG, String.format("isNavAtBottom=%b (Configuration.smallestScreenWidthDp=%d, isLandscape=%b)",
                     isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
 
@@ -727,7 +730,8 @@ public class NavitGraphics {
         int top = isStatusShowing ? Navit.status_bar_height : 0;
         int right = (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0;
         final int bottom = (!(isNavShowing
-                    && isNavAtBottom)) ? 0 : isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height;
+                    && isNavAtBottom)) ? 0 : (
+                    isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height);
 
         /* hide tint bars during update to prevent ugly effects */
         statusTintView.setVisibility(View.GONE);
@@ -741,7 +745,8 @@ public class NavitGraphics {
                         Navit.status_bar_height, Gravity.TOP);
 
                 /* Prevent tint views from overlapping when navigation is on the right */
-                statusLayoutParams.setMargins(0, 0, (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0, 0);
+                statusLayoutParams.setMargins(0, 0,
+                        (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0, 0);
                 statusTintView.setLayoutParams(statusLayoutParams);
                 Log.d(TAG, String.format("statusTintView: width=%d height=%d",
                             statusTintView.getWidth(), statusTintView.getHeight()));
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 2c2c5d891..10487d45a 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -77,14 +77,16 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.madagascar), "42.25", "-26.63", "51.20",
                 "-11.31", 145210721L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.namibia) + "+" + Navit.getInstance().getTstring(R.string.botswana),
+                Navit.getInstance().getTstring(R.string.namibia) + "+"
+                + Navit.getInstance().getTstring(R.string.botswana),
                 "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.reunion), "55.2", "-21.4", "55.9", "-20.9",
                 126008774L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.rwanda), "28.8", "-2.9", "30.9", "-1.0",
                 128267595L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.south_africa) + "+" + Navit.getInstance().getTstring(R.string.lesotho),
+                Navit.getInstance().getTstring(R.string.south_africa) + "+"
+                + Navit.getInstance().getTstring(R.string.lesotho),
                 "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.tanzania), "29.19",
                 "-11.87", "40.74", "-0.88", 253621029L, 1),
@@ -99,7 +101,8 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.cyprus), "32.0", "34.5", "34.9", "35.8",
                 118472448L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.india) + "+" + Navit.getInstance().getTstring(R.string.nepal), "67.9",
+                Navit.getInstance().getTstring(R.string.india) + "+"
+                + Navit.getInstance().getTstring(R.string.nepal), "67.9",
                 "5.5", "89.6", "36.0", 601877877L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.indonesia), "93.7", "-17.3", "155.5", "7.6",
                 420741405L, 1),
@@ -110,14 +113,16 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.israel), "33.99", "29.8", "35.95", "33.4",
                 155685778L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.japan) + "+" + Navit.getInstance().getTstring(R.string.korea), "123.6",
+                Navit.getInstance().getTstring(R.string.japan) + "+"
+                + Navit.getInstance().getTstring(R.string.korea), "123.6",
                 "25.2", "151.3", "47.1", 1029080156L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.kazakhstan), "46.44", "40.89", "87.36",
                 "55.45", 407633007L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.kyrgyzsyan), "69.23", "39.13", "80.33",
                 "43.29", 147997835L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.malaysia) + "+" + Navit.getInstance().getTstring(R.string.singapore),
+                Navit.getInstance().getTstring(R.string.malaysia) + "+"
+                + Navit.getInstance().getTstring(R.string.singapore),
                 "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.mongolia), "87.5", "41.4", "120.3", "52.7",
                 153534851L, 1),
@@ -138,7 +143,8 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.uae_other), "51.5", "22.6", "56.7", "26.5",
                 128934674L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.australia) + "+" + Navit.getInstance().getTstring(R.string.oceania),
+                Navit.getInstance().getTstring(R.string.australia) + "+"
+                + Navit.getInstance().getTstring(R.string.oceania),
                 "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),
         new osm_map_values(Navit.getInstance().getTstring(R.string.australia), "110.5", "-44.2", "154.9",
                 "-9.2", 348652900L, 0),
@@ -271,7 +277,8 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.italy), "6.52", "36.38", "18.96", "47.19",
                 1610171395L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.spain) + "+" + Navit.getInstance().getTstring(R.string.portugal),
+                Navit.getInstance().getTstring(R.string.spain) + "+"
+                + Navit.getInstance().getTstring(R.string.portugal),
                 "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.mallorca), "2.2", "38.8", "4.7", "40.2",
                 137200636L, 2),
@@ -437,7 +444,8 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.argentina), "-73.9", "-57.3", "-51.6",
                 "-21.0", 376857648L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.argentina) + "+" + Navit.getInstance().getTstring(R.string.chile),
+                Navit.getInstance().getTstring(R.string.argentina) + "+"
+                + Navit.getInstance().getTstring(R.string.chile),
                 "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.bolivia), "-70.5", "-23.1", "-57.3", "-9.3",
                 175937824L, 1),
@@ -452,10 +460,13 @@ public class NavitMapDownloader extends Thread {
         new osm_map_values(Navit.getInstance().getTstring(R.string.ecuador), "-82.6", "-5.4", "-74.4", "2.3",
                 158857591L, 1),
         new osm_map_values(
-                Navit.getInstance().getTstring(R.string.guyana) + "+" + Navit.getInstance().getTstring(R.string.suriname) + "+"
+                Navit.getInstance().getTstring(R.string.guyana) + "+"
+                + Navit.getInstance().getTstring(R.string.suriname) + "+"
                 + Navit.getInstance().getTstring(R.string.guyane_francaise), "-62.0", "1.0", "-51.2",
                 "8.9", 123000072L, 1),
-        new osm_map_values(Navit.getInstance().getTstring(R.string.haiti) + "+" + Navit.getInstance().getTstring(R.string.dominican_republic), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.haiti) + "+"
+                + Navit.getInstance().getTstring(R.string.dominican_republic), "-74.8", "17.3", "-68.2", "20.1",
+                149925689L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.jamaica), "-78.6", "17.4", "-75.9", "18.9",
                 113961998L, 1),
         new osm_map_values(Navit.getInstance().getTstring(R.string.mexico), "-117.6", "14.1", "-86.4", "32.8",
@@ -852,7 +863,8 @@ public class NavitMapDownloader extends Thread {
             String info = String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s",
                         Navit.getInstance().getTstring(R.string.map_downloading)
                         , map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,
-                        per_second_overall / 1024f, Navit.getInstance().getTstring(R.string.map_download_eta), eta_string);
+                        per_second_overall / 1024f, Navit.getInstance().getTstring(R.string.map_download_eta),
+                        eta_string);
 
             if (retry_counter > 0) {
                 info += "\n Retry " + retry_counter + "/" + MAX_RETRIES;
diff --git a/navit/android/src/org/navitproject/navit/NavitSensors.java b/navit/android/src/org/navitproject/navit/NavitSensors.java
index 319157879..ad94bdfbe 100644
--- a/navit/android/src/org/navitproject/navit/NavitSensors.java
+++ b/navit/android/src/org/navitproject/navit/NavitSensors.java
@@ -33,9 +33,11 @@ public class NavitSensors implements SensorEventListener {
 
     NavitSensors(Context context, int cbid) {
         mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+        mSensorManager.registerListener((SensorEventListener)this,
+                mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
                                         SensorManager.SENSOR_DELAY_NORMAL);
-        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
+        mSensorManager.registerListener((SensorEventListener)this,
+                mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
                                         SensorManager.SENSOR_DELAY_NORMAL);
         callbackid = cbid;
     }
@@ -44,7 +46,8 @@ public class NavitSensors implements SensorEventListener {
     }
 
     public void onSensorChanged(SensorEvent sev) {
-        // Log.e("NavitSensor","Type:" + sev.sensor.getType() + " X:" + sev.values[0] + " Y:"+sev.values[1]+" Z:"+sev.values[2]);
+        // Log.e("NavitSensor","Type:" + sev.sensor.getType() + " X:" + sev.values[0] + " Y:"+sev.values[1]+" Z:"
+        // +sev.values[2]);
         SensorCallback(callbackid, sev.sensor.getType(), sev.values[0], sev.values[1], sev.values[2]);
     }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java
index 3393a55fd..44f87acb7 100644
--- a/navit/android/src/org/navitproject/navit/NavitVehicle.java
+++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java
@@ -122,9 +122,9 @@ public class NavitVehicle {
      * @brief Creates a new {@code NavitVehicle}
      *
      * @param context
-     * @param pcbid The address of the position callback function which will be called when a location update is received
-     * @param scbid The address of the status callback function which will be called when a status update is received
-     * @param fcbid The address of the fix callback function which will be called when a
+     * @param pcbid The address of the position callback function called when a location update is received
+     * @param scbid The address of the status callback function called when a status update is received
+     * @param fcbid The address of the fix callback function called when a
      * {@code android.location.GPS_FIX_CHANGE} is received, indicating a change in GPS fix status
      */
     NavitVehicle (Context context, int pcbid, int scbid, int fcbid) {
diff --git a/navit/android/src/org/navitproject/navit/NavitWatch.java b/navit/android/src/org/navitproject/navit/NavitWatch.java
index 7dff8222a..5f13c83a3 100644
--- a/navit/android/src/org/navitproject/navit/NavitWatch.java
+++ b/navit/android/src/org/navitproject/navit/NavitWatch.java
@@ -45,7 +45,8 @@ public class NavitWatch implements Runnable {
     public native void WatchCallback(int id);
 
     NavitWatch(int func, int fd, int cond, int callbackid) {
-        // Log.e("NavitWatch","Creating new thread for "+fd+" "+cond+" from current thread " + java.lang.Thread.currentThread().getName());
+        // Log.e("NavitWatch","Creating new thread for "+fd+" "+cond+" from current thread "
+        // + java.lang.Thread.currentThread().getName());
         watch_func = func;
         watch_fd = fd;
         watch_cond = cond;
@@ -62,7 +63,8 @@ public class NavitWatch implements Runnable {
 
     public void run() {
         for (;;) {
-            // Log.e("NavitWatch","Polling "+watch_fd+" "+watch_cond + " from " + java.lang.Thread.currentThread().getName());
+            // 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) {