1 files changed, 15 insertions, 50 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java
index bff9f9f345a1..cdacc317ee13 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java
@@ -1,52 +1,17 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Android code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Kartikaya Gupta <kgupta@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.gfx;
 
 import android.graphics.Point;
 import android.graphics.PointF;
-import android.util.FloatMath;
 
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
 import org.mozilla.gecko.util.FloatUtils;
 
-import java.lang.Math;
-
 public final class PointUtils {
     public static PointF add(PointF one, PointF two) {
         return new PointF(one.x + two.x, one.y + two.y);
@@ -64,19 +29,19 @@ public final class PointUtils {
         return new Point(Math.round(point.x), Math.round(point.y));
     }
 
-   /* Returns a new point that is a linear interpolation between start and end points. weight conrols the weighting
-    * of each of the original points (weight = 1 returns endPoint, weight = 0 returns startPoint)
-    */
-   public static PointF interpolate(PointF startPoint, PointF endPoint, float weight) {
-       float x = FloatUtils.interpolate(startPoint.x, endPoint.x, weight);
-       float y = FloatUtils.interpolate(startPoint.y, endPoint.y, weight);
-       return new PointF(x, y);
-   }
+    /* Returns a new point that is a linear interpolation between start and end points. weight conrols the weighting
+     * of each of the original points (weight = 1 returns endPoint, weight = 0 returns startPoint)
+     */
+    public static PointF interpolate(PointF startPoint, PointF endPoint, float weight) {
+        float x = FloatUtils.interpolate(startPoint.x, endPoint.x, weight);
+        float y = FloatUtils.interpolate(startPoint.y, endPoint.y, weight);
+        return new PointF(x, y);
+    }
 
-   /* Computes the magnitude of the given vector. */
-   public static float distance(PointF point) {
+    /* Computes the magnitude of the given vector. */
+    public static float distance(PointF point) {
         return (float)Math.sqrt(point.x * point.x + point.y * point.y);
-   }
+    }
 
     /** Computes the scalar distance between two points. */
     public static float distance(PointF one, PointF two) {