Bug 1263056 - Add WhitespaceAfter for semi-colons & fix warnings. r=sebastian draft
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 07 Apr 2016 17:53:55 -0700
changeset 348717 106f9ce8ec75d024ccb68af95129f1ef6f08de16
parent 347827 d24f23b9b8a14ea2b9f9e55f1b8736e65b2c08fa
child 348718 fc708f6fac7b7245a1da6541c4ff44d8e231b879
push id14899
push usermichael.l.comella@gmail.com
push dateFri, 08 Apr 2016 01:24:40 +0000
reviewerssebastian
bugs1263056
milestone48.0a1
Bug 1263056 - Add WhitespaceAfter for semi-colons & fix warnings. r=sebastian MozReview-Commit-ID: FWujl1XuxgR
mobile/android/app/checkstyle.xml
mobile/android/base/java/org/mozilla/gecko/gfx/Axis.java
--- a/mobile/android/app/checkstyle.xml
+++ b/mobile/android/app/checkstyle.xml
@@ -39,11 +39,14 @@
         <property name="eachLine" value="true"/>
     </module>
 
     <module name="TreeWalker">
         <module name="NoLineWrap">
             <property name="tokens" value="IMPORT,PACKAGE_DEF"/>
         </module>
         <module name="OuterTypeFilename"/> <!-- `class Lol` only in Lol.java -->
+        <module name="WhitespaceAfter">
+            <property name="tokens" value="SEMI"/>
+        </module>
     </module>
 
 </module>
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/Axis.java
+++ b/mobile/android/base/java/org/mozilla/gecko/gfx/Axis.java
@@ -183,24 +183,24 @@ abstract class Axis {
         MINUS,      // Overscrolled in the negative direction
         PLUS,       // Overscrolled in the positive direction
         BOTH,       // Overscrolled in both directions (page is zoomed to smaller than screen)
     }
 
     private final SubdocumentScrollHelper mSubscroller;
 
     private int mOverscrollMode; /* Default to only overscrolling if we're allowed to scroll in a direction */
-    private float mFirstTouchPos;           /* Position of the first touch event on the current drag. */
-    private float mTouchPos;                /* Position of the most recent touch event on the current drag. */
-    private float mLastTouchPos;            /* Position of the touch event before touchPos. */
-    private float mVelocity;                /* Velocity in this direction; pixels per animation frame. */
-    private final float[] mRecentVelocities;/* Circular buffer of recent velocities since last touch start. */
-    private int mRecentVelocityCount;       /* Number of values put into mRecentVelocities (unbounded). */
-    private boolean mScrollingDisabled;     /* Whether movement on this axis is locked. */
-    private boolean mDisableSnap;           /* Whether overscroll snapping is disabled. */
+    private float mFirstTouchPos;            /* Position of the first touch event on the current drag. */
+    private float mTouchPos;                 /* Position of the most recent touch event on the current drag. */
+    private float mLastTouchPos;             /* Position of the touch event before touchPos. */
+    private float mVelocity;                 /* Velocity in this direction; pixels per animation frame. */
+    private final float[] mRecentVelocities; /* Circular buffer of recent velocities since last touch start. */
+    private int mRecentVelocityCount;        /* Number of values put into mRecentVelocities (unbounded). */
+    private boolean mScrollingDisabled;      /* Whether movement on this axis is locked. */
+    private boolean mDisableSnap;            /* Whether overscroll snapping is disabled. */
     private float mDisplacement;
     private long mLastFlingTime;
     private float mLastFlingVelocity;
 
     private FlingStates mFlingState = FlingStates.STOPPED; /* The fling state we're in on this axis. */
 
     protected abstract float getOrigin();
     protected abstract float getViewportLength();