Fix some Forbidden APIs errors

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1700635 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/formula/functions/DateFunc.java b/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
index 03152e0c136c24e2b5d477d2f8da9b713e522385..cd64505d565abbb578cf45c3245fd4c92e60baf1 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
+++ b/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
@@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.functions;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.formula.eval.EvaluationException;
@@ -86,7 +87,7 @@ public final class DateFunc extends Fixed3ArgFunction {
                }
 
                // Turn this into a Java date
-               Calendar c = new GregorianCalendar();
+               Calendar c = new GregorianCalendar(Locale.ROOT);
                c.set(year, month, day, 0, 0, 0);
                c.set(Calendar.MILLISECOND, 0);
                

diff --git a/src/java/org/apache/poi/ss/formula/functions/Days360.java b/src/java/org/apache/poi/ss/formula/functions/Days360.java
index f2bd1a5ddb1c499a5e071c9c1eb1bcacda365cd2..fc03734ef4c90d1911b5cb271c6f1bc3d0f78ad1 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/Days360.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Days360.java
@@ -18,6 +18,7 @@ package org.apache.poi.ss.formula.functions;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import org.apache.poi.ss.formula.eval.EvaluationException;
 import org.apache.poi.ss.formula.eval.NumberEval;
@@ -72,7 +73,7 @@ public class Days360 extends Var2or3ArgFunction {
     }
 
     private static Calendar getDate(double date) {
-        Calendar processedDate = new GregorianCalendar();
+        Calendar processedDate = new GregorianCalendar(Locale.ROOT);
         processedDate.setTime(DateUtil.getJavaDate(date, false));
         return processedDate;
     }

diff --git a/src/java/org/apache/poi/ss/formula/functions/EOMonth.java b/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
index 8832e20e79bb15601f981f120ebc52b7131e8ea6..411257a09ffd12e44082bdb480d2bcefa4286b35 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
+++ b/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
@@ -20,6 +20,7 @@ package org.apache.poi.ss.formula.functions;
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.GregorianCalendar;\r
+import java.util.Locale;\r
 \r
 import org.apache.poi.ss.formula.OperationEvaluationContext;\r
 import org.apache.poi.ss.formula.eval.ErrorEval;\r
@@ -63,7 +64,7 @@ public class EOMonth implements FreeRefFunction {
 \r
             Date startDate = DateUtil.getJavaDate(startDateAsNumber, false);\r
 \r
-            Calendar cal = new GregorianCalendar();\r
+            Calendar cal = new GregorianCalendar(Locale.ROOT);\r
             cal.setTime(startDate);\r
             cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);\r
             cal.set(Calendar.MILLISECOND, 0);\r

diff --git a/src/java/org/apache/poi/ss/formula/functions/Today.java b/src/java/org/apache/poi/ss/formula/functions/Today.java
index 8abc2f0d928b1f4340541f313089b258c81ab03a..906cbda1ff9914d96b5de09ce268aa0c724dde9b 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/Today.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Today.java
@@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.functions;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import org.apache.poi.ss.formula.eval.NumberEval;
 import org.apache.poi.ss.formula.eval.ValueEval;
