You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/05/13 12:11:22 UTC
svn commit: r1889836 - in /poi/trunk:
poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
Author: centic
Date: Thu May 13 12:11:22 2021
New Revision: 1889836
URL: http://svn.apache.org/viewvc?rev=1889836&view=rev
Log:
Apply some IDE suggestions
Simpler regexes, missing JavaDoc, final
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1889836&r1=1889835&r2=1889836&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java Thu May 13 12:11:22 2021
@@ -694,15 +694,11 @@ public class SXSSFWorkbook implements Wo
return createAndRegisterSXSSFSheet(_wb.createSheet());
}
- SXSSFSheet createAndRegisterSXSSFSheet(XSSFSheet xSheet)
- {
+ SXSSFSheet createAndRegisterSXSSFSheet(XSSFSheet xSheet) {
final SXSSFSheet sxSheet;
- try
- {
- sxSheet=new SXSSFSheet(this,xSheet);
- }
- catch (IOException ioe)
- {
+ try {
+ sxSheet = new SXSSFSheet(this,xSheet);
+ } catch (IOException ioe) {
throw new RuntimeException(ioe);
}
registerSheetMapping(sxSheet,xSheet);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java?rev=1889836&r1=1889835&r2=1889836&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java Thu May 13 12:11:22 2021
@@ -22,7 +22,6 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Removal;
import java.time.LocalDateTime;
import java.util.Calendar;
@@ -128,7 +127,8 @@ public abstract class CellBase implement
/**
* Implementation-specific setting the formula. Formula is not null.
* Shall not change the value.
- * @param formula
+ *
+ * @param formula The text of the formula to set.
*/
protected abstract void setCellFormulaImpl(String formula);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1889836&r1=1889835&r2=1889836&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java [UTF-8] (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java [UTF-8] Thu May 13 12:11:22 2021
@@ -66,16 +66,16 @@ public class DateUtil {
/**
* The following patterns are used in {@link #isADateFormat(int, String)}
*/
- private static final Pattern date_ptrn1 = Pattern.compile("^\\[\\$\\-.*?\\]");
- private static final Pattern date_ptrn2 = Pattern.compile("^\\[[a-zA-Z]+\\]");
+ private static final Pattern date_ptrn1 = Pattern.compile("^\\[\\$-.*?]");
+ private static final Pattern date_ptrn2 = Pattern.compile("^\\[[a-zA-Z]+]");
private static final Pattern date_ptrn3a = Pattern.compile("[yYmMdDhHsS]");
// add "\u5e74 \u6708 \u65e5" for Chinese/Japanese date format:2017 \u5e74 2 \u6708 7 \u65e5
private static final Pattern date_ptrn3b = Pattern.compile("^[\\[\\]yYmMdDhHsS\\-T/\u5e74\u6708\u65e5,. :\"\\\\]+0*[ampAMP/]*$");
// elapsed time patterns: [h],[m] and [s]
- private static final Pattern date_ptrn4 = Pattern.compile("^\\[([hH]+|[mM]+|[sS]+)\\]");
+ private static final Pattern date_ptrn4 = Pattern.compile("^\\[([hH]+|[mM]+|[sS]+)]");
// for format which start with "[DBNum1]" or "[DBNum2]" or "[DBNum3]" could be a Chinese date
- private static final Pattern date_ptrn5 = Pattern.compile("^\\[DBNum(1|2|3)\\]");
+ private static final Pattern date_ptrn5 = Pattern.compile("^\\[DBNum([123])]");
private static final DateTimeFormatter dateTimeFormats = new DateTimeFormatterBuilder()
.appendPattern("[dd MMM[ yyyy]][[ ]h:m[:s] a][[ ]H:m[:s]]")
@@ -455,7 +455,7 @@ public class DateUtil {
// If Excel date == 2/29/1900, will become 3/1/1900 in Java representation
dayAdjust = 0;
}
- calendar.set(startYear,0, wholeDays + dayAdjust, 0, 0, 0);
+ calendar.set(startYear, Calendar.JANUARY, wholeDays + dayAdjust, 0, 0, 0);
calendar.set(Calendar.MILLISECOND, millisecondsInDay);
if (calendar.get(Calendar.MILLISECOND) == 0) {
calendar.clear(Calendar.MILLISECOND);
@@ -544,9 +544,9 @@ public class DateUtil {
// avoid re-checking DataUtil.isADateFormat(int, String) if a given format
// string represents a date format if the same string is passed multiple times.
// see https://issues.apache.org/bugzilla/show_bug.cgi?id=55611
- private static ThreadLocal<Integer> lastFormatIndex = ThreadLocal.withInitial(() -> -1);
- private static ThreadLocal<String> lastFormatString = new ThreadLocal<>();
- private static ThreadLocal<Boolean> lastCachedResult = new ThreadLocal<>();
+ private static final ThreadLocal<Integer> lastFormatIndex = ThreadLocal.withInitial(() -> -1);
+ private static final ThreadLocal<String> lastFormatString = new ThreadLocal<>();
+ private static final ThreadLocal<Boolean> lastCachedResult = new ThreadLocal<>();
private static boolean isCached(String formatString, int formatIndex) {
return formatIndex == lastFormatIndex.get()
@@ -735,7 +735,7 @@ public class DateUtil {
* Check if a cell contains a date
* Since dates are stored internally in Excel as double values
* we infer it is a date if it is formatted as such.
- * @param cell
+ * @param cell The cell to look at
* @return true if it looks like a date
* @see #isADateFormat(int, String)
* @see #isInternalDateFormat(int)
@@ -750,7 +750,7 @@ public class DateUtil {
* we infer it is a date if it is formatted as such.
* Format is determined from applicable conditional formatting, if
* any, or cell style.
- * @param cell
+ * @param cell The cell to look at
* @param cfEvaluator if available, or null
* @return true if it looks like a date
* @see #isADateFormat(int, String)
@@ -850,7 +850,7 @@ public class DateUtil {
*
* @return days number of days in years prior to yr.
* @param yr a year (1900 < yr < 4000)
- * @param use1904windowing
+ * @param use1904windowing Should 1900 or 1904 date windowing be used?
* @exception IllegalArgumentException if year is outside of range.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org