1 files changed, 130 insertions, 130 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
index 2430f3f920..bc7dda6159 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
@@ -7,19 +7,19 @@ import android.view.MotionEvent;
 /**
  * @author Almer Thie (code.almeros.com) Copyright (c) 2013, Almer Thie
  *         (code.almeros.com)
- * 
+ *         <p>
  *         All rights reserved.
- * 
+ *         <p>
  *         Redistribution and use in source and binary forms, with or without
  *         modification, are permitted provided that the following conditions
  *         are met:
- * 
+ *         <p>
  *         Redistributions of source code must retain the above copyright
  *         notice, this list of conditions and the following disclaimer.
  *         Redistributions in binary form must reproduce the above copyright
  *         notice, this list of conditions and the following disclaimer in the
  *         documentation and/or other materials provided with the distribution.
- * 
+ *         <p>
  *         THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *         "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *         LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,151 +35,151 @@ import android.view.MotionEvent;
  */
 public class MoveGestureDetector extends BaseGestureDetector {
 
-    /**
-     * Listener which must be implemented which is used by MoveGestureDetector
-     * to perform callbacks to any implementing class which is registered to a
-     * MoveGestureDetector via the constructor.
-     * 
-     * @see MoveGestureDetector.SimpleOnMoveGestureListener
-     */
-    public interface OnMoveGestureListener {
-        public boolean onMove(MoveGestureDetector detector);
-
-        public boolean onMoveBegin(MoveGestureDetector detector);
-
-        public void onMoveEnd(MoveGestureDetector detector);
+  /**
+   * Listener which must be implemented which is used by MoveGestureDetector
+   * to perform callbacks to any implementing class which is registered to a
+   * MoveGestureDetector via the constructor.
+   *
+   * @see MoveGestureDetector.SimpleOnMoveGestureListener
+   */
+  public interface OnMoveGestureListener {
+    public boolean onMove(MoveGestureDetector detector);
+
+    public boolean onMoveBegin(MoveGestureDetector detector);
+
+    public void onMoveEnd(MoveGestureDetector detector);
+  }
+
+  /**
+   * Helper class which may be extended and where the methods may be
+   * implemented. This way it is not necessary to implement all methods of
+   * OnMoveGestureListener.
+   */
+  public static class SimpleOnMoveGestureListener implements
+    OnMoveGestureListener {
+    public boolean onMove(MoveGestureDetector detector) {
+      return false;
     }
 
-    /**
-     * Helper class which may be extended and where the methods may be
-     * implemented. This way it is not necessary to implement all methods of
-     * OnMoveGestureListener.
-     */
-    public static class SimpleOnMoveGestureListener implements
-            OnMoveGestureListener {
-        public boolean onMove(MoveGestureDetector detector) {
-            return false;
-        }
-
-        public boolean onMoveBegin(MoveGestureDetector detector) {
-            return true;
-        }
+    public boolean onMoveBegin(MoveGestureDetector detector) {
+      return true;
+    }
 
-        public void onMoveEnd(MoveGestureDetector detector) {
-            // Do nothing, overridden implementation may be used
-        }
+    public void onMoveEnd(MoveGestureDetector detector) {
+      // Do nothing, overridden implementation may be used
     }
+  }
 
-    private static final PointF FOCUS_DELTA_ZERO = new PointF();
+  private static final PointF FOCUS_DELTA_ZERO = new PointF();
 
-    private final OnMoveGestureListener mListener;
+  private final OnMoveGestureListener listener;
 
-    private PointF mFocusExternal = new PointF();
-    private PointF mFocusDeltaExternal = new PointF();
+  private PointF focusExternal = new PointF();
+  private PointF focusDeltaExternal = new PointF();
 
-    public MoveGestureDetector(Context context, OnMoveGestureListener listener) {
-        super(context);
-        mListener = listener;
-    }
+  public MoveGestureDetector(Context context, OnMoveGestureListener listener) {
+    super(context);
+    this.listener = listener;
+  }
 
-    @Override
-    protected void handleStartProgressEvent(int actionCode, MotionEvent event) {
-        switch (actionCode) {
-        case MotionEvent.ACTION_DOWN:
-            resetState(); // In case we missed an UP/CANCEL event
+  @Override
+  protected void handleStartProgressEvent(int actionCode, MotionEvent event) {
+    switch (actionCode) {
+      case MotionEvent.ACTION_DOWN:
+        resetState(); // In case we missed an UP/CANCEL event
 
-            mPrevEvent = MotionEvent.obtain(event);
-            mTimeDelta = 0;
+        prevEvent = MotionEvent.obtain(event);
+        timeDelta = 0;
 
-            updateStateByEvent(event);
-            break;
+        updateStateByEvent(event);
+        break;
 
-        case MotionEvent.ACTION_MOVE:
-            mGestureInProgress = mListener.onMoveBegin(this);
-            break;
-        }
+      case MotionEvent.ACTION_MOVE:
+        gestureInProgress = listener.onMoveBegin(this);
+        break;
     }
-
-    @Override
-    protected void handleInProgressEvent(int actionCode, MotionEvent event) {
-        switch (actionCode) {
-        case MotionEvent.ACTION_UP:
-        case MotionEvent.ACTION_CANCEL:
-            mListener.onMoveEnd(this);
-            resetState();
-            break;
-
-        case MotionEvent.ACTION_MOVE:
-            updateStateByEvent(event);
-
-            // Only accept the event if our relative pressure is within
-            // a certain limit. This can help filter shaky data as a
-            // finger is lifted.
-            if (mCurrPressure / mPrevPressure > PRESSURE_THRESHOLD) {
-                final boolean updatePrevious = mListener.onMove(this);
-                if (updatePrevious) {
-                    mPrevEvent.recycle();
-                    mPrevEvent = MotionEvent.obtain(event);
-                }
-            }
-            break;
+  }
+
+  @Override
+  protected void handleInProgressEvent(int actionCode, MotionEvent event) {
+    switch (actionCode) {
+      case MotionEvent.ACTION_UP:
+      case MotionEvent.ACTION_CANCEL:
+        listener.onMoveEnd(this);
+        resetState();
+        break;
+
+      case MotionEvent.ACTION_MOVE:
+        updateStateByEvent(event);
+
+        // Only accept the event if our relative pressure is within
+        // a certain limit. This can help filter shaky data as a
+        // finger is lifted.
+        if (currPressure / prevPressure > PRESSURE_THRESHOLD) {
+          final boolean updatePrevious = listener.onMove(this);
+          if (updatePrevious) {
+            prevEvent.recycle();
+            prevEvent = MotionEvent.obtain(event);
+          }
         }
+        break;
     }
-
-    protected void updateStateByEvent(MotionEvent curr) {
-        super.updateStateByEvent(curr);
-
-        final MotionEvent prev = mPrevEvent;
-
-        // Focus intenal
-        PointF mCurrFocusInternal = determineFocalPoint(curr);
-        PointF mPrevFocusInternal = determineFocalPoint(prev);
-
-        // Focus external
-        // - Prevent skipping of focus delta when a finger is added or removed
-        boolean mSkipNextMoveEvent = prev.getPointerCount() != curr
-                .getPointerCount();
-        mFocusDeltaExternal = mSkipNextMoveEvent ? FOCUS_DELTA_ZERO
-                : new PointF(mCurrFocusInternal.x - mPrevFocusInternal.x,
-                        mCurrFocusInternal.y - mPrevFocusInternal.y);
-
-        // - Don't directly use mFocusInternal (or skipping will occur). Add
-        // unskipped delta values to mFocusExternal instead.
-        mFocusExternal.x += mFocusDeltaExternal.x;
-        mFocusExternal.y += mFocusDeltaExternal.y;
+  }
+
+  protected void updateStateByEvent(MotionEvent curr) {
+    super.updateStateByEvent(curr);
+
+    final MotionEvent prev = prevEvent;
+
+    // Focus intenal
+    PointF currFocusInternal = determineFocalPoint(curr);
+    PointF prevFocusInternal = determineFocalPoint(prev);
+
+    // Focus external
+    // - Prevent skipping of focus delta when a finger is added or removed
+    boolean skipNextMoveEvent = prev.getPointerCount() != curr
+      .getPointerCount();
+    focusDeltaExternal = skipNextMoveEvent ? FOCUS_DELTA_ZERO
+      : new PointF(currFocusInternal.x - prevFocusInternal.x,
+      currFocusInternal.y - prevFocusInternal.y);
+
+    // - Don't directly use mFocusInternal (or skipping will occur). Add
+    // unskipped delta values to focusExternal instead.
+    focusExternal.x += focusDeltaExternal.x;
+    focusExternal.y += focusDeltaExternal.y;
+  }
+
+  /**
+   * Determine (multi)finger focal point (a.k.a. center point between all
+   * fingers)
+   *
+   * @param motionEvent a {@link MotionEvent} object.
+   * @return PointF focal point
+   */
+  private PointF determineFocalPoint(MotionEvent motionEvent) {
+    // Number of fingers on screen
+    final int pCount = motionEvent.getPointerCount();
+    float x = 0.0f;
+    float y = 0.0f;
+
+    for (int i = 0; i < pCount; i++) {
+      x += motionEvent.getX(i);
+      y += motionEvent.getY(i);
     }
 
-    /**
-     * Determine (multi)finger focal point (a.k.a. center point between all
-     * fingers)
-     * 
-     * @param e
-     * @return PointF focal point
-     */
-    private PointF determineFocalPoint(MotionEvent e) {
-        // Number of fingers on screen
-        final int pCount = e.getPointerCount();
-        float x = 0.0f;
-        float y = 0.0f;
-
-        for (int i = 0; i < pCount; i++) {
-            x += e.getX(i);
-            y += e.getY(i);
-        }
-
-        return new PointF(x / pCount, y / pCount);
-    }
+    return new PointF(x / pCount, y / pCount);
+  }
 
-    public float getFocusX() {
-        return mFocusExternal.x;
-    }
+  public float getFocusX() {
+    return focusExternal.x;
+  }
 
-    public float getFocusY() {
-        return mFocusExternal.y;
-    }
+  public float getFocusY() {
+    return focusExternal.y;
+  }
 
-    public PointF getFocusDelta() {
-        return mFocusDeltaExternal;
-    }
+  public PointF getFocusDelta() {
+    return focusDeltaExternal;
+  }
 
 }