@@ -33,7 +34,7 @@ public final class Today extends Fixed0ArgFunction {
 
        public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
 
-               Calendar now = new GregorianCalendar();
+               Calendar now = new GregorianCalendar(Locale.ROOT);
                now.set(now.get(Calendar.YEAR), now.get(Calendar.MONTH), now.get(Calendar.DATE),0,0,0);
                now.set(Calendar.MILLISECOND, 0);
                return new NumberEval(DateUtil.getExcelDate(now.getTime()));

diff --git a/src/java/org/apache/poi/ss/formula/functions/WeekNum.java b/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
index e678104a232982504f13aaa38606f82710935613..9cfd26fe5ce5d795a0890952b33a517fc4f0ab5e 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
+++ b/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
@@ -23,6 +23,7 @@ import org.apache.poi.ss.usermodel.DateUtil;
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
+import java.util.Locale;\r
 \r
 /**\r
  * Implementation for Excel WeekNum() function.<p/>\r
@@ -52,7 +53,7 @@ public class WeekNum extends Fixed2ArgFunction implements FreeRefFunction {
         } catch (EvaluationException e) {\r
             return ErrorEval.VALUE_INVALID;\r
         }\r
-        Calendar serialNumCalendar = new GregorianCalendar();\r
+        Calendar serialNumCalendar = new GregorianCalendar(Locale.ROOT);\r
         serialNumCalendar.setTime(DateUtil.getJavaDate(serialNum, false));\r
 \r
         int returnType = 0;\r

diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
index ca1d7d46599ee988c72b52c23db661a7c6dc503d..31b33eabc492d2c5207056bfc55a360499692ffe 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
@@ -21,6 +21,7 @@ package org.apache.poi.ss.usermodel;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
@@ -83,7 +84,7 @@ public class DateUtil {
      * @param use1904windowing Should 1900 or 1904 date windowing be used?
      */
     public static double getExcelDate(Date date, boolean use1904windowing) {
-        Calendar calStart = new GregorianCalendar();
+        Calendar calStart = new GregorianCalendar(Locale.ROOT);
         calStart.setTime(date);   // If date includes hours, minutes, and seconds, set them to 0
         return internalGetExcelDate(calStart, use1904windowing);
     }
@@ -319,9 +320,9 @@ public class DateUtil {
         int millisecondsInDay = (int)((date - wholeDays) * DAY_MILLISECONDS + 0.5);
         Calendar calendar;
         if (timeZone != null) {
-            calendar = new GregorianCalendar(timeZone);
+            calendar = new GregorianCalendar(timeZone, Locale.ROOT);
         } else {
-            calendar = new GregorianCalendar();     // using default time-zone
+            calendar = new GregorianCalendar(Locale.ROOT); // using default time-zone
         }
         setCalendar(calendar, wholeDays, millisecondsInDay, use1904windowing, roundSeconds);
         return calendar;

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
index 83004cb3b861ad3e7f69add1bdcb22d5f6c55b05..bea8e7129ba3044314a077405eccf8b8056fc2a3 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
@@ -26,6 +26,7 @@ import java.nio.charset.Charset;
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.GregorianCalendar;\r
+import java.util.Locale;\r
 \r
 import junit.framework.TestCase;\r
 \r
@@ -142,14 +143,14 @@ public final class TestUnfixedBugs extends TestCase {
         // second to be different here!\r
         int startYear = 1900;\r
         int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which it isn't\r
-        Calendar calendar1 = new GregorianCalendar();\r
+        Calendar calendar1 = new GregorianCalendar(Locale.ROOT);\r
         calendar1.set(startYear,0, wholeDays1 + dayAdjust, 0, 0, 0);\r
         calendar1.set(Calendar.MILLISECOND, millisecondsInDay1);\r
       // this is the rounding part:\r
       calendar1.add(Calendar.MILLISECOND, 500);\r
       calendar1.clear(Calendar.MILLISECOND);\r
 \r
-        Calendar calendar2 = new GregorianCalendar();\r
+        Calendar calendar2 = new GregorianCalendar(Locale.ROOT);\r
         calendar2.set(startYear,0, wholeDays2 + dayAdjust, 0, 0, 0);\r
         calendar2.set(Calendar.MILLISECOND, millisecondsInDay2);\r
       // this is the rounding part:\r

diff --git a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java b/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
index 926a2f564579a7e0a9c2e4d803055ac651f87885..a6ab1ba8037c0eaa6e9d7bcc59ed7a367c447505 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.util;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import org.apache.poi.util.LittleEndian;
 
@@ -47,7 +48,7 @@ public final class SystemTimeUtils {
         * Get the date found in the byte array, as a java Data object
         */
        public static Date getDate(byte[] data, int offset) {
-        Calendar cal = new GregorianCalendar();
+        Calendar cal = new GregorianCalendar(Locale.ROOT);
 
         cal.set(Calendar.YEAR,         LittleEndian.getShort(data,offset));
         cal.set(Calendar.MONTH,        LittleEndian.getShort(data,offset+2)-1);

diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
index e74eedf8a702a7dbe5cf5c3e82f79dddec4fec50..b58b4cd8f044702964ab96e6f8a85317d1d20669 100644 (file)
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
@@ -28,6 +28,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import junit.framework.TestCase;
@@ -227,7 +228,7 @@ public class TestWriteWellKnown extends TestCase {
          * (e.g. author, edit date, application name) and to the document
          * summary information (e.g. company, manager).
          */
-        Calendar cal = new GregorianCalendar();
+        Calendar cal = new GregorianCalendar(Locale.ROOT);
         cal.set(2000, 6, 6, 6, 6, 6);
         final long time1 = cal.getTimeInMillis();
         cal.set(2001, 7, 7, 7, 7, 7);

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 2e34d6f6029d8e85f5a88e281dc8682257a57a52..7abd515743be240ee77a7d6c4b00dad674467288 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
@@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
@@ -461,7 +462,7 @@ public final class TestHSSFDateUtil {
      * @param day one based
      */
     private static Date createDate(int year, int month, int day, int hour, int minute, int second) {
-        Calendar c = new GregorianCalendar();
+        Calendar c = new GregorianCalendar(Locale.ROOT);
         c.set(year, month, day, hour, minute, second);
         c.set(Calendar.MILLISECOND, 0);
         return c.getTime();

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
index 22d3ba3492c04f7563e58df7ec568be0199af84e..abd8ba2ccda2e29d0e64e974f8ab432915115f1b 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
@@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.atp;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import junit.framework.TestCase;
 
@@ -58,7 +59,7 @@ public final class TestYearFracCalculator extends TestCase {
        }
 
        private static double md(int year, int month, int day) {
-               Calendar c = new GregorianCalendar();
+               Calendar c = new GregorianCalendar(Locale.ROOT);
                
                c.set(year, month-1, day, 0, 0, 0);
                c.set(Calendar.MILLISECOND, 0);

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
index 15dd1246b16d0f8cbf9b39336bfd1b6c51de0401..db39c09c3243afd3afd13f55acbff4d8e2ce54a4 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
@@ -20,6 +20,7 @@ package org.apache.poi.ss.formula.functions;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
@@ -44,13 +45,13 @@ public final class TestDays360 extends TestCase {
                return cal.getTime();
        }
        private static Date decrementDay(Date d) {
-               Calendar c = new GregorianCalendar();
+               Calendar c = new GregorianCalendar(Locale.ROOT);
                c.setTimeInMillis(d.getTime());
                c.add(Calendar.DAY_OF_MONTH, -1);
                return c.getTime();
        }
        private static String fmt(Date d) {
-               Calendar c = new GregorianCalendar();
+               Calendar c = new GregorianCalendar(Locale.ROOT);
                c.setTimeInMillis(d.getTime());
                StringBuilder sb = new StringBuilder();
                sb.append(c.get(Calendar.YEAR));