refactor-cleanup

1 files changed, 23 insertions, 22 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 03ae13185..6b07f9c4d 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -69,9 +69,9 @@ import java.util.regex.Pattern;
 
 public class Navit extends Activity {
 
-    private NavitDialogs               dialogs;
-    private PowerManager.WakeLock      wl;
-    private NavitActivityResult[]        ActivityResults;
+    private NavitDialogs mDialogs;
+    private PowerManager.WakeLock mWakeLock;
+    private NavitActivityResult[] mActivityResults;
     public static InputMethodManager   mgr                             = null;
     public static DisplayMetrics       metrics                         = null;
     public static int                  status_bar_height               = 0;
@@ -161,11 +161,11 @@ public class Navit extends Activity {
     /* Translates a string from its id
      * in R.strings
      *
-     * @param Rid resource identifier
+     * @param resourceId resource identifier
      * @retrun translated string
      */
-    String getTstring(int Rid) {
-        return getLocalizedString(getString(Rid));
+    String getTstring(int resourceId) {
+        return getLocalizedString(getString(resourceId));
     }
 
     private boolean extractRes(String resname, String result) {
@@ -238,13 +238,14 @@ 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) {
+                    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 editSettings = settings.edit();
@@ -264,7 +265,7 @@ public class Navit extends Activity {
         }
 
         navit = this;
-        dialogs = new NavitDialogs(this);
+        mDialogs = new NavitDialogs(this);
 
         NavitResources = getResources();
 
@@ -357,10 +358,10 @@ public class Navit extends Activity {
         Log.d(TAG, "Navit -> density=" + Navit.metrics.density);
         Log.d(TAG, "Navit -> scaledDensity=" + Navit.metrics.scaledDensity);
 
-        ActivityResults = new NavitActivityResult[16];
+        mActivityResults = new NavitActivityResult[16];
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,"NavitDoNotDimScreen");
+        mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,"NavitDoNotDimScreen");
 
         if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo")) {
             Log.e(TAG, "Failed to extract language resource " + langc);
@@ -525,13 +526,13 @@ public class Navit extends Activity {
                     }
                 }
             } else {
-                start_targetsearch_from_intent(geoString);
+                startTargetsearchFromIntent(geoString);
             }
         }
     }
 
     public void setActivityResult(int requestCode, NavitActivityResult activityResult) {
-        ActivityResults[requestCode] = activityResult;
+        mActivityResults[requestCode] = activityResult;
     }
 
 
@@ -580,7 +581,7 @@ public class Navit extends Activity {
     }
 
 
-    public void start_targetsearch_from_intent(String target_address) {
+    private void startTargetsearchFromIntent(String target_address) {
         if (target_address == null || target_address.equals("")) {
             // empty search string entered
             Toast.makeText(getApplicationContext(), getTstring(R.string.address_search_not_found),
@@ -679,7 +680,7 @@ public class Navit extends Activity {
     /**
      * @brief Shows the native keyboard or other input method.
      */
-    int showNativeKeyboard() {
+    private int showNativeKeyboard() {
         /*
          * Apologies for the huge mess that this function is, but Android's soft input API is a big
          * nightmare. Its devs have mercifully given us an option to show or hide the keyboard, but
@@ -720,7 +721,7 @@ public class Navit extends Activity {
     /**
      * @brief Hides the native keyboard or other input method.
      */
-    void hideNativeKeyboard() {
+    private void hideNativeKeyboard() {
         mgr.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
         show_soft_keyboard_now_showing = false;
     }
@@ -744,7 +745,7 @@ public class Navit extends Activity {
         switch (requestCode) {
             case Navit.NavitDownloaderSelectMap_id :
                 if (resultCode == Activity.RESULT_OK) {
-                    Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD,
+                    Message msg = mDialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD,
                             data.getIntExtra("map_index", -1), 0);
                     msg.sendToTarget();
                 }
@@ -781,19 +782,19 @@ public class Navit extends Activity {
                 }
                 break;
             default :
-                ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
+                mActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
                 break;
         }
     }
 
     @Override
     protected void onPrepareDialog(int id, Dialog dialog) {
-        dialogs.prepareDialog(id);
+        mDialogs.prepareDialog(id);
         super.onPrepareDialog(id, dialog);
     }
 
     protected Dialog onCreateDialog(int id) {
-        return dialogs.createDialog(id);
+        return mDialogs.createDialog(id);
     }
 
     @Override
@@ -850,8 +851,8 @@ public class Navit extends Activity {
     }
 
     public void disableSuspend() {
-        wl.acquire();
-        wl.release();
+        mWakeLock.acquire();
+        mWakeLock.release();
     }
 
     private void exit() {