refactor-cleanup

1 files changed, 60 insertions, 55 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index ec9368061..79af20b3a 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -112,10 +112,10 @@ public class NavitGraphics {
         ret.bottom = ret.top+bitmap_h;
         if (pos_wraparound != 0) {
             if (bitmap_w < 0) {
-                ret.right = ret.left+bitmap_w+parent_graphics.bitmap_w;
+                ret.right = ret.left + bitmap_w+parent_graphics.bitmap_w;
             }
             if (bitmap_h < 0) {
-                ret.bottom = ret.top+bitmap_h+parent_graphics.bitmap_h;
+                ret.bottom = ret.top + bitmap_h+parent_graphics.bitmap_h;
             }
         }
         return ret;
@@ -158,8 +158,8 @@ public class NavitGraphics {
         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);
+                    Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal(),
+                            (int)mPressedPosition.x, (int)mPressedPosition.y);
                     msg.sendToTarget();
                     break;
                 default:
@@ -243,69 +243,74 @@ public class NavitGraphics {
 
             if (switch_value == MotionEvent.ACTION_DOWN) {
                 mTouchMode = PRESSED;
-                if (!in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                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 (mTouchMode) {
-                case DRAG:
-                    Log.d(TAG, "onTouch move");
-
-                    MotionCallback(MotionCallbackID, x, y);
-                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
-
-                    break;
-                case ZOOM:
-                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                    float scale = 0;
-                    if (newDist > 10f) {
-                        scale = newDist / mOldDist;
-                    }
-
-                    if (scale > 1.3) {
-                        // zoom in
-                        CallbackMessageChannel(1, null);
-                    } else if (scale < 0.8) {
-                        // zoom out
-                        CallbackMessageChannel(2, null);
-                    }
-                    break;
-                case PRESSED:
-                    if (in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+                    case DRAG:
+                        Log.d(TAG, "onTouch move");
+
+                        MotionCallback(MotionCallbackID, x, y);
+                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+
+                        break;
+                    case ZOOM:
+                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                        float scale = 0;
+                        if (newDist > 10f) {
+                            scale = newDist / mOldDist;
+                        }
 
-                    break;
+                        if (scale > 1.3) {
+                            // zoom in
+                            CallbackMessageChannel(1, null);
+                        } else if (scale < 0.8) {
+                            // zoom out
+                            CallbackMessageChannel(2, null);
+                        }
+                        break;
+                    case PRESSED:
+                        if (in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+                        break;
+                    default:
+                        break;
                 }
                 mTouchMode = NONE;
             } else if (switch_value == MotionEvent.ACTION_MOVE) {
                 switch (mTouchMode) {
-                case DRAG:
-                    MotionCallback(MotionCallbackID, x, y);
-                    break;
-                case ZOOM:
-                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                    float scale = newDist / mOldDist;
-                    Log.d(TAG, "New scale = " + scale);
-                    if (scale > 1.2) {
-                        // zoom in
-                        CallbackMessageChannel(1, "");
-                        mOldDist = newDist;
-                    } else if (scale < 0.8) {
-                        mOldDist = newDist;
-                        // zoom out
-                        CallbackMessageChannel(2, "");
-                    }
-                    break;
-                case PRESSED:
-                    Log.d(TAG, "Start drag mode");
-                    if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
-                        ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                        mTouchMode = DRAG;
+                    case DRAG:
+                        MotionCallback(MotionCallbackID, x, y);
+                        break;
+                    case ZOOM:
+                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                        float scale = newDist / mOldDist;
+                        Log.d(TAG, "New scale = " + scale);
+                        if (scale > 1.2) {
+                            // zoom in
+                            CallbackMessageChannel(1, "");
+                            mOldDist = newDist;
+                        } else if (scale < 0.8) {
+                            mOldDist = newDist;
+                            // zoom out
+                            CallbackMessageChannel(2, "");
+                        }
+                        break;
+                    case PRESSED:
+                        Log.d(TAG, "Start drag mode");
+                        if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
+                            ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                            mTouchMode = DRAG;
+                        }
+                        break;
+                    default:
+                        break;
                     }
-                    break;
-                }
             } else if (switch_value == _ACTION_POINTER_DOWN_) {
                 mOldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
                 if (mOldDist > 2f) {