cleanup

1 files changed, 133 insertions, 127 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 34aeab857..f5c56676b 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -75,7 +75,6 @@ public class Navit extends Activity {
     public static InputMethodManager   mgr                             = null;
     public static DisplayMetrics       metrics                         = null;
     public static int                  status_bar_height               = 0;
-    private static int                 action_bar_default_height       = 0;
     public static int                  navigation_bar_height           = 0;
     public static int                  navigation_bar_height_landscape = 0;
     public static int                  navigation_bar_width            = 0;
@@ -85,11 +84,9 @@ public class Navit extends Activity {
     public static long                 time_pressed_menu_key           = 0L;
     private static Intent              startup_intent                  = null;
     private static long                startup_intent_timestamp        = 0L;
-    private static String              my_display_density              = "mdpi";
     private static final int           NavitDownloaderSelectMap_id     = 967;
     private static final int           NavitAddressSearch_id           = 70;
     private static final int           NavitSelectStorage_id           = 43;
-    private static String              NavitLanguage;
     private static Resources            NavitResources                  = null;
     private static final String        NAVIT_PACKAGE_NAME              = "org.navitproject.navit";
     private static final String        TAG                             = "Navit";
@@ -296,7 +293,7 @@ public class Navit extends Activity {
         int nhlid = resources.getIdentifier("navigation_bar_height_landscape", "dimen", "android");
         int nwid = resources.getIdentifier("navigation_bar_width", "dimen", "android");
         status_bar_height = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;
-        action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;
+        int action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;
         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;
@@ -318,15 +315,16 @@ public class Navit extends Activity {
         String langc = lang;
         Log.d(TAG, "lang=" + lang);
         int pos = lang.indexOf('_');
+        String navitLanguage;
         if (pos != -1) {
             langc = lang.substring(0, pos);
-            NavitLanguage = langc + lang.substring(pos).toUpperCase(locale);
-            Log.d(TAG, "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale));
+            navitLanguage = langc + lang.substring(pos).toUpperCase(locale);
+            Log.d(TAG, "substring lang " + navitLanguage.substring(pos).toUpperCase(locale));
         } else {
             String country = locale.getCountry();
             Log.d(TAG, "Country1 " + country);
             Log.d(TAG, "Country2 " + country.toUpperCase(locale));
-            NavitLanguage = langc + "_" + country.toUpperCase(locale);
+            navitLanguage = langc + "_" + country.toUpperCase(locale);
         }
         Log.d(TAG, "Language " + lang);
 
@@ -361,6 +359,7 @@ public class Navit extends Activity {
             Log.e(TAG, "Failed to extract language resource " + langc);
         }
 
+        String my_display_density = "mdpi";
         if (densityDpi <= 120) {
             my_display_density = "ldpi";
         } else if (densityDpi <= 160) {
@@ -384,8 +383,8 @@ public class Navit extends Activity {
         }
 
         Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));
-        NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density,
-                  NAVIT_DATA_DIR+"/bin/navit",map_filename_path);
+        navitMain(this, navitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density,
+                  NAVIT_DATA_DIR + "/bin/navit",map_filename_path);
 
         showInfos();
 
@@ -468,8 +467,8 @@ public class Navit extends Activity {
     private void parseNavigationURI(String schemeSpecificPart) {
         String[] naviData = schemeSpecificPart.split("&");
         Pattern p = Pattern.compile("(.*)=(.*)");
-        Map<String,String> params = new HashMap<String,String>();
-        for (int count=0; count < naviData.length; count++) {
+        Map<String,String> params = new HashMap<>();
+        for (int count = 0; count < naviData.length; count++) {
             Matcher m = p.matcher(naviData[count]);
 
             if (m.matches()) {
@@ -489,12 +488,14 @@ 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");
         }
 
-        if ( geoString != null) {
+        if (geoString != null) {
             if (geoString.matches("^[+-]{0,1}\\d+(|\\.\\d*),[+-]{0,1}\\d+(|\\.\\d*)$")) {
                 String[] geo = geoString.split(",");
                 if (geo.length == 2) {
@@ -503,7 +504,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();
@@ -544,8 +546,9 @@ public class Navit extends Activity {
         menu.add(1, 99, 900, getTstring(R.string.optionsmenu_exit_navit)); //TRANS
 
         /* Only show the Backup to SD-Card Option if we really have one */
-        if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
+        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
             menu.add(1, 7, 700, getTstring(R.string.optionsmenu_backup_restore)); //TRANS
+        }
 
         return true;
     }
@@ -573,9 +576,9 @@ public class Navit extends Activity {
             Toast.makeText(getApplicationContext(), getTstring(R.string.address_search_not_found),
                            Toast.LENGTH_LONG).show(); //TRANS
         } else {
-            Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
-            search_intent.putExtra("search_string", target_address);
-            this.startActivityForResult(search_intent, NavitAddressSearch_id);
+            Intent searchIntent = new Intent(this, NavitAddressSearchActivity.class);
+            searchIntent.putExtra("search_string", target_address);
+            this.startActivityForResult(searchIntent, NavitAddressSearch_id);
         }
     }
 
@@ -587,62 +590,62 @@ public class Navit extends Activity {
 
     public void runOptionsItem(int id) {
         switch (id) {
-        case 1 :
-            // zoom in
-            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();
-            // if we zoom, hide the bubble
-            Log.d(TAG, "onOptionsItemSelected -> zoom out");
-            break;
-        case 3 :
-            // map download menu
-            Intent map_download_list_activity = new Intent(this, NavitDownloadSelectMapActivity.class);
-            startActivityForResult(map_download_list_activity, Navit.NavitDownloaderSelectMap_id);
-            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());
-            Bundle b = new Bundle();
-            b.putString("cmd", "toggle_layer(\"POI Symbols\");");
-            msg.setData(b);
-            msg.sendToTarget();
-
-            msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
-            b = new Bundle();
-            b.putString("cmd", "toggle_layer(\"POI Labels\");");
-            msg.setData(b);
-            msg.sendToTarget();
-
-            // toggle full POI icons on/off
-            msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
-            b = new Bundle();
-            b.putString("cmd", "toggle_layer(\"Android-POI-Icons-full\");");
-            msg.setData(b);
-            msg.sendToTarget();
-
-            break;
-        case 6 :
-            // ok startup address search activity
-            Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
-            this.startActivityForResult(search_intent, NavitAddressSearch_id);
-            break;
-        case 7 :
-            /* Backup / Restore */
-            showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);
-            break;
-        case 10:
-            setMapLocation();
-            break;
-        case 99 :
-            // exit
-            this.onStop();
-            this.exit();
-            break;
+            case 1 :
+                // zoom in
+                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();
+                // if we zoom, hide the bubble
+                Log.d(TAG, "onOptionsItemSelected -> zoom out");
+                break;
+            case 3 :
+                // map download menu
+                Intent map_download_list_activity = new Intent(this, NavitDownloadSelectMapActivity.class);
+                startActivityForResult(map_download_list_activity, Navit.NavitDownloaderSelectMap_id);
+                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());
+                Bundle b = new Bundle();
+                b.putString("cmd", "toggle_layer(\"POI Symbols\");");
+                msg.setData(b);
+                msg.sendToTarget();
+
+                msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+                b = new Bundle();
+                b.putString("cmd", "toggle_layer(\"POI Labels\");");
+                msg.setData(b);
+                msg.sendToTarget();
+
+                // toggle full POI icons on/off
+                msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+                b = new Bundle();
+                b.putString("cmd", "toggle_layer(\"Android-POI-Icons-full\");");
+                msg.setData(b);
+                msg.sendToTarget();
+
+                break;
+            case 6 :
+                // ok startup address search activity
+                Intent searchIntent = new Intent(this, NavitAddressSearchActivity.class);
+                this.startActivityForResult(searchIntent, NavitAddressSearch_id);
+                break;
+            case 7 :
+                /* Backup / Restore */
+                showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);
+                break;
+            case 10:
+                setMapLocation();
+                break;
+            case 99 :
+                // exit
+                this.onStop();
+                this.exit();
+                break;
         }
     }
 
@@ -721,44 +724,47 @@ public class Navit extends Activity {
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-        case Navit.NavitDownloaderSelectMap_id :
-            if (resultCode == Activity.RESULT_OK) {
-                Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD
-                                                    , data.getIntExtra("map_index", -1), 0);
-                msg.sendToTarget();
-            }
-            break;
-        case NavitAddressSearch_id :
-            if (resultCode == Activity.RESULT_OK) {
-                Bundle destination = data.getExtras();
-                Toast.makeText( getApplicationContext(),
-                                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());
-                msg.setData(destination);
-                msg.sendToTarget();
-            }
-            break;
-        case NavitSelectStorage_id :
-            if(resultCode == RESULT_OK) {
-                String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter);
-                Log.d(TAG, "selected path= "+newDir);
-                if(!newDir.contains("/navit"))
-                    newDir = newDir+"/navit/";
-                else
-                    newDir = newDir+"/";
-                SharedPreferences prefs = this.getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
-                SharedPreferences.Editor  prefs_editor = prefs.edit();
-                prefs_editor.putString("filenamePath", newDir);
-                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");
-            break;
-        default :
-            ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
-            break;
+            case Navit.NavitDownloaderSelectMap_id :
+                if (resultCode == Activity.RESULT_OK) {
+                    Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD
+                            , data.getIntExtra("map_index", -1), 0);
+                    msg.sendToTarget();
+                }
+                break;
+            case NavitAddressSearch_id :
+               if (resultCode == Activity.RESULT_OK) {
+                    Bundle destination = data.getExtras();
+                    Toast.makeText( getApplicationContext(), 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());
+                    msg.setData(destination);
+                    msg.sendToTarget();
+                }
+                break;
+            case NavitSelectStorage_id :
+                if(resultCode == RESULT_OK) {
+                    String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter);
+                    Log.d(TAG, "selected path= "+newDir);
+                    if(!newDir.contains("/navit")) {
+                        newDir = newDir + "/navit/";
+                    }
+                    else {
+                        newDir = newDir + "/";
+                    }
+                    SharedPreferences prefs = this.getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
+                    SharedPreferences.Editor  prefs_editor = prefs.edit();
+                    prefs_editor.putString("filenamePath", newDir);
+                    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");
+                }
+                break;
+            default :
+                ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
+                break;
         }
     }
 
@@ -775,17 +781,16 @@ public class Navit extends Activity {
     @Override
     public boolean onSearchRequested() {
         /* Launch the internal Search Activity */
-        Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
-        this.startActivityForResult(search_intent, NavitAddressSearch_id);
+        Intent searchIntent = new Intent(this, NavitAddressSearchActivity.class);
+        this.startActivityForResult(searchIntent, NavitAddressSearch_id);
 
         return true;
     }
 
     private void setMapLocation() {
         Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class);
-        fileExploreIntent
-        .putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
-        .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
+        fileExploreIntent.putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
+                .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
         startActivityForResult(fileExploreIntent,NavitSelectStorage_id);
     }
 
@@ -796,11 +801,12 @@ public class Navit extends Activity {
         // next call will kill our app the hard way. This should not be necessary, but ensures navit is
         // properly restarted and no resources are wasted with navit in background. Remove this call after
         // code review
-        NavitDestroy();
+        navitDestroy();
     }
 
     public void fullscreen(int fullscreen) {
-        int w, h;
+        int w;
+        int h;
 
         isFullscreen = (fullscreen != 0);
         if (isFullscreen) {
@@ -811,13 +817,13 @@ public class Navit extends Activity {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
 
-        Display display_ = getWindowManager().getDefaultDisplay();
+        Display display = getWindowManager().getDefaultDisplay();
         if (Build.VERSION.SDK_INT < 17) {
-            w = display_.getWidth();
-            h = display_.getHeight();
+            w = display.getWidth();
+            h = display.getHeight();
         } else {
             Point size = new Point();
-            display_.getRealSize(size);
+            display.getRealSize(size);
             w = size.x;
             h = size.y;
         }
@@ -833,13 +839,13 @@ public class Navit extends Activity {
     private void exit() {
         nm.cancelAll();
         NavitVehicle.removeListener();
-        NavitDestroy();
+        navitDestroy();
     }
 
-    public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path,
-                                 String path2);
-    public native void NavitDestroy();
+    public native void navitMain(Navit x, String lang, int version, String display_density_string, String path,
+            String path2);
 
+    public native void navitDestroy();
 
     private String getLocalizedString(String text) {
         return NavitGraphics.CallbackLocalizedString(text);