refactor-cleanup

2 files changed, 44 insertions, 43 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index f689f034e..03ae13185 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -117,7 +117,7 @@ public class Navit extends Activity {
     }
 
 
-    public void removeFileIfExists(String source) {
+    void removeFileIfExists(String source) {
         File file = new File(source);
 
         if (!file.exists()) {
@@ -127,7 +127,7 @@ public class Navit extends Activity {
         file.delete();
     }
 
-    public void copyFileIfExists(String source, String destination) throws IOException {
+    void copyFileIfExists(String source, String destination) throws IOException {
         File file = new File(source);
 
         if (!file.exists()) {
@@ -237,13 +237,13 @@ 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();
@@ -308,10 +308,10 @@ public class Navit extends Activity {
                         + "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,
+        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)");
+            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);
         }
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 4ad386159..4f997b51a 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -97,9 +97,9 @@ public class NavitGraphics {
     }
 
     private Rect get_rect() {
-        Rect ret=new Rect();
-        ret.left=pos_x;
-        ret.top=pos_y;
+        Rect ret = new Rect();
+        ret.left = pos_x;
+        ret.top = pos_y;
         if (pos_wraparound != 0) {
             if (ret.left < 0) {
                 ret.left += parent_graphics.bitmap_w;
@@ -122,8 +122,8 @@ public class NavitGraphics {
     }
 
     private class NavitView extends View implements Runnable, MenuItem.OnMenuItemClickListener {
-        int               touch_mode = NONE;
-        float             oldDist    = 0;
+        int mTouchMode = NONE;
+        float mOldDist = 0;
         static final int  NONE       = 0;
         static final int  DRAG       = 1;
         static final int  ZOOM       = 2;
@@ -148,7 +148,7 @@ public class NavitGraphics {
         protected void onCreateContextMenu(ContextMenu menu) {
             super.onCreateContextMenu(menu);
 
-            menu.setHeaderTitle(activity.getTstring(R.string.position_popup_title)+"..");
+            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, 2, NONE, activity.getTstring(R.string.cancel)).setOnMenuItemClickListener(this);
@@ -156,12 +156,14 @@ public class NavitGraphics {
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
-            switch(item.getItemId()) {
-            case 1:
-                Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal()
-                                             , (int)mPressedPosition.x, (int)mPressedPosition.y);
-                msg.sendToTarget();
-                break;
+            switch (item.getItemId()) {
+                case 1:
+                    Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal()
+                                                 , (int)mPressedPosition.x, (int)mPressedPosition.y);
+                    msg.sendToTarget();
+                    break;
+                default:
+                    break;
             }
             return false;
         }
@@ -196,8 +198,7 @@ public class NavitGraphics {
         protected void onSizeChanged(int w, int h, int oldw, int oldh) {
             Log.d(TAG, "onSizeChanged pixels x=" + w + " pixels y=" + h);
             Log.d(TAG, "onSizeChanged density=" + Navit.metrics.density);
-            Log.d(TAG, "onSizeChanged scaledDensity="
-                  + Navit.metrics.scaledDensity);
+            Log.d(TAG, "onSizeChanged scaledDensity=" + Navit.metrics.scaledDensity);
             super.onSizeChanged(w, h, oldw, oldh);
 
             handleResize(w, h);
@@ -210,18 +211,18 @@ public class NavitGraphics {
         }
 
         private int getActionField(String fieldname, Object obj) {
-            int ret_value = -999;
+            int retValue = -999;
             try {
                 java.lang.reflect.Field field = android.view.MotionEvent.class.getField(fieldname);
                 try {
-                    ret_value = field.getInt(obj);
+                    retValue = field.getInt(obj);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
             } catch (NoSuchFieldException ex) {
                 ex.printStackTrace();
             }
-            return ret_value;
+            return retValue;
         }
 
         @SuppressLint("ClickableViewAccessibility")
@@ -241,14 +242,14 @@ public class NavitGraphics {
             }
 
             if (switch_value == MotionEvent.ACTION_DOWN) {
-                touch_mode = PRESSED;
+                mTouchMode = PRESSED;
                 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_)) {
                 Log.d(TAG, "ACTION_UP");
 
-                switch (touch_mode) {
+                switch (mTouchMode) {
                 case DRAG:
                     Log.d(TAG, "onTouch move");
 
@@ -260,7 +261,7 @@ public class NavitGraphics {
                     float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
                     float scale = 0;
                     if (newDist > 10f) {
-                        scale = newDist / oldDist;
+                        scale = newDist / mOldDist;
                     }
 
                     if (scale > 1.3) {
@@ -277,22 +278,22 @@ public class NavitGraphics {
 
                     break;
                 }
-                touch_mode = NONE;
+                mTouchMode = NONE;
             } else if (switch_value == MotionEvent.ACTION_MOVE) {
-                switch (touch_mode) {
+                switch (mTouchMode) {
                 case DRAG:
                     MotionCallback(MotionCallbackID, x, y);
                     break;
                 case ZOOM:
                     float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                    float scale = newDist / oldDist;
+                    float scale = newDist / mOldDist;
                     Log.d(TAG, "New scale = " + scale);
                     if (scale > 1.2) {
                         // zoom in
                         CallbackMessageChannel(1, "");
-                        oldDist = newDist;
+                        mOldDist = newDist;
                     } else if (scale < 0.8) {
-                        oldDist = newDist;
+                        mOldDist = newDist;
                         // zoom out
                         CallbackMessageChannel(2, "");
                     }
@@ -301,14 +302,14 @@ public class NavitGraphics {
                     Log.d(TAG, "Start drag mode");
                     if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
                         ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                        touch_mode = DRAG;
+                        mTouchMode = DRAG;
                     }
                     break;
                 }
             } else if (switch_value == _ACTION_POINTER_DOWN_) {
-                oldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                if (oldDist > 2f) {
-                    touch_mode = ZOOM;
+                mOldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                if (mOldDist > 2f) {
+                    mTouchMode = ZOOM;
                 }
             }
             return true;
@@ -531,9 +532,9 @@ public class NavitGraphics {
         }
 
         public void run() {
-            if (in_map && touch_mode == PRESSED) {
+            if (in_map && mTouchMode == PRESSED) {
                 do_longpress_action();
-                touch_mode = NONE;
+                mTouchMode = NONE;
             }
         }