moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

bug 58402: make AreaReference's private SpreadsheetVersion _version variable final

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1710163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2015-10-23 09:54:32 +00:00
parent 522b6d4a15
commit ab729cfd0e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/apache/poi/ss/util/AreaReference.java
View File

@ -31,18 +31,19 @@ public class AreaReference {
private static final char CELL_DELIMITER = ':'; private static final char CELL_DELIMITER = ':';
/** The character (') used to quote sheet names when they contain special characters */ /** The character (') used to quote sheet names when they contain special characters */
private static final char SPECIAL_NAME_DELIMITER = '\''; private static final char SPECIAL_NAME_DELIMITER = '\'';
private static final SpreadsheetVersion DEFAULT_SPREADSHEET_VERSION = SpreadsheetVersion.EXCEL97;
private final CellReference _firstCell; private final CellReference _firstCell;
private final CellReference _lastCell; private final CellReference _lastCell;
private final boolean _isSingleCell; private final boolean _isSingleCell;
private SpreadsheetVersion _version; private final SpreadsheetVersion _version; // never null
/** /**
* @deprecated Prefer supplying a version. * @deprecated Prefer supplying a version.
*/ */
@Deprecated @Deprecated
public AreaReference(String reference) { public AreaReference(String reference) {
this(reference, SpreadsheetVersion.EXCEL97); this(reference, DEFAULT_SPREADSHEET_VERSION);
} }
/** /**
@ -51,7 +52,7 @@ public class AreaReference {
* The area reference must be contiguous (i.e. represent a single rectangle, not a union of rectangles) * The area reference must be contiguous (i.e. represent a single rectangle, not a union of rectangles)
*/ */
public AreaReference(String reference, SpreadsheetVersion version) { public AreaReference(String reference, SpreadsheetVersion version) {
_version = version; _version = (null != version) ? version : DEFAULT_SPREADSHEET_VERSION;
if(! isContiguous(reference)) { if(! isContiguous(reference)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"References passed to the AreaReference must be contiguous, " + "References passed to the AreaReference must be contiguous, " +
@ -116,6 +117,7 @@ public class AreaReference {
* Creates an area ref from a pair of Cell References. * Creates an area ref from a pair of Cell References.
*/ */
public AreaReference(CellReference topLeft, CellReference botRight) { public AreaReference(CellReference topLeft, CellReference botRight) {
_version = DEFAULT_SPREADSHEET_VERSION;
boolean swapRows = topLeft.getRow() > botRight.getRow(); boolean swapRows = topLeft.getRow() > botRight.getRow();
boolean swapCols = topLeft.getCol() > botRight.getCol(); boolean swapCols = topLeft.getCol() > botRight.getCol();
if (swapRows || swapCols) { if (swapRows || swapCols) {
@ -180,10 +182,16 @@ public class AreaReference {
} }
public static AreaReference getWholeRow(SpreadsheetVersion version, String start, String end) { public static AreaReference getWholeRow(SpreadsheetVersion version, String start, String end) {
if (null == version) {
version = DEFAULT_SPREADSHEET_VERSION;
}
return new AreaReference("$A" + start + ":$" + version.getLastColumnName() + end, version); return new AreaReference("$A" + start + ":$" + version.getLastColumnName() + end, version);
} }
public static AreaReference getWholeColumn(SpreadsheetVersion version, String start, String end) { public static AreaReference getWholeColumn(SpreadsheetVersion version, String start, String end) {
if (null == version) {
version = DEFAULT_SPREADSHEET_VERSION;
}
return new AreaReference(start + "$1:" + end + "$" + version.getMaxRows(), version); return new AreaReference(start + "$1:" + end + "$" + version.getMaxRows(), version);
} }
@ -193,7 +201,7 @@ public class AreaReference {
*/ */
public static boolean isWholeColumnReference(SpreadsheetVersion version, CellReference topLeft, CellReference botRight) { public static boolean isWholeColumnReference(SpreadsheetVersion version, CellReference topLeft, CellReference botRight) {
if (null == version) { if (null == version) {
version = SpreadsheetVersion.EXCEL97; // how the code used to behave. version = DEFAULT_SPREADSHEET_VERSION; // how the code used to behave.
} }
// These are represented as something like // These are represented as something like