Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move check if border line style is blank before setting the border color to a helper function for readability 

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ss_border_property_template@1748066 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-12 22:57:37 +00:00
parent 9fc99212a9
commit 50ddff8c66
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/poi/ss/util/BorderPropertyTemplate.java
View File

@ -584,7 +584,7 @@ public final class BorderPropertyTemplate {
for (int i = firstCol; i <= lastCol; i++) { for (int i = firstCol; i <= lastCol; i++) {
CellAddress cell = new CellAddress(row, i); CellAddress cell = new CellAddress(row, i);
// if BORDER_TOP is not set on BorderPropertyTemplate, make a thin border so that there's something to color // if BORDER_TOP is not set on BorderPropertyTemplate, make a thin border so that there's something to color
if (getTemplateProperty(cell, CellUtil.BORDER_TOP) == null) { if (borderIsNotSetOrBlank(cell, CellUtil.BORDER_TOP)) {
drawTopBorder(new CellRangeAddress(row, row, i, i), BorderStyle.THIN); drawTopBorder(new CellRangeAddress(row, row, i, i), BorderStyle.THIN);
} }
addProperty(cell, CellUtil.TOP_BORDER_COLOR, color); addProperty(cell, CellUtil.TOP_BORDER_COLOR, color);
@ -606,7 +606,7 @@ public final class BorderPropertyTemplate {
for (int i = firstCol; i <= lastCol; i++) { for (int i = firstCol; i <= lastCol; i++) {
CellAddress cell = new CellAddress(row, i); CellAddress cell = new CellAddress(row, i);
// if BORDER_BOTTOM is not set on BorderPropertyTemplate, make a thin border so that there's something to color // if BORDER_BOTTOM is not set on BorderPropertyTemplate, make a thin border so that there's something to color
if (getTemplateProperty(cell, CellUtil.BORDER_BOTTOM) == null) { if (borderIsNotSetOrBlank(cell, CellUtil.BORDER_BOTTOM)) {
drawBottomBorder(new CellRangeAddress(row, row, i, i), BorderStyle.THIN); drawBottomBorder(new CellRangeAddress(row, row, i, i), BorderStyle.THIN);
} }
addProperty(cell, CellUtil.BOTTOM_BORDER_COLOR, color); addProperty(cell, CellUtil.BOTTOM_BORDER_COLOR, color);
@ -628,13 +628,22 @@ public final class BorderPropertyTemplate {
for (int i = firstRow; i <= lastRow; i++) { for (int i = firstRow; i <= lastRow; i++) {
CellAddress cell = new CellAddress(i, col); CellAddress cell = new CellAddress(i, col);
// if BORDER_LEFT is not set on BorderPropertyTemplate, make a thin border so that there's something to color // if BORDER_LEFT is not set on BorderPropertyTemplate, make a thin border so that there's something to color
if (getTemplateProperty(cell, CellUtil.BORDER_LEFT) == null) { if (borderIsNotSetOrBlank(cell, CellUtil.BORDER_LEFT)) {
drawLeftBorder(new CellRangeAddress(i, i, col, col), BorderStyle.THIN); drawLeftBorder(new CellRangeAddress(i, i, col, col), BorderStyle.THIN);
} }
addProperty(cell, CellUtil.LEFT_BORDER_COLOR, color); addProperty(cell, CellUtil.LEFT_BORDER_COLOR, color);
} }
} }
/**
* A helper method to set the border line style before setting the color if the
* current line style is not set or is set as NONE
*/
private boolean borderIsNotSetOrBlank(CellAddress cell, String borderDirection) {
Object borderLineStyle = getTemplateProperty(cell, borderDirection);
return (borderLineStyle == null);
}
/** /**
* <p> * <p>
* Sets the color of the right border for a range of cells. If the border is * Sets the color of the right border for a range of cells. If the border is
@ -651,7 +660,7 @@ public final class BorderPropertyTemplate {
for (int i = firstRow; i <= lastRow; i++) { for (int i = firstRow; i <= lastRow; i++) {
CellAddress cell = new CellAddress(i, col); CellAddress cell = new CellAddress(i, col);
// if BORDER_RIGHT is not set on BorderPropertyTemplate, make a thin border so that there's something to color // if BORDER_RIGHT is not set on BorderPropertyTemplate, make a thin border so that there's something to color
if (getTemplateProperty(cell, CellUtil.BORDER_RIGHT) == null) { if (borderIsNotSetOrBlank(cell, CellUtil.BORDER_RIGHT)) {
drawRightBorder(new CellRangeAddress(i, i, col, col), BorderStyle.THIN); drawRightBorder(new CellRangeAddress(i, i, col, col), BorderStyle.THIN);
} }
addProperty(cell, CellUtil.RIGHT_BORDER_COLOR, color); addProperty(cell, CellUtil.RIGHT_BORDER_COLOR, color);