commit f9901b2d274fdc2aab890c1e51e09042605b1370
author Dmitriy Ivanov <dimitry@google.com> Wed Mar 26 16:57:28 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 26 16:57:28 2014 +0000
tree 7b22a64fc78e0ff9153fd14ee3c7dd93d14b6cee
parent 8061554221b4525585d3e910e80fc45254e7134a
parent 0b294a56aa669731450110cabbf74a71c2011684

Merge "Remove redundant parameters from fullFieldsCalc"

luni/src/main/java/java/util/GregorianCalendar.java

diff --git a/luni/src/main/java/java/util/GregorianCalendar.java b/luni/src/main/java/java/util/GregorianCalendar.java
index df6d772..34cf97e 100644
--- a/luni/src/main/java/java/util/GregorianCalendar.java
+++ b/luni/src/main/java/java/util/GregorianCalendar.java
@@ -458,9 +458,9 @@
         complete();
     }
 
-    private void fullFieldsCalc(long timeVal, int zoneOffset) {
+    private void fullFieldsCalc(int zoneOffset) {
         int millis = (int) (time % 86400000);
-        long days = timeVal / 86400000;
+        long days = time / 86400000;
 
         if (millis < 0) {
             millis += 86400000;
@@ -477,9 +477,9 @@
             days++;
         }
 
-        int dayOfYear = computeYearAndDay(days, timeVal + zoneOffset);
+        int dayOfYear = computeYearAndDay(days, time + zoneOffset);
         fields[DAY_OF_YEAR] = dayOfYear;
-        if(fields[YEAR] == changeYear && gregorianCutover <= timeVal + zoneOffset){
+        if(fields[YEAR] == changeYear && gregorianCutover <= time + zoneOffset){
             dayOfYear += currentYearSkew;
         }
         int month = dayOfYear / 32;
@@ -507,10 +507,10 @@
                 days++;
             }
             if (oldDays != days) {
-                dayOfYear = computeYearAndDay(days, timeVal - zoneOffset
+                dayOfYear = computeYearAndDay(days, time - zoneOffset
                         + dstOffset);
                 fields[DAY_OF_YEAR] = dayOfYear;
-                if(fields[YEAR] == changeYear && gregorianCutover <= timeVal - zoneOffset + dstOffset){
+                if(fields[YEAR] == changeYear && gregorianCutover <= time - zoneOffset + dstOffset){
                     dayOfYear += currentYearSkew;
                 }
                 month = dayOfYear / 32;
@@ -570,7 +570,7 @@
         fields[DST_OFFSET] = dstOffset;
         fields[ZONE_OFFSET] = zoneOffset;
 
-        fullFieldsCalc(time, zoneOffset);
+        fullFieldsCalc(zoneOffset);
 
         for (int i = 0; i < FIELD_COUNT; i++) {
             isSet[i] = true;