Automatic refactoring to encapsulate fields of R2Vector.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=25130844

Author: hagbard

src/com/google/common/geometry/R2Vector.java

@@ -22,8 +22,8 @@
  *
  */
 public final strictfp class R2Vector {
-  final double x;
-  final double y;
+  private final double x;
+  private final double y;
 
   public R2Vector() {
     this(0, 0);
@@ -42,6 +42,14 @@ public R2Vector(double[] coord) {
     y = coord[1];
   }
 
+  public double x() {
+    return x;
+  }
+
+  public double y() {
+    return y;
+  }
+
   public double get(int index) {
     if (index > 1) {
       throw new ArrayIndexOutOfBoundsException(index);

src/com/google/common/geometry/S2Cell.java

@@ -368,8 +368,8 @@ public boolean contains(S2Point p) {
     if (uvPoint == null) {
       return false;
     }
-    return (uvPoint.x >= uv[0][0] && uvPoint.x <= uv[0][1] && uvPoint.y >= uv[1][0]
-        && uvPoint.y <= uv[1][1]);
+    return (uvPoint.x() >= uv[0][0] && uvPoint.x() <= uv[0][1]
+        && uvPoint.y() >= uv[1][0] && uvPoint.y() <= uv[1][1]);
   }
 
   // The point 'p' does not need to be normalized.

src/com/google/common/geometry/S2CellId.java

@@ -148,8 +148,8 @@ public static S2CellId fromFacePosLevel(int face, long pos, int level) {
   public static S2CellId fromPoint(S2Point p) {
     int face = S2Projections.xyzToFace(p);
     R2Vector uv = S2Projections.validFaceXyzToUv(face, p);
-    int i = stToIJ(S2Projections.uvToST(uv.x));
-    int j = stToIJ(S2Projections.uvToST(uv.y));
+    int i = stToIJ(S2Projections.uvToST(uv.x()));
+    int j = stToIJ(S2Projections.uvToST(uv.y()));
     return fromFaceIJ(face, i, j);
   }
 
@@ -866,7 +866,7 @@ private static S2CellId fromFaceIJWrap(int face, int i, int j) {
     S2Point p = S2Projections.faceUvToXyz(face, s, t);
     face = S2Projections.xyzToFace(p);
     R2Vector st = S2Projections.validFaceXyzToUv(face, p);
-    return fromFaceIJ(face, stToIJ(st.x), stToIJ(st.y));
+    return fromFaceIJ(face, stToIJ(st.x()), stToIJ(st.y()));
   }
 
   /**

tests/com/google/common/geometry/S2CellIdTest.java

@@ -196,10 +196,10 @@ public void testContinuity() {
       S2Point p = id.toPointRaw();
       int face = S2Projections.xyzToFace(p);
       R2Vector uv = S2Projections.validFaceXyzToUv(face, p);
-      assertDoubleNear(
-          Math.IEEEremainder(S2Projections.uvToST(uv.x), 1.0 / (1 << MAX_WALK_LEVEL)), 0);
-      assertDoubleNear(
-          Math.IEEEremainder(S2Projections.uvToST(uv.y), 1.0 / (1 << MAX_WALK_LEVEL)), 0);
+      assertDoubleNear(Math.IEEEremainder(
+          S2Projections.uvToST(uv.x()), 1.0 / (1 << MAX_WALK_LEVEL)), 0);
+      assertDoubleNear(Math.IEEEremainder(
+          S2Projections.uvToST(uv.y()), 1.0 / (1 << MAX_WALK_LEVEL)), 0);
     }
   